X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=d8d2ec0d7baea7bba48905a57132456e513daa7a;hp=cd539eeb74f6a6e19d7fdca60331ac34e3921e39;hb=bfd8a5d0f7361b6cb396eee7cdd686138ecd2066;hpb=baa936855ece1b8ce0343c7c38b7d12b0a34455c

diff --git a/Makefile b/Makefile
index cd539eeb7..d8d2ec0d7 100644
--- 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
@@ -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,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
@@ -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	\
@@ -151,10 +159,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
 
@@ -164,9 +175,10 @@ udev_version.h:
 	@echo \#define UDEV_CONFIG_DIR	\"$(configdir)\" >> $@
 	@echo \#define UDEV_ROOT	\"$(udevdir)\" >> $@
 
+$(OBJS): $(GEN_HEADERS)
 
-$(ROOT): $(GEN_HEADERS) $(OBJS)
-	$(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(ROOT): $(OBJS)
+	$(LD) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
 	$(STRIPCMD) $(ROOT)
 
 clean:
@@ -215,7 +227,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 $(DESTDIR)$(hotplugdir)/udev.hotplug
+	- rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
 	- ln -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
 
 uninstall: