[PATCH] udevd - cleanup and better timeout handling

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index f19354fb05ea9c5c8774f382cfc20e2867cf5661..5c265492b418e882da6aeddacff4f7fe401276cf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,9 @@ USE_DBUS = false
 
 
 ROOT =         udev
-VERSION =      013_bk
+DAEMON =       udevd
+SENDER =       udevsend
+VERSION =      014_bk
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
@@ -92,7 +94,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)
@@ -115,11 +117,11 @@ 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 +142,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)
        @extras="$(EXTRAS)" ; for target in $$extras ; do \
                echo $$target ; \
                $(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
@@ -229,10 +238,18 @@ $(ROOT): $(OBJS) udev.h namedev.h udev_version.h udev_dbus.h udevdb.h klibc_fixu
        $(LD) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $(ROOT)
 
+$(DAEMON): udevd.h udevd.o udevd.o logging.o
+       $(LD) $(LDFLAGS) -o $(DAEMON) $(CRT0) udevd.o logging.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+       $(STRIPCMD) $(ROOT)
+
+$(SENDER): udevd.h udevsend.o udevd.o logging.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 ; \