X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=340ca87f2a7b6580ae0de360697e733f1cb6772a;hp=d0c00aa88c935db8597088af7f7017b8616135c5;hb=29b82deb7e8d7634792bd50be1377bae170a8acb;hpb=74894b53f8f9f4de6f269a5c0c0f8ea03baa1587

diff --git a/Makefile b/Makefile
index d0c00aa88..340ca87f2 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 
 # Set the following to `true' to make a debuggable build.
 # Leave this set to `false' for production use.
-DEBUG = true
+DEBUG = false
 
 
 ROOT =		udev
@@ -64,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"}
@@ -124,7 +124,7 @@ ifeq ($(strip $(KLIBC)),true)
 		-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 = 
@@ -133,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	\
@@ -155,6 +159,7 @@ OBJS =	udev.o		\
 	udevdb.o	\
 	logging.o	\
 	namedev.o	\
+	namedev_parse.o	\
 	$(SYSFS)	\
 	$(TDB)
 
@@ -171,8 +176,9 @@ udev_version.h:
 	@echo \#define UDEV_CONFIG_DIR	\"$(configdir)\" >> $@
 	@echo \#define UDEV_ROOT	\"$(udevdir)\" >> $@
 
+$(OBJS): $(GEN_HEADERS)
 
-$(ROOT): $(GEN_HEADERS) $(OBJS)
+$(ROOT): $(OBJS)
 	$(LD) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
 	$(STRIPCMD) $(ROOT)