summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--extras/dbus/Makefile63
-rw-r--r--extras/dbus/etc/dbus-1/system.d/udev_sysbus_policy.conf (renamed from etc/dbus-1/system.d/udev_sysbus_policy.conf)0
-rw-r--r--extras/dbus/udev_dbus.c (renamed from udev_dbus.c)5
3 files changed, 65 insertions, 3 deletions
diff --git a/extras/dbus/Makefile b/extras/dbus/Makefile
new file mode 100644
index 0000000000..99aa33d8fb
--- /dev/null
+++ b/extras/dbus/Makefile
@@ -0,0 +1,63 @@
+# Makefile for udev_dbus
+#
+# Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+
+# Set the following to `true' to log the debug
+# and make a unstripped, unoptimized binary.
+# Leave this set to `false' for production use.
+DEBUG = false
+
+PROG = udev_dbus
+
+all: $(PROG)
+
+# override this to make udev look in a different location for it's config files
+prefix =
+exec_prefix = ${prefix}
+etcdir = ${prefix}/etc
+sbindir = ${exec_prefix}/sbin
+usrbindir = ${exec_prefix}/usr/bin
+mandir = ${prefix}/usr/share/man
+hotplugdir = ${etcdir}/hotplug.d/default
+dbusdir = ${etcdir}/dbus-1/system.d
+configdir = ${etcdir}/udev/
+initdir = ${etcdir}/init.d/
+srcdir = .
+
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+
+override CFLAGS+=-Wall -fno-builtin
+
+override CFLAGS += -DUSE_DBUS
+override CFLAGS += $(shell pkg-config --cflags dbus-1)
+override LDFLAGS += $(shell pkg-config --libs dbus-1)
+OBJS = udev_dbus.o
+
+$(PROG): $(OBJS)
+ $(LD) $(LDFLAGS) -o $(PROG) $(CRT0) $(OBJS) ../../udev_lib.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+
+clean:
+ rm -f $(PROG) $(OBJS)
+
+spotless: clean
+
+
+install-dbus-policy:
+ $(INSTALL) -d $(DESTDIR)$(dbusdir)
+ $(INSTALL_DATA) etc/dbus-1/system.d/udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
+
+uninstall-dbus-policy:
+ - rm $(DESTDIR)$(dbusdir)/udev_sysbus_policy.conf
+
+install: install-dbus-policy all
+
+uninstall: uninstall-dbus-policy
+
diff --git a/etc/dbus-1/system.d/udev_sysbus_policy.conf b/extras/dbus/etc/dbus-1/system.d/udev_sysbus_policy.conf
index b2660e65cf..b2660e65cf 100644
--- a/etc/dbus-1/system.d/udev_sysbus_policy.conf
+++ b/extras/dbus/etc/dbus-1/system.d/udev_sysbus_policy.conf
diff --git a/udev_dbus.c b/extras/dbus/udev_dbus.c
index 7e767040f0..955a3dbb49 100644
--- a/udev_dbus.c
+++ b/extras/dbus/udev_dbus.c
@@ -9,9 +9,8 @@
#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus.h>
-#include "udev.h"
-#include "udev_lib.h"
-#include "logging.h"
+#include "../../udev_lib.h"
+#include "../../logging.h"
#ifdef LOG
unsigned char logname[LOGNAME_SIZE];