From: greg@kroah.com <greg@kroah.com>
Date: Tue, 9 Dec 2003 02:01:56 +0000 (-0800)
Subject: [PATCH] change USE_DBUS to DBUS in Makefile, and disable it by default as it's still... 
X-Git-Tag: 009~31
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbd063b5c2aa055a707b472d4e0b1ed297d00674;p=systemd

[PATCH] change USE_DBUS to DBUS in Makefile, and disable it by default as it's still to hard to build on all systems.
---

diff --git a/Makefile b/Makefile
index c50bd048..ae9d2767 100644
--- 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)
+	LIB_OBJS += $(shell pkg-config --libs-only-l 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)