[PATCH] Makefile tweaks for the DBUS build.

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index c50bd04824880e8a429fb591594dbca681e4520b..51087bc8c679a77d25ffa4f5db11f981a38ffbe6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ DEBUG = false
 
 # Set the following to `true' to make udev emit a D-BUS signal when a
 # new node is created.
-USE_DBUS = true
+DBUS = false
 
 
 ROOT =         udev
@@ -143,13 +143,6 @@ endif
 
 CFLAGS += -I$(PWD)/libsysfs
 
-ifeq ($(USE_DBUS), true)
-       CFLAGS += -DUSE_DBUS
-       CFLAGS += $(shell pkg-config --cflags dbus-1)
-       LIB_OBJS += $(shell pkg-config --libs-only-l dbus-1)
-endif
-
-
 all: $(ROOT)
        @for target in $(EXTRAS) ; do \
                echo $$target ; \
@@ -190,6 +183,13 @@ ifeq ($(strip $(KLIBC)),true)
        OBJS += klibc_fixups.o
 endif
 
+ifeq ($(DBUS), true)
+       CFLAGS += -DUSE_DBUS
+       CFLAGS += $(shell pkg-config --cflags dbus-1)
+       LDFLAGS += $(shell pkg-config --libs dbus-1)
+       OBJS += udev_dbus.o
+endif
+
 # header files automatically generated
 GEN_HEADERS =  udev_version.h
 
@@ -252,7 +252,7 @@ small_release: $(DISTFILES) clean
        @echo "Built $(RELEASE_NAME).tar.gz"
 
 
-ifeq ($(USE_DBUS), true)
+ifeq ($(DBUS), true)
 install-dbus-policy:
        $(INSTALL) -d $(DESTDIR)$(dbusdir)
        $(INSTALL_DATA) udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)