X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=rules.mk;h=436d0338f70eedf5e4660117123d9546c890ad42;hp=9b6d5ba110bf013059efde0c2f3d35291e42ceba;hb=d3e5eadbdcce508c48258b15664baa753ce6fc81;hpb=b90e4c95a69fcd5a561db71df940f0b5085b1c41

diff --git a/rules.mk b/rules.mk
index 9b6d5ba..436d033 100644
--- 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)"' \
@@ -12,14 +13,15 @@ pb_discover = discover/pb-discover
 pb_cui = ui/ncurses/pb-cui
 pb_test = ui/test/pb-test
 pb_twin = ui/twin/pb-twin
+pb_event = utils/pb-event
 parser_test = test/parser-test
 
 # install targets and components
 daemons = $(pb_discover)
-#parsers = kboot native yaboot (todo)
-parsers = kboot
-uis = $(pb_test)
+parsers = event kboot yaboot
+uis = $(pb_cui) $(pb_test)
 tests = $(parser_test)
+utils = $(pb_event)
 
 ifeq ($(PBTWIN),y)
 	uis += $(pb_twin)
@@ -28,43 +30,52 @@ endif
 # other to install
 artwork = background.jpg cdrom.png hdd.png usbpen.png tux.png cursor.gz
 rules = utils/99-petitboot.rules
+udhcpc = utils/udhcpc
 
 # client/daemon lib objs
 list_objs = lib/list/list.o
 log_objs = lib/log/log.o
 protocol_objs = lib/pb-protocol/pb-protocol.o
+system_objs = lib/system/system.o
 talloc_objs = lib/talloc/talloc.o
 waiter_objs = lib/waiter/waiter.o
 
 # daemon objs
-parser_objs = discover/parser.o discover/parser-utils.o \
+parser_objs = discover/parser.o discover/parser-conf.o discover/paths.o \
 	$(foreach p, $(parsers), discover/$(p)-parser.o)
-discover_objs = discover/udev.o discover/discover-server.o \
-	discover/device-handler.o discover/paths.o
+discover_objs = discover/event.o discover/user-event.o discover/udev.o \
+	discover/discover-server.o discover/device-handler.o discover/paths.o \
+	discover/parser-utils.o
 
 # client objs
-ui_common_objs = ui/common/discover-client.o
-ncurses_objs =
+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
 
 # object collections
-lib_objs = $(list_objs) $(log_objs) $(protocol_objs) $(talloc_objs) \
-	$(waiter_objs)
+lib_objs = $(list_objs) $(log_objs) $(protocol_objs) $(system_objs) \
+	$(talloc_objs) $(waiter_objs)
 
 daemon_objs = $(lib_objs) $(parser_objs) $(discover_objs)
 
 client_objs = $(lib_objs) $(ui_common_objs)
 
-all: $(uis) $(daemons)
+all: $(uis) $(daemons) $(utils)
 
 # ncurses cui
-pb_cui_objs = $(client_objs) $(ncurses_objs) ui/ncurses/ps3-cui.o
-$(pb_cui_objs): $(makefiles)
+pb_cui_objs-y$(ENABLE_PS3) += ui/ncurses/pb-cui.o
+pb_cui_objs-$(ENABLE_PS3) += ui/ncurses/ps3-cui.o ui/common/ps3.o
+pb_cui_ldflags-$(ENABLE_PS3) += -lps3-utils
 
-$(pb_cui): LDFLAGS += -lncurses
+pb_cui_objs = $(client_objs) $(ncurses_objs) $(pb_cui_objs-y)
+$(pb_cui_objs): $(makefiles)
+$(pb_cui): LDFLAGS += $(pb_cui_ldflags-y) -lmenu -lform -lncurses
 
 $(pb_cui): $(pb_cui_objs)
 	$(LINK.o) -o $@ $^
@@ -93,8 +104,15 @@ $(pb_discover_objs): $(makefiles)
 $(pb_discover): $(pb_discover_objs)
 	$(LINK.o) -o $@ $^
 
+# utils
+pb_event_objs = utils/pb-event.o
+$(pb_event_objs): $(makefiles)
+
+$(pb_event): $(pb_event_objs)
+	$(LINK.o) -o $@ $^
+
 # parser-test
-parser_test_objs = $(parser_objs) test/parser-test.o
+parser_test_objs = $(lib_objs) $(parser_objs) test/parser-test.o
 $(parser_test_objs): $(makefiles)
 
 $(parser_test): $(parser_test_objs)
@@ -102,14 +120,15 @@ $(parser_test): $(parser_test_objs)
 
 parser-test: $(parser_test)
 
-install: all $(rules)
+install: all $(rules) $(udhcpc)
 	$(INSTALL) -d $(DESTDIR)$(sbindir)/
-	$(INSTALL) $(daemons) $(uis) $(DESTDIR)$(sbindir)/
+	$(INSTALL_PROGRAM) $(daemons) $(uis) $(utils) $(DESTDIR)$(sbindir)/
 	$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/artwork/
-	$(INSTALL) $(addprefix $(top_srcdir)/ui/twin/artwork/,$(artwork)) \
+	$(INSTALL_DATA) $(addprefix $(top_srcdir)/ui/twin/artwork/,$(artwork)) \
 		$(DESTDIR)$(pkgdatadir)/artwork/
 	$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/utils
-	$(INSTALL) $(top_srcdir)/$(rules) $(DESTDIR)$(pkgdatadir)/utils
+	$(INSTALL_DATA) $(top_srcdir)/$(rules) $(DESTDIR)$(pkgdatadir)/utils
+	$(INSTALL_DATA) $(top_srcdir)/$(udhcpc) $(DESTDIR)$(pkgdatadir)/utils
 
 dist: $(PACKAGE)-$(VERSION).tar.gz
 
@@ -124,10 +143,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:
@@ -138,6 +157,8 @@ clean:
 	rm -f $(pb_twin_objs)
 	rm -f $(daemons)
 	rm -f $(pb_discover_objs)
+	rm -f $(utils)
+	rm -f $(pb_event_objs)
 	rm -f $(tests)
 	rm -f $(parser_test_objs)