Get log stream

[petitboot] / rules.mk

diff --git a/rules.mk b/rules.mk
index c844c05dcf4b9602189c0130e64efec911f5763a..43e047b36d179e19b72275bce4b5285af7f9ea1d 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -2,6 +2,7 @@
 VPATH = $(srcdir)
 
 CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(builddir)
+LDFLAGS += $(CFLAGS)
 
 # we need paths to be overridable at build-time
 DEFS += '-DPREFIX="$(prefix)"' '-DPKG_SHARE_DIR="$(pkgdatadir)"' \
@@ -47,6 +48,9 @@ ui_common_objs = ui/common/discover-client.o
 ncurses_objs =
 twin_objs = ui/twin/pb-twin.o
 
+# Makefiles
+makefiles = Makefile $(top_srcdir)/rules.mk
+
 # object collections
 lib_objs = $(list_objs) $(log_objs) $(protocol_objs) $(talloc_objs) \
        $(waiter_objs)
@@ -59,6 +63,7 @@ all: $(uis) $(daemons)
 
 # ncurses cui
 pb_cui_objs = $(client_objs) $(ncurses_objs) ui/ncurses/ps3-cui.o
+$(pb_cui_objs): $(makefiles)
 
 $(pb_cui): LDFLAGS += -lncurses
 
@@ -67,12 +72,14 @@ $(pb_cui): $(pb_cui_objs)
 
 # test ui
 pb_test_objs = $(client_objs) ui/test/pb-test.o
+$(pb_test_objs): $(makefiles)
 
 $(pb_test): $(pb_test_objs)
        $(LINK.o) -o $@ $^
 
 # twin gui
 pb_twin_objs = $(client_objs) $(twin_objs) ui/twin/ps3-twin.o
+$(pb_twin_objs): $(makefiles)
 
 $(pb_twin): LDFLAGS+=$(twin_LDFLAGS) $(LIBTWIN)
 $(pb_twin): CFLAGS+=$(twin_CFLAGS)
@@ -82,12 +89,14 @@ $(pb_twin): $(pb_twin_objs)
 
 # discovery daemon
 pb_discover_objs = $(daemon_objs) discover/pb-discover.o
+$(pb_discover_objs): $(makefiles)
 
 $(pb_discover): $(pb_discover_objs)
        $(LINK.o) -o $@ $^
 
 # parser-test
 parser_test_objs = $(parser_objs) test/parser-test.o
+$(parser_test_objs): $(makefiles)
 
 $(parser_test): $(parser_test_objs)
        $(LINK.o) -o $@ $^
@@ -116,10 +125,10 @@ $(PACKAGE)-$(VERSION).tar.gz: $(PACKAGE)-$(VERSION)
        tar czvf $@ $^
 
 $(PACKAGE)-$(VERSION): clean
-       for f in $$(git-ls-files); do \
+       for f in $$(git --git-dir=$(top_srcdir)/.git ls-files); do \
                d=$@/$$(dirname $$f); \
                mkdir -p $$d; \
-               cp -a $$f $$d; \
+               cp -a $(top_srcdir)/$$f $$d; \
        done
 
 clean: