[PATCH] ARCH detection for ppc

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index d0c00aa88c935db8597088af7f7017b8616135c5..d8d2ec0d7baea7bba48905a57132456e513daa7a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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/' \
 
 # 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"}
 
 # code taken from uClibc to determine the gcc include dir
 GCCINCDIR := ${shell $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp"}


@@ -133,9 +133,13 @@ else
        LDFLAGS = --static 
 endif
 
        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       \
        $(MAKE) -C klibc
 
 TDB =  tdb/tdb.o       \


@@ -171,8 +175,9 @@ udev_version.h:
        @echo \#define UDEV_CONFIG_DIR  \"$(configdir)\" >> $@
        @echo \#define UDEV_ROOT        \"$(udevdir)\" >> $@
 
        @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)
 
        $(LD) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $(ROOT)