[PATCH] change USE_DBUS to DBUS in Makefile, and disable it by default as it's still to hard to build on all systems.
This commit is contained in:
parent
8e15f01dc8
commit
bbd063b5c2
18
Makefile
18
Makefile
|
@ -22,7 +22,7 @@ DEBUG = false
|
||||||
|
|
||||||
# Set the following to `true' to make udev emit a D-BUS signal when a
|
# Set the following to `true' to make udev emit a D-BUS signal when a
|
||||||
# new node is created.
|
# new node is created.
|
||||||
USE_DBUS = true
|
DBUS = false
|
||||||
|
|
||||||
|
|
||||||
ROOT = udev
|
ROOT = udev
|
||||||
|
@ -143,13 +143,6 @@ endif
|
||||||
|
|
||||||
CFLAGS += -I$(PWD)/libsysfs
|
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)
|
all: $(ROOT)
|
||||||
@for target in $(EXTRAS) ; do \
|
@for target in $(EXTRAS) ; do \
|
||||||
echo $$target ; \
|
echo $$target ; \
|
||||||
|
@ -190,6 +183,13 @@ ifeq ($(strip $(KLIBC)),true)
|
||||||
OBJS += klibc_fixups.o
|
OBJS += klibc_fixups.o
|
||||||
endif
|
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
|
# header files automatically generated
|
||||||
GEN_HEADERS = udev_version.h
|
GEN_HEADERS = udev_version.h
|
||||||
|
|
||||||
|
@ -252,7 +252,7 @@ small_release: $(DISTFILES) clean
|
||||||
@echo "Built $(RELEASE_NAME).tar.gz"
|
@echo "Built $(RELEASE_NAME).tar.gz"
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(USE_DBUS), true)
|
ifeq ($(DBUS), true)
|
||||||
install-dbus-policy:
|
install-dbus-policy:
|
||||||
$(INSTALL) -d $(DESTDIR)$(dbusdir)
|
$(INSTALL) -d $(DESTDIR)$(dbusdir)
|
||||||
$(INSTALL_DATA) udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
|
$(INSTALL_DATA) udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
|
||||||
|
|
Loading…
Reference in New Issue