[PATCH] 045 release

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 890667be9ddfe67be4b8e61712ab724653c77107..676302819d6e55a14d58f2ebf315a4b1e719527c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ INFO =                udevinfo
 TESTER =       udevtest
 STARTER =      udevstart
 WAIT =         wait_for_sysfs
-VERSION =      038
+VERSION =      045
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
@@ -137,6 +137,7 @@ endif
 # link udev against it statically.
 # Otherwise, use glibc and link dynamically.
 ifeq ($(strip $(USE_KLIBC)),true)
+       KLIBC_FIXUPS_DIR= $(PWD)/klibc_fixups
        KLIBC_BASE      = $(PWD)/klibc
        KLIBC_DIR       = $(KLIBC_BASE)/klibc
        INCLUDE_DIR     := $(KLIBC_BASE)/include
@@ -149,13 +150,15 @@ ifeq ($(strip $(USE_KLIBC)),true)
 
        CRT0 = $(KLIBC_DIR)/crt0.o
        LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
-       CFLAGS += $(WARNINGS) -nostdinc                 \
-               $(OPTFLAGS)                             \
-               -D__KLIBC__ -fno-builtin-printf         \
-               -I$(INCLUDE_DIR)                        \
-               -I$(INCLUDE_DIR)/arch/$(ARCH)           \
-               -I$(INCLUDE_DIR)/bits$(BITSIZE)         \
-               -I$(GCCINCDIR)                          \
+       CFLAGS += $(WARNINGS) -nostdinc                         \
+               $(OPTFLAGS)                                     \
+               -D__KLIBC__ -fno-builtin-printf                 \
+               -I$(KLIBC_FIXUPS_DIR)                           \
+               -include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h     \
+               -I$(INCLUDE_DIR)                                \
+               -I$(INCLUDE_DIR)/arch/$(ARCH)                   \
+               -I$(INCLUDE_DIR)/bits$(BITSIZE)                 \
+               -I$(GCCINCDIR)                                  \
                -I$(LINUX_INCLUDE_DIR)
        LIB_OBJS =
        LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
@@ -173,7 +176,8 @@ ifeq ($(strip $(USE_SELINUX)),true)
        LIB_OBJS += -lselinux
 endif
 
-CFLAGS += -I$(PWD)/libsysfs
+CFLAGS +=      -I$(PWD)/libsysfs/sysfs \
+               -I$(PWD)/libsysfs
 
 # config files automatically generated
 GEN_CONFIGS =  $(LOCAL_CFG_DIR)/udev.conf
@@ -185,6 +189,7 @@ all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(WAIT) $(GEN_CONFIGS)
                        LD="$(LD)" \
                        SYSFS="$(SYSFS)" \
                        KERNEL_DIR="$(KERNEL_DIR)" \
+                       QUIET="@$(PWD)/ccdv" \
                        -C $$target $@ ; \
        done ; \
 
@@ -211,6 +216,7 @@ OBJS =      udev_lib.o      \
        udev_config.o   \
        udev_add.o      \
        udev_remove.o   \
+       udev_sysfs.o    \
        udevdb.o        \
        namedev.o       \
        namedev_parse.o \
@@ -223,14 +229,18 @@ HEADERS = udev.h          \
                namedev.h       \
                udev_version.h  \
                udevdb.h        \
-               klibc_fixups.h  \
+               udev_sysfs.h    \
                logging.h       \
                selinux.h       \
                list.h
 
 ifeq ($(strip $(USE_KLIBC)),true)
-       OBJS += klibc_fixups.o
-       KLIBC_FIXUP = klibc_fixups.o
+       HEADERS +=      klibc_fixups/klibc_fixups.h     \
+                       klibc_fixups/mntent.h           \
+                       klibc_fixups/pwd.h
+
+       OBJS += klibc_fixups/klibc_fixups.o
+       KLIBC_FIXUP = klibc_fixups/klibc_fixups.o
 endif
 
 ifeq ($(strip $(V)),false)
@@ -302,7 +312,7 @@ $(SENDER): $(LIBC) $(SENDER).o $(OBJS) udevd.h
        $(QUIET) $(STRIPCMD) $@
 
 $(WAIT): $(WAIT).o $(OBJS) $(HEADERS) $(LIBC)
-       $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(WAIT).o $(SYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+       $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(WAIT).o udev_sysfs.o udev_lib.o udev_config.o $(SYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(QUIET) $(STRIPCMD) $@
 
 #.c.o:
@@ -453,3 +463,6 @@ uninstall: uninstall-man uninstall-dev.d
                $(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
                        -C $$target $@ ; \
        done ; \
+
+test: all
+       @ cd test && ./udev-test.pl