[PATCH] pull some klibc stuff into the make Makefile to try to stay in sync.

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 6b2c39993c3cd892a8467acfb6793311c2a8ffca..8d7122858b3660df403a240643b563aecd3aefe6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ DEBUG = true
 
 
 ROOT =         udev
-VERSION =      004_bk
+VERSION =      005
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 
@@ -106,19 +106,22 @@ 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
        # 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)
 
+       CRT0 = $(KLIBC_DIR)/crt0.o
        LIBC =  $(ARCH_LIB_OBJS) $(LIB_OBJS)
-       CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(GCCINCDIR)
+       CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/bits32 -I$(GCCINCDIR) -Iklibc/linux/include -D__KLIBC__
+       LIB_OBJS =
        LDFLAGS = --static --nostdlib -nostartfiles
 else
+       CRT0 =
        LIBC = 
        CFLAGS += -I$(GCCINCDIR)
        LIB_OBJS = -lc
@@ -147,6 +150,7 @@ OBJS =      udev.o          \
        udevdb.o        \
        logging.o       \
        namedev.o       \
+       klibc_fixups.o  \
        $(SYSFS)        \
        $(TDB)