chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] crap, I messed up the 'sed' instances pretty badly, this fixes the config...
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 9922d6f173c50d52582649f5fa4e0d554b9edf50..fd46a93a4135c482f24ae3184ad47835fbf8adf8 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-34,7
+34,6
@@
SENDER = udevsend
INFO = udevinfo
TESTER = udevtest
STARTER = udevstart
INFO = udevinfo
TESTER = udevtest
STARTER = udevstart
-RULER = udevruler
WAIT = wait_for_sysfs
VERSION = 038
INSTALL_DIR = /usr/local/bin
WAIT = wait_for_sysfs
VERSION = 038
INSTALL_DIR = /usr/local/bin
@@
-264,16
+263,15
@@
udev_version.h:
# Rules on how to create the generated config files
$(LOCAL_CFG_DIR)/udev.conf:
# 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)
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)
$(ROOT).o: $(GEN_HEADERS) $(HOST_PROGS)
$(TESTER).o: $(GEN_HEADERS) $(HOST_PROGS)
$(INFO).o: $(GEN_HEADERS) $(HOST_PROGS)
@@
-302,10
+300,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) $@
$(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) $@
$(WAIT): $(WAIT).o $(OBJS) $(HEADERS) $(LIBC)
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(WAIT).o $(SYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
@@
-319,7
+313,7
@@
$(WAIT): $(WAIT).o $(OBJS) $(HEADERS) $(LIBC)
clean:
-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
| xargs rm -f
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 \
-rm -f ccdv
$(MAKE) -C klibc clean
@extras="$(EXTRAS)" ; for target in $$extras ; do \