X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=rules.mk;h=a665aa2c113cd7c446b601e0c440a5bb67b8e62b;hp=3b1dcfedb4f77c9bae17b97cbd393703edcee880;hb=2f8734a2e2f438dfc437ce7f29d98e3ff9572980;hpb=93b2c2e0f0ca46d2a823b33cdfa44d082e9e8d10

diff --git a/rules.mk b/rules.mk
index 3b1dcfe..a665aa2 100644
--- a/rules.mk
+++ b/rules.mk
@@ -59,13 +59,20 @@ twin_objs = ui/twin/pb-twin.o
 # Makefiles
 makefiles = Makefile $(top_srcdir)/rules.mk
 
+# headers
+discover_headers = $(wildcard $(top_srcdir)/discover/*.h)
+lib_headers = $(wildcard $(top_srcdir)/lib/*/*.h)
+ui_headers = $(wildcard $(top_srcdir)/ui/*/*.h)
+
 # object collections
 lib_objs = $(list_objs) $(log_objs) $(protocol_objs) $(system_objs) \
 	$(talloc_objs) $(waiter_objs)
 
 daemon_objs = $(lib_objs) $(parser_objs) $(discover_objs)
+daemon_headers = $(lib_headers) $(discover_headers)
 
 client_objs = $(lib_objs) $(ui_common_objs)
+client_headers = $(lib_headers) $(discover_headers) $(ui_headers)
 
 all: $(uis) $(daemons) $(utils)
 
@@ -75,7 +82,7 @@ pb_cui_objs-$(ENABLE_PS3) += ui/ncurses/ps3-cui.o ui/common/ps3.o
 pb_cui_ldflags-$(ENABLE_PS3) += -lps3-utils
 
 pb_cui_objs = $(client_objs) $(ncurses_objs) $(pb_cui_objs-y)
-$(pb_cui_objs): $(makefiles)
+$(pb_cui_objs): $(makefiles) $(client_headers)
 $(pb_cui): LDFLAGS += $(pb_cui_ldflags-y) -lmenu -lform -lncurses
 
 $(pb_cui): $(pb_cui_objs)
@@ -83,14 +90,14 @@ $(pb_cui): $(pb_cui_objs)
 
 # test ui
 pb_test_objs = $(client_objs) ui/test/pb-test.o
-$(pb_test_objs): $(makefiles)
+$(pb_test_objs): $(makefiles) $(client_headers)
 
 $(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_objs): $(makefiles) $(client_headers)
 
 $(pb_twin): LDFLAGS+=$(twin_LDFLAGS) $(LIBTWIN)
 $(pb_twin): CFLAGS+=$(twin_CFLAGS)
@@ -100,21 +107,21 @@ $(pb_twin): $(pb_twin_objs)
 
 # discovery daemon
 pb_discover_objs = $(daemon_objs) discover/pb-discover.o
-$(pb_discover_objs): $(makefiles)
+$(pb_discover_objs): $(makefiles) $(daemon_headers)
 
 $(pb_discover): $(pb_discover_objs)
 	$(LINK.o) -o $@ $^
 
 # utils
 pb_event_objs = utils/pb-event.o
-$(pb_event_objs): $(makefiles)
+$(pb_event_objs): $(makefiles) $(client_headers)
 
 $(pb_event): $(pb_event_objs)
 	$(LINK.o) -o $@ $^
 
 # parser-test
 parser_test_objs = $(lib_objs) $(parser_objs) test/parser-test.o
-$(parser_test_objs): $(makefiles)
+$(parser_test_objs): $(makefiles) $(client_headers)
 
 $(parser_test): $(parser_test_objs)
 	$(LINK.o) -o $@ $^
@@ -125,7 +132,7 @@ install: all $(rules) $(udhcpc)
 	$(INSTALL) -d $(DESTDIR)$(sbindir)/
 	$(INSTALL_PROGRAM) $(daemons) $(uis) $(utils) $(DESTDIR)$(sbindir)/
 	$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/artwork/
-	$(INSTALL_DATA) $(addprefix $(top_srcdir)/ui/twin/artwork/,$(artwork)) \
+	$(INSTALL_DATA) $(addprefix $(top_srcdir)/ui/common/artwork/,$(artwork)) \
 		$(DESTDIR)$(pkgdatadir)/artwork/
 	$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/utils
 	$(INSTALL_DATA) $(top_srcdir)/$(rules) $(DESTDIR)$(pkgdatadir)/utils