[PATCH] fix Makefile typo for USE_LSB install.

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 88c7cf0bc767167ccfeb29189a827e15f306424f..c68fd373125ed65492ab1fd4d37a44cea69ed647 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 
 # Set the following to control the use of syslog
 # Set it to `false' to remove all logging
-LOG = true
+USE_LOG = true
 
 # Set the following to `true' to log the debug
 # and make a unstripped, unoptimized  binary.
@@ -31,7 +31,10 @@ USE_DBUS = false
 
 
 ROOT =         udev
-VERSION =      013_bk
+DAEMON =       udevd
+SENDER =       udevsend
+HELPER =       udevinfo
+VERSION =      015_bk
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
@@ -92,7 +95,7 @@ OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>
                then echo "-Os"; else echo "-O2" ; fi}
 
 # add -Wredundant-decls when libsysfs gets cleaned up
-WARNINGS := -Wall -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
+WARNINGS := -Wall 
 
 # Some nice architecture specific optimizations
 ifeq ($(strip $(TARGET_ARCH)),arm)
@@ -109,17 +112,17 @@ else
        CFLAGS+=-pipe
 endif
 
-ifeq ($(strip $(LOG)),true)
+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
+       CFLAGS  += -O1 -g -DDEBUG -D_GNU_SOURCE
        LDFLAGS += -Wl,-warn-common
        STRIPCMD = /bin/true -Since_we_are_debugging
 else
-       CFLAGS  += $(WARNINGS) $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
+       CFLAGS  += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
        LDFLAGS += -s -Wl,-warn-common
        STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
 endif
@@ -140,22 +143,29 @@ ifeq ($(strip $(USE_KLIBC)),true)
 
        CRT0 = $(KLIBC_DIR)/crt0.o
        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__ -fno-builtin-printf
+       CFLAGS += $(WARNINGS) -nostdinc                 \
+               -D__KLIBC__ -fno-builtin-printf         \
+               -I$(INCLUDE_DIR)                        \
+               -I$(KLIBC_DIR)/arch/$(ARCH)/include     \
+               -I$(INCLUDE_DIR)/bits$(BITSIZE)         \
+               -I$(GCCINCDIR)                          \
+               -I$(LINUX_INCLUDE_DIR)
        LIB_OBJS =
        LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
+       UDEVD =
 else
+       WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
        CRT0 =
        LIBC = 
-       CFLAGS += -I$(GCCINCDIR)
+       CFLAGS += $(WARNINGS) -I$(GCCINCDIR)
        LIB_OBJS = -lc
        LDFLAGS =
+       UDEVD = $(DAEMON) $(SENDER)
 endif
 
 CFLAGS += -I$(PWD)/libsysfs
 
-all: $(ROOT)
+all: $(ROOT) $(UDEVD) $(HELPER)
        @extras="$(EXTRAS)" ; for target in $$extras ; do \
                echo $$target ; \
                $(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
@@ -180,8 +190,7 @@ SYSFS =     $(PWD)/libsysfs/sysfs_bus.o     \
        $(PWD)/libsysfs/sysfs_utils.o   \
        $(PWD)/libsysfs/dlist.o
 
-OBJS = udev.o          \
-       udev_config.o   \
+OBJS = udev_config.o   \
        udev-add.o      \
        udev-remove.o   \
        udevdb.o        \
@@ -191,6 +200,15 @@ OBJS =     udev.o          \
        $(SYSFS)        \
        $(TDB)
 
+HEADERS =      udev.h          \
+               namedev.h       \
+               udev_version.h  \
+               udev_dbus.h     \
+               udevdb.h        \
+               klibc_fixups.h  \
+               logging.h       \
+               list.h
+
 ifeq ($(strip $(USE_KLIBC)),true)
        OBJS += klibc_fixups.o
 endif
@@ -224,15 +242,28 @@ $(LOCAL_CFG_DIR)/udev.conf:
 
 
 $(OBJS): $(GEN_HEADERS)
+udev.o: $(GEN_HEADERS)
+
+$(ROOT): udev.o $(OBJS) $(HEADERS) $(GEN_HEADERS)
+       $(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+       $(STRIPCMD) $@
+
+$(HELPER): udevinfo.o $(OBJS) $(HEADERS)
+       $(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o logging.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+       $(STRIPCMD) $@
+
+$(DAEMON): udevd.h udevd.o udevd.o logging.o
+       $(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o logging.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+       $(STRIPCMD) $@
 
-$(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)
+$(SENDER): udevd.h udevsend.o udevd.o logging.o
+       $(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o logging.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+       $(STRIPCMD) $@
 
 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) $(HELPER) $(DAEMON) $(SENDER)
        $(MAKE) -C klibc clean
        @extras="$(EXTRAS)" ; for target in $$extras ; do \
                echo $$target ; \
@@ -305,13 +336,15 @@ 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 $(HELPER) $(DESTDIR)$(sbindir)/$(HELPER)
        @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; \
+               ln -s $(DESTDIR)$(initdir)/udev $(sbindir)/rcudev; \
        else \
                $(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
        fi
        $(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
+       $(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
        - rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
        - ln -f -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
        @extras="$(EXTRAS)" ; for target in $$extras ; do \
@@ -327,7 +360,9 @@ uninstall: uninstall-dbus-policy
        - rm $(configdir)/udev.conf
        - rm $(initdir)/udev
        - rm $(mandir)/man8/udev.8
+       - rm $(mandir)/man8/udevinfo.8
        - rm $(sbindir)/$(ROOT)
+       - rm $(sbindir)/$(HELPER)
        - rmdir $(hotplugdir)
        - rmdir $(configdir)
        - rmdir $(udevdir)