[PATCH] klibc makefile fixes

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 82ea0bc309214713fea08ed0e6d79797f0a0526e..d0c00aa88c935db8597088af7f7017b8616135c5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,10 +22,11 @@ DEBUG = true
 
 
 ROOT =         udev
-VERSION =      005
+VERSION =      007_bk
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 
+DESTDIR =
 # override this to make udev look in a different location for it's config files
 prefix =
 exec_prefix =  ${prefix}
@@ -54,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
@@ -106,19 +108,25 @@ endif
 # If we are using our version of klibc, then we need to build and link it.
 # Otherwise, use glibc and link statically.
 ifeq ($(strip $(KLIBC)),true)
-       KLIBC_DIR       = klibc
+       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 = \
-                       $(KLIBC_DIR)/bin-$(ARCH)/start.o        \
-                       $(KLIBC_DIR)/bin-$(ARCH)/klibc.a
+                       $(KLIBC_DIR)/libc.a     \
+                       $(LIBGCC)
 
-       LIB_OBJS =      $(GCC_LIB)
 
-       LIBC =  $(ARCH_LIB_OBJS) $(LIB_OBJS)
-       CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(GCCINCDIR)
+       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) -Iklibc/linux/include \
+               -D__KLIBC__
+       LIB_OBJS =
        LDFLAGS = --static --nostdlib -nostartfiles
 else
+       CRT0 =
        LIBC = 
        CFLAGS += -I$(GCCINCDIR)
        LIB_OBJS = -lc
@@ -147,10 +155,13 @@ OBJS =    udev.o          \
        udevdb.o        \
        logging.o       \
        namedev.o       \
-       klibc_fixups.o  \
        $(SYSFS)        \
        $(TDB)
 
+ifeq ($(strip $(KLIBC)),true)
+       OBJS += klibc_fixups.o
+endif
+
 # header files automatically generated
 GEN_HEADERS =  udev_version.h
 
@@ -162,7 +173,7 @@ udev_version.h:
 
 
 $(ROOT): $(GEN_HEADERS) $(OBJS)
-       $(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+       $(LD) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $(ROOT)
 
 clean:
@@ -174,7 +185,19 @@ clean:
 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 )
 DISTDIR := $(RELEASE_NAME)
 srcdir = .
-release: $(DISTFILES) clean
+release: clean
+       @echo "--------------------------cut here------------------------"
+       @echo "cd .."
+       @echo "rm -rf $(DISTDIR)"
+       @echo "mkdir $(DISTDIR)"
+       @echo "chmod 777 $(DISTDIR)"
+       @echo "cp -avr udev/* $(DISTDIR)"
+       @echo "tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz"
+       @echo "rm -rf $(DISTDIR)"
+       @echo "--------------------------cut here------------------------"
+
+
+small_release: $(DISTFILES) clean
 #      @echo $(DISTFILES)
        @-rm -rf $(DISTDIR)
        @mkdir $(DISTDIR)
@@ -192,14 +215,15 @@ release: $(DISTFILES) clean
 
 
 install: all
-       $(INSTALL) -d $(udevdir)
-       $(INSTALL) -d $(configdir)
-       $(INSTALL) -d $(hotplugdir)
-       $(INSTALL_PROGRAM) -D $(ROOT) $(sbindir)/$(ROOT)
-       $(INSTALL_DATA) -D udev.8 $(mandir)/man8/udev.8
-       $(INSTALL_DATA) udev.config $(configdir)
-       $(INSTALL_DATA) udev.permissions $(configdir)
-       - ln -s $(sbindir)/$(ROOT) $(hotplugdir)/udev.hotplug
+       $(INSTALL) -d $(DESTDIR)$(udevdir)
+       $(INSTALL) -d $(DESTDIR)$(configdir)
+       $(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.permissions $(DESTDIR)$(configdir)
+       - rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
+       - ln -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
 
 uninstall:
        - rm $(hotplugdir)/udev.hotplug