Fix params.c build warnings

[petitboot] / rules.mk

diff --git a/rules.mk b/rules.mk
index 32b0733b795851b46d46768c6ffd8ef49888dbf2..a665aa2c113cd7c446b601e0c440a5bb67b8e62b 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -19,8 +19,8 @@ parser_test = test/parser-test
 # install targets and components
 daemons = $(pb_discover)
 parsers = event kboot yaboot
-uis = $(pb_cui) $(pb_test)
-tests = $(parser_test)
+uis = $(pb_cui)
+tests = $(parser_test) $(pb_test)
 utils = $(pb_event)
 
 ifeq ($(PBTWIN),y)
@@ -29,6 +29,7 @@ endif
 
 # other to install
 artwork = background.jpg cdrom.png hdd.png usbpen.png tux.png cursor.gz
+man8 = pb-cui.8 pb-discover.8 pb-event.8 petitboot.8
 rules = utils/99-petitboot.rules
 udhcpc = utils/udhcpc
 
@@ -48,22 +49,30 @@ discover_objs = discover/event.o discover/user-event.o discover/udev.o \
        discover/parser-utils.o
 
 # client objs
-ui_common_objs = ui/common/discover-client.o ui/common/loader.o \
-       ui/common/ui-system.o ui/common/timer.o ui/common/url.o
-ncurses_objs = ui/ncurses/nc-scr.o ui/ncurses/nc-menu.o \
-        ui/ncurses/nc-ked.o ui/ncurses/nc-cui.o
+ui_common_objs = ui/common/discover-client.o ui/common/joystick.o \
+       ui/common/loader.o ui/common/ui-system.o ui/common/timer.o \
+       ui/common/url.o
+ncurses_objs = ui/ncurses/nc-scr.o ui/ncurses/nc-menu.o ui/ncurses/nc-ked.o \
+       ui/ncurses/nc-cui.o
 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)
 
@@ -73,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)
@@ -81,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)
@@ -98,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 $@ $^
@@ -123,11 +132,14 @@ 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
        $(INSTALL_DATA) $(top_srcdir)/$(udhcpc) $(DESTDIR)$(pkgdatadir)/utils
+       $(INSTALL) -d $(DESTDIR)$(mandir)/man8/
+       $(INSTALL_DATA) $(addprefix $(top_srcdir)/man/, $(man8)) \
+               $(DESTDIR)$(mandir)/man8/
 
 dist: $(PACKAGE)-$(VERSION).tar.gz