[PATCH] v008 release

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index a2f904a7454a40addb70cc0ab4392f0cd525fa83..5c66db4697d614b0211bbfc363e132f2fef107ed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,11 +18,11 @@
 
 # Set the following to `true' to make a debuggable build.
 # Leave this set to `false' for production use.
-DEBUG = true
+DEBUG = false
 
 
 ROOT =         udev
-VERSION =      006_bk
+VERSION =      008
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 
@@ -55,6 +55,7 @@ udevdir = ${prefix}/udev/
 # to compile vs uClibc, that can be done here as well.
 CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
 CC = $(CROSS)gcc
+LD = $(CROSS)gcc
 AR = $(CROSS)ar
 STRIP = $(CROSS)strip
 RANLIB = $(CROSS)ranlib
@@ -63,7 +64,7 @@ export CROSS CC AR STRIP RANLIB
 
 # code taken from uClibc to determine the current arch
 ARCH := ${shell $(CC) -dumpmachine | sed -e s'/-.*//' -e 's/i.86/i386/' -e 's/sparc.*/sparc/' \
-       -e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/ppc/powerpc/g'}
+       -e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/powerpc/ppc/g'}
 
 # code taken from uClibc to determine the gcc include dir
 GCCINCDIR := ${shell $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp"}
@@ -109,6 +110,7 @@ endif
 ifeq ($(strip $(KLIBC)),true)
        KLIBC_DIR       = klibc/klibc
        INCLUDE_DIR     := $(KLIBC_DIR)/include
+       include $(KLIBC_DIR)/arch/$(ARCH)/MCONFIG
        # arch specific objects
        LIBGCC          = $(shell $(CC) --print-libgcc)
        ARCH_LIB_OBJS = \
@@ -117,10 +119,12 @@ ifeq ($(strip $(KLIBC)),true)
 
 
        CRT0 = $(KLIBC_DIR)/crt0.o
-       LIBC =  $(ARCH_LIB_OBJS) $(LIB_OBJS)
-       CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/bits32 -I$(GCCINCDIR) -Iklibc/linux/include -D__KLIBC__
+       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) -Iklibc/linux/include \
+               -D__KLIBC__
        LIB_OBJS =
-       LDFLAGS = --static --nostdlib -nostartfiles
+       LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
 else
        CRT0 =
        LIBC = 
@@ -129,9 +133,13 @@ else
        LDFLAGS = --static 
 endif
 
-all: $(LIBC) $(ROOT)
+all: $(ROOT)
 
-$(ARCH_LIB_OBJS) :
+$(ROOT): $(LIBC)
+
+$(ARCH_LIB_OBJS) : $(CRT0)
+
+$(CRT0):
        $(MAKE) -C klibc
 
 TDB =  tdb/tdb.o       \
@@ -146,11 +154,13 @@ SYSFS =   libsysfs/sysfs_bus.o    \
        libsysfs/dlist.o
 
 OBJS = udev.o          \
+       udev_config.o   \
        udev-add.o      \
        udev-remove.o   \
        udevdb.o        \
        logging.o       \
        namedev.o       \
+       namedev_parse.o \
        $(SYSFS)        \
        $(TDB)
 
@@ -164,12 +174,17 @@ GEN_HEADERS =     udev_version.h
 # Rules on how to create the generated header files
 udev_version.h:
        @echo \#define UDEV_VERSION     \"$(VERSION)\" > $@
-       @echo \#define UDEV_CONFIG_DIR  \"$(configdir)\" >> $@
        @echo \#define UDEV_ROOT        \"$(udevdir)\" >> $@
+       @echo \#define UDEV_DB          \"$(udevdir)\.udev.tdb\" >> $@
+       @echo \#define UDEV_CONFIG_DIR  \"$(configdir)\" >> $@
+       @echo \#define UDEV_CONFIG_FILE \"$(configdir)\udev.conf\" >> $@
+       @echo \#define UDEV_RULES_FILE  \"$(configdir)\udev.rules\" >> $@
+       @echo \#define UDEV_PERMISSION_FILE     \"$(configdir)\udev.permissions\" >> $@
 
+$(OBJS): $(GEN_HEADERS)
 
-$(ROOT): $(GEN_HEADERS) $(OBJS)
-       $(CC) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(ROOT): $(OBJS)
+       $(LD) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $(ROOT)
 
 clean:
@@ -216,7 +231,8 @@ install: all
        $(INSTALL) -d $(DESTDIR)$(hotplugdir)
        $(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
        $(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
-       $(INSTALL_DATA) udev.config $(DESTDIR)$(configdir)
+       $(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir)
+       $(INSTALL_DATA) udev.rules $(DESTDIR)$(configdir)
        $(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir)
        - rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
        - ln -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
@@ -224,7 +240,8 @@ install: all
 uninstall:
        - rm $(hotplugdir)/udev.hotplug
        - rm $(configdir)/udev.permissions
-       - rm $(configdir)/udev.config
+       - rm $(configdir)/udev.rules
+       - rm $(configdir)/udev.conf
        - rm $(mandir)/man8/udev.8
        - rm $(sbindir)/$(ROOT)
        - rmdir $(hotplugdir)