[PATCH] remove dbus stuff from main Makefile

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 3d5288b25d086507a5cf65f52e93cca00f54b666..65d870bf97f96ff24eab5a9fcc68fd891aeb782a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,10 +25,6 @@ USE_LOG = true
 # Leave this set to `false' for production use.
 DEBUG = false
 
-# Set the following to `true' to make udev emit a D-BUS signal when a
-# new node is created.
-USE_DBUS = false
-
 
 ROOT =         udev
 DAEMON =       udevd
@@ -37,7 +33,7 @@ INFO =                udevinfo
 TESTER =       udevtest
 STARTER =      udevstart
 RULER =                udevruler
-VERSION =      022
+VERSION =      022_bk
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
@@ -55,7 +51,6 @@ 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 = .
@@ -209,6 +204,7 @@ OBJS =      udev_lib.o      \
        udevdb.o        \
        namedev.o       \
        namedev_parse.o \
+       dev_d.o         \
        $(SYSFS)        \
        $(TDB)
 
@@ -216,7 +212,6 @@ HEADERS =   udev.h          \
                udev_lib.h      \
                namedev.h       \
                udev_version.h  \
-               udev_dbus.h     \
                udevdb.h        \
                klibc_fixups.h  \
                logging.h       \
@@ -226,13 +221,6 @@ ifeq ($(strip $(USE_KLIBC)),true)
        OBJS += klibc_fixups.o
 endif
 
-ifeq ($(USE_DBUS), true)
-       CFLAGS += -DUSE_DBUS
-       CFLAGS += $(shell pkg-config --cflags dbus-1)
-       LDFLAGS += $(shell pkg-config --libs dbus-1)
-       OBJS += udev_dbus.o
-endif
-
 # if USE_SELINUX is enabled, then we do not strip or optimize
 ifeq ($(strip $(USE_SELINUX)),true)
        CFLAGS  += -DUSE_SELINUX
@@ -313,6 +301,7 @@ clean:
        done ; \
 
 spotless: clean
+       $(MAKE) -C klibc spotless
 
 DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz$" -e "\/\." -e releases -e BitKeeper -e SCCS -e "\.tdb$" -e test/sys | sort )
 DISTDIR := $(RELEASE_NAME)
@@ -344,20 +333,6 @@ small_release: $(DISTFILES) clean
        @echo "Built $(RELEASE_NAME).tar.gz"
 
 
-ifeq ($(USE_DBUS), true)
-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
-else
-install-dbus-policy:
-       -
-uninstall-dbus-policy:
-       -
-endif
-
 install-initscript: etc/init.d/udev etc/init.d/udev.debian etc/init.d/udev.init.LSB
        @if [ -f /etc/redhat-release ]; then \
                $(INSTALL_DATA) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
@@ -382,7 +357,7 @@ install-config: $(GEN_CONFIGS)
                $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
        fi
 
-install: install-initscript install-config install-dbus-policy all
+install: install-initscript install-config all
        $(INSTALL) -d $(DESTDIR)$(udevdir)
        $(INSTALL) -d $(DESTDIR)$(hotplugdir)
        $(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
@@ -408,7 +383,7 @@ endif
                        -C $$target $@ ; \
        done ; \
 
-uninstall: uninstall-dbus-policy
+uninstall: 
        - rm $(hotplugdir)/udev.hotplug
        - rm $(configdir)/udev.permissions
        - rm $(configdir)/udev.rules