[PATCH] pass SYSFS setting down for extras builds

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 9922d6f173c50d52582649f5fa4e0d554b9edf50..890667be9ddfe67be4b8e61712ab724653c77107 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,6 @@ SENDER =      udevsend
 INFO =         udevinfo
 TESTER =       udevtest
 STARTER =      udevstart
-RULER =                udevruler
 WAIT =         wait_for_sysfs
 VERSION =      038
 INSTALL_DIR =  /usr/local/bin
@@ -184,6 +183,7 @@ 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 ; \
@@ -199,13 +199,13 @@ $(CRT0):
 TDB =  tdb/tdb.o       \
        tdb/spinlock.o
 
-SYSFS =        libsysfs/sysfs_bus.o    \
-       libsysfs/sysfs_class.o  \
-       libsysfs/sysfs_device.o \
-       libsysfs/sysfs_dir.o    \
-       libsysfs/sysfs_driver.o \
-       libsysfs/sysfs_utils.o  \
-       libsysfs/dlist.o
+SYSFS =        $(PWD)/libsysfs/sysfs_bus.o     \
+       $(PWD)/libsysfs/sysfs_class.o   \
+       $(PWD)/libsysfs/sysfs_device.o  \
+       $(PWD)/libsysfs/sysfs_dir.o     \
+       $(PWD)/libsysfs/sysfs_driver.o  \
+       $(PWD)/libsysfs/sysfs_utils.o   \
+       $(PWD)/libsysfs/dlist.o
 
 OBJS = udev_lib.o      \
        udev_config.o   \
@@ -264,16 +264,15 @@ udev_version.h:
 
 # Rules on how to create the generated config files
 $(LOCAL_CFG_DIR)/udev.conf:
-       $(QUIET) sed -e "s:@udevdir@:$(udevdir):" -e "s:@configdir@:$(configdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
+       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)
-       $(QUIET) sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@
+       sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@
 
-
-$(OBJS): $(GEN_HEADERS)
+$(OBJS): $(GEN_HEADERS) $(HOST_PROGS)
 $(ROOT).o: $(GEN_HEADERS) $(HOST_PROGS)
 $(TESTER).o: $(GEN_HEADERS) $(HOST_PROGS)
 $(INFO).o: $(GEN_HEADERS) $(HOST_PROGS)
@@ -302,10 +301,6 @@ $(SENDER): $(LIBC) $(SENDER).o $(OBJS) udevd.h
        $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o udev_lib.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(QUIET) $(STRIPCMD) $@
 
-$(RULER): $(LIBC) $(RULER).o $(OBJS) $(HEADERS)
-       $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevruler.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS) -lnewt
-       $(QUIET) $(STRIPCMD) $@
-
 $(WAIT): $(WAIT).o $(OBJS) $(HEADERS) $(LIBC)
        $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(WAIT).o $(SYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(QUIET) $(STRIPCMD) $@
@@ -319,7 +314,7 @@ $(WAIT): $(WAIT).o $(OBJS) $(HEADERS) $(LIBC)
 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 core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) $(SENDER) $(TESTER) $(WAIT)
        -rm -f ccdv
        $(MAKE) -C klibc clean
        @extras="$(EXTRAS)" ; for target in $$extras ; do \