[PATCH] klibc makefile fixes

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index f39fe224614a4369ca7ba993299fb32c335db9fe..d0c00aa88c935db8597088af7f7017b8616135c5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ DEBUG = true
 
 
 ROOT =         udev
-VERSION =      005_bk
+VERSION =      007_bk
 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
@@ -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,8 +119,10 @@ 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
 else
@@ -151,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
 
@@ -166,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:
@@ -215,6 +222,7 @@ install: all
        $(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: