[PATCH] spilt udev into pieces

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index b27f1b92d9234a5dee1c39d032446134a197d625..0fd158a2c7070e93ba0af32d4c51d1b5e098cabc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,12 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-# Set the following to `true' to make a debuggable build.
+# Set the following to control the use of syslog
+# Set it to `false' to remove all logging
+USE_LOG = true
+
+# Set the following to `true' to log the debug
+# and make a unstripped, unoptimized  binary.
 # Leave this set to `false' for production use.
 DEBUG = false
 
@@ -26,7 +31,9 @@ USE_DBUS = false
 
 
 ROOT =         udev
-VERSION =      011_bk
+DAEMON =       udevd
+SENDER =       udevsend
+VERSION =      014_bk
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
@@ -61,7 +68,7 @@ udevdir = ${prefix}/udev
 #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
+# to something more interesting, like "arm-linux-".  If you want
 # to compile vs uClibc, that can be done here as well.
 CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
 CC = $(CROSS)gcc
@@ -104,6 +111,10 @@ else
        CFLAGS+=-pipe
 endif
 
+ifeq ($(strip $(USE_LOG)),true)
+       CFLAGS  += -DLOG
+endif
+
 # if DEBUG is enabled, then we do not strip or optimize
 ifeq ($(strip $(DEBUG)),true)
        CFLAGS  += $(WARNINGS) -O1 -g -DDEBUG -D_GNU_SOURCE
@@ -133,7 +144,7 @@ ifeq ($(strip $(USE_KLIBC)),true)
        LIBC =  $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
        CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(KLIBC_DIR)/arch/$(ARCH)/include \
                -I$(INCLUDE_DIR)/bits$(BITSIZE) -I$(GCCINCDIR) -I$(LINUX_INCLUDE_DIR) \
-               -D__KLIBC__
+               -D__KLIBC__ -fno-builtin-printf
        LIB_OBJS =
        LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
 else
@@ -146,7 +157,7 @@ endif
 
 CFLAGS += -I$(PWD)/libsysfs
 
-all: $(ROOT)
+all: $(ROOT) $(DAEMON) $(SENDER)
        @extras="$(EXTRAS)" ; for target in $$extras ; do \
                echo $$target ; \
                $(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
@@ -216,14 +227,22 @@ $(LOCAL_CFG_DIR)/udev.conf:
 
 $(OBJS): $(GEN_HEADERS)
 
-$(ROOT): $(OBJS) udev.h namedev.h udev_version.h udev_dbus.h udevdb.h klibc_fixups.h list.h
+$(ROOT): $(OBJS) udev.h namedev.h udev_version.h udev_dbus.h udevdb.h klibc_fixups.h logging.h list.h
        $(LD) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $(ROOT)
 
+$(DAEMON): $(ROOT) udevd.h udevd.o
+       $(LD) $(LDFLAGS) -o $(DAEMON) $(CRT0) udevd.o logging.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+       $(STRIPCMD) $(ROOT)
+
+$(SENDER): $(ROOT) udevd.h udevsend.o
+       $(LD) $(LDFLAGS) -o $(SENDER) $(CRT0) udevsend.o logging.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+       $(STRIPCMD) $(ROOT)
+
 clean:
        -find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
         | xargs rm -f 
-       -rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS)
+       -rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(DAEMON) $(SENDER)
        $(MAKE) -C klibc clean
        @extras="$(EXTRAS)" ; for target in $$extras ; do \
                echo $$target ; \
@@ -231,7 +250,7 @@ clean:
                        -C $$target $@ ; \
        done ; \
 
-DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v CVS | grep -v "\.tar\.gz" | grep -v "\/\." | grep -v releases | grep -v BitKeeper | grep -v SCCS | grep -v "\.tdb" | grep -v "test\/sys" | sort )
+DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz$" -e "\/\." -e releases -e BitKeeper -e SCCS -e "\.tdb$" -e test/sys | sort )
 DISTDIR := $(RELEASE_NAME)
 srcdir = .
 release: clean
@@ -266,7 +285,8 @@ small_release: $(DISTFILES) clean
 ifeq ($(USE_DBUS), true)
 install-dbus-policy:
        $(INSTALL) -d $(DESTDIR)$(dbusdir)
-       $(INSTALL_DATA) udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
+       $(INSTALL_DATA) etc/dbus-1/system.d/udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
+
 uninstall-dbus-policy:
        - rm $(DESTDIR)$(dbusdir)/udev_sysbus_policy.conf
 else
@@ -291,13 +311,16 @@ install-config: $(GEN_CONFIGS)
                $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
        fi
 
-
-
 install: install-config install-dbus-policy all
        $(INSTALL) -d $(DESTDIR)$(udevdir)
        $(INSTALL) -d $(DESTDIR)$(hotplugdir)
        $(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
-       $(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev
+       @if [ "x$(USE_LSB)" = "xtrue" ]; then \
+               $(INSTALL_PROGRAM) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev; \
+               ln -s $(DESTDIR)$(initdir)/udev $(sbin_dir)/rcudev; \
+       else \
+               $(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
+       fi
        $(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
        - rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
        - ln -f -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
@@ -323,5 +346,3 @@ uninstall: uninstall-dbus-policy
                $(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
                        -C $$target $@ ; \
        done ; \
-
-