summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgreg@kroah.com <greg@kroah.com>2003-12-08 18:01:56 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:13:06 -0700
commitbbd063b5c2aa055a707b472d4e0b1ed297d00674 (patch)
tree18a99e4a5878ecc719ea3e9c6b0a655ea799497d
parent8e15f01dc8e25eca49b99e97059dccf793e6c4d4 (diff)
[PATCH] change USE_DBUS to DBUS in Makefile, and disable it by default as it's still to hard to build on all systems.
-rw-r--r--Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index c50bd04824..ae9d276721 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)