[PATCH] fix make -j4 and the local klibc-install

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 9d9caec7f70f4e41c26b7c558980d50fa4bf7ba3..9c755ba4de94aa6eed1bed1f9a60c98f8f6332b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,6 @@ VERSION =     056
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
-HOTPLUG_EXEC = $(ROOT)
 DESTDIR =
 KERNEL_DIR = /lib/modules/${shell uname -r}/build
 
@@ -218,7 +217,7 @@ all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(STARTER) $(GEN_CONFIGS) $(K
        done ; \
 
 $(KLCC):
-       $(MAKE) -C klibc KRNLSRC=$(KERNEL_DIR) SUBDIRS=klibc TESTS= \
+       $(MAKE) -j1 -C klibc KRNLSRC=$(KERNEL_DIR) SUBDIRS=klibc TESTS= \
                         SHLIBDIR=$(KLIBC_INSTALL)/lib \
                         INSTALLDIR=$(KLIBC_INSTALL) \
                         bindir=$(KLIBC_INSTALL)/bin \
@@ -264,15 +263,15 @@ GEN_MANPAGESIN = udev.8.in
 $(GEN_MANPAGES): $(GEN_MANPAGESIN)
        sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@
 
-$(UDEV_OBJS): $(GEN_HEADERS) $(HOST_PROGS)
-$(SYSFS_OBJS): $(HOST_PROGS)
-$(OBJS): $(GEN_HEADERS) $(HOST_PROGS)
-$(ROOT).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(TESTER).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(INFO).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(DAEMON).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(SENDER).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(STARTER).o: $(GEN_HEADERS) $(HOST_PROGS)
+$(UDEV_OBJS): $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(SYSFS_OBJS): $(HOST_PROGS) $(KLCC)
+$(OBJS): $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(ROOT).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(TESTER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(INFO).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(DAEMON).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(SENDER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(STARTER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
 
 $(ROOT): $(KLCC) $(ROOT).o $(OBJS) $(HEADERS) $(GEN_MANPAGES)
        $(QUIET) $(LD) $(LDFLAGS) -o $@ $(ROOT).o $(OBJS) $(LIB_OBJS)