[PATCH] fix up error in building extras and libsysfs

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 356d1a9f59c8064e9db32b5d469b48349b1a92eb..1f9578e7f488f7bc1de4c083ac3161d9c928fbec 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ TESTER =      udevtest
 STARTER =      udevstart
 RULER =                udevruler
 WAIT =         wait_for_sysfs
-VERSION =      036
+VERSION =      037
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
@@ -112,7 +112,7 @@ OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>
 # add -Wredundant-decls when libsysfs gets cleaned up
 WARNINGS := -Wall 
 
-CFLAGS := -pipe -Dasmlinkage=
+CFLAGS := -pipe
 
 # set up the proper tdb spinlock code if we can
 ifeq ($(strip $(ARCH)),i386)
@@ -184,7 +184,6 @@ all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(WAIT) $(GEN_CONFIGS)
                echo $$target ; \
                $(MAKE) prefix=$(prefix) \
                        LD="$(LD)" \
-                       SYSFS="$(SYSFS)" \
                        KERNEL_DIR="$(KERNEL_DIR)" \
                        -C $$target $@ ; \
        done ; \
@@ -251,6 +250,7 @@ ccdv:
 
 # Rules on how to create the generated header files
 udev_version.h:
+       @echo "Creating udev_version.h"
        @echo \#define UDEV_VERSION             \"$(VERSION)\" > $@
        @echo \#define UDEV_ROOT                \"$(udevdir)/\" >> $@
        @echo \#define UDEV_DB                  \"$(udevdir)/.udev.tdb\" >> $@
@@ -264,23 +264,23 @@ udev_version.h:
 
 # Rules on how to create the generated config files
 $(LOCAL_CFG_DIR)/udev.conf:
-       @./ccdv sed -e "s:@udevdir@:$(udevdir):" -e "s:@configdir@:$(configdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
+       $(QUIET) sed -e "s:@udevdir@:$(udevdir):" -e "s:@configdir@:$(configdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
 
 GEN_MANPAGES   = udev.8
 GEN_MANPAGESIN = udev.8.in
 # Rules on how to create the man pages
 $(GEN_MANPAGES): $(GEN_MANPAGESIN)
-       @./ccdv sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@
+       $(QUIET) sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@
 
 
 $(OBJS): $(GEN_HEADERS)
 $(ROOT).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(TESTER).o: $(GEN_HEADERS)
-$(INFO).o: $(GEN_HEADERS)
-$(DAEMON).o: $(GEN_HEADERS)
-$(SENDER).o: $(GEN_HEADERS)
-$(STARTER).o: $(GEN_HEADERS)
-$(WAIT).o: $(GEN_HEADERS)
+$(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)
+$(WAIT).o: $(GEN_HEADERS) $(HOST_PROGS)
 
 $(ROOT): $(LIBC) $(ROOT).o $(STARTER).o $(OBJS) $(HEADERS) $(GEN_MANPAGES)
        $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o udevstart.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
@@ -320,7 +320,7 @@ clean:
        -find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
         | xargs rm -f 
        -rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) $(SENDER) $(TESTER) $(RULER) $(WAIT)
-       - rm -f ccdv
+       -rm -f ccdv
        $(MAKE) -C klibc clean
        @extras="$(EXTRAS)" ; for target in $$extras ; do \
                echo $$target ; \