summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorolh@suse.de <olh@suse.de>2003-12-16 23:41:59 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:13:08 -0700
commit666269480900dd8d099b9e188c16acc9f7f31ee5 (patch)
tree470a60a63289d3046bd176fb961ae8b3637db4b0
parent3c54f73e8452261c80b4d17db55d199552442005 (diff)
[PATCH] dump latest klibc into the udev build tree
KLIBC is used as an internal makefile variable, it expands to either true or false right now. udev should use something else than KLIBC to allow build against the latest and greatest klibc version.
-rw-r--r--Makefile12
-rw-r--r--README6
2 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 4a545db9c4..3653595b06 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.
-DBUS = false
+USE_DBUS = false
ROOT = udev
@@ -57,7 +57,7 @@ udevdir = ${prefix}/udev
# Comment out this line to build with something other
# than the local version of klibc
-#KLIBC = true
+#USE_KLIBC = true
# If you are running a cross compiler, you may want to set this
# to something more interesting, like "arm-linux-". I you want
@@ -116,7 +116,7 @@ endif
# If we are using our version of klibc, then we need to build and link it.
# Otherwise, use glibc and link statically.
-ifeq ($(strip $(KLIBC)),true)
+ifeq ($(strip $(USE_KLIBC)),true)
KLIBC_BASE = $(PWD)/klibc
KLIBC_DIR = $(KLIBC_BASE)/klibc
INCLUDE_DIR := $(KLIBC_DIR)/include
@@ -180,11 +180,11 @@ OBJS = udev.o \
$(SYSFS) \
$(TDB)
-ifeq ($(strip $(KLIBC)),true)
+ifeq ($(strip $(USE_KLIBC)),true)
OBJS += klibc_fixups.o
endif
-ifeq ($(DBUS), true)
+ifeq ($(USE_DBUS), true)
CFLAGS += -DUSE_DBUS
CFLAGS += $(shell pkg-config --cflags dbus-1)
LDFLAGS += $(shell pkg-config --libs dbus-1)
@@ -261,7 +261,7 @@ small_release: $(DISTFILES) clean
@echo "Built $(RELEASE_NAME).tar.gz"
-ifeq ($(DBUS), true)
+ifeq ($(USE_DBUS), true)
install-dbus-policy:
$(INSTALL) -d $(DESTDIR)$(dbusdir)
$(INSTALL_DATA) udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
diff --git a/README b/README
index 94a397936e..dab0ab4197 100644
--- a/README
+++ b/README
@@ -32,18 +32,18 @@ To use:
installed into. This works just like the 'configure --prefix'
script does. Default value is ''. Only override this if you
really know what you are doing.
- KLIBC - if set to 'true', udev is built and linked against the included
+ USE_KLIBC - if set to 'true', udev is built and linked against the included
version of klibc. Default value is 'false'.
DEBUG - if set to 'true', debugging messages will be sent to the syslog
as udev is run. Default value is 'false'.
- DBUS - if set to 'true', DBUS messages will be sent everytime udev
+ USE_DBUS - if set to 'true', DBUS messages will be sent everytime udev
creates or removes a device node. This requires that DBUS
development headers and libraries be present on your system to
build properly. Default value is 'false'.
So, if you want to build udev using klibc with debugging messages, you
would do:
- make KLIBC=true DEBUG=true
+ make USE_KLIBC=true DEBUG=true
- Install the project: