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

diff --git a/rules.mk b/rules.mk
index 607a25e..436d033 100644
--- a/rules.mk
+++ b/rules.mk
@@ -2,73 +2,138 @@
 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)"' \
 	'-DLOCAL_STATE_DIR="$(localstatedir)"'
 
-#uis = ui/twin/pb-twin
-uis = ui/test/pb-test
-#parsers = native yaboot kboot
-parsers = kboot
+# programs
+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 = event kboot yaboot
+uis = $(pb_cui) $(pb_test)
+tests = $(parser_test)
+utils = $(pb_event)
+
+ifeq ($(PBTWIN),y)
+	uis += $(pb_twin)
+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
 
-
-talloc_objs = lib/talloc/talloc.o
+# 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
-server_objs = lib/pb-protocol/pb-protocol.o
-parser_objs = discover/parser.o discover/parser-utils.o \
-	      $(foreach p, $(parsers), discover/$(p)-parser.o)
 
-parser_test_objs = parser-test.o $(parser_objs)
+# daemon objs
+parser_objs = discover/parser.o discover/parser-conf.o discover/paths.o \
+	$(foreach p, $(parsers), discover/$(p)-parser.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
 
-all: $(uis) discover/pb-discover
+# client 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
 
-# twin gui
-ui/twin/pb-twin: LDFLAGS+=$(twin_LDFLAGS)
-ui/twin/pb-twin: CFLAGS+=$(twin_CFLAGS)
+# Makefiles
+makefiles = Makefile $(top_srcdir)/rules.mk
+
+# object collections
+lib_objs = $(list_objs) $(log_objs) $(protocol_objs) $(system_objs) \
+	$(talloc_objs) $(waiter_objs)
 
-pb_twin_objs = ui/twin/pb-twin.o ui/common/devices.o
+daemon_objs = $(lib_objs) $(parser_objs) $(discover_objs)
 
-ui/twin/pb-twin: $(pb_twin_objs)
+client_objs = $(lib_objs) $(ui_common_objs)
+
+all: $(uis) $(daemons) $(utils)
+
+# ncurses cui
+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_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 $@ $^
 
 # test ui
-pb_test_objs = ui/test/pb-test.o ui/common/discover-client.o \
-	$(talloc_objs) $(server_objs) $(list_objs)
+pb_test_objs = $(client_objs) ui/test/pb-test.o
+$(pb_test_objs): $(makefiles)
 
-ui/test/pb-test: $(pb_test_objs)
+$(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)
+
+$(pb_twin): $(pb_twin_objs)
 	$(LINK.o) -o $@ $^
 
 # discovery daemon
-#pb_discover_objs = discover/params.o discover/parser.o discover/paths.o \
-#	      discover/yaboot-cfg.o \
-#	      $(foreach p,$(parsers),discover/$(p)-parser.o)
+pb_discover_objs = $(daemon_objs) discover/pb-discover.o
+$(pb_discover_objs): $(makefiles)
 
-pb_discover_objs = discover/pb-discover.o discover/udev.o discover/log.o \
-		   discover/discover-server.o discover/device-handler.o \
-		   discover/paths.o $(talloc_objs) $(server_objs) \
-		   $(parser_objs) $(list_objs) $(waiter_objs)
+$(pb_discover): $(pb_discover_objs)
+	$(LINK.o) -o $@ $^
 
-discover/pb-discover: $(pb_discover_objs)
+# 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 = $(lib_objs) $(parser_objs) test/parser-test.o
+$(parser_test_objs): $(makefiles)
 
-parser-test: $(parser_test_objs)
+$(parser_test): $(parser_test_objs)
 	$(LINK.o) -o $@ $^
 
-install: all
+parser-test: $(parser_test)
+
+install: all $(rules) $(udhcpc)
 	$(INSTALL) -d $(DESTDIR)$(sbindir)/
-	$(INSTALL) discover/pb-discover $(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_DATA) $(top_srcdir)/$(rules) $(DESTDIR)$(pkgdatadir)/utils
+	$(INSTALL_DATA) $(top_srcdir)/$(udhcpc) $(DESTDIR)$(pkgdatadir)/utils
 
-dist:	$(PACKAGE)-$(VERSION).tar.gz
+dist: $(PACKAGE)-$(VERSION).tar.gz
 
-check:	parser-test
-	devices/parser-test.sh
+check: parser-test
+	$(SHELL) test/parser-test.sh
 
 distcheck: dist
 	tar -xvf $(PACKAGE)-$(VERSION).tar.gz
@@ -78,16 +143,32 @@ $(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:
 	rm -rf $(PACKAGE)-$(VERSION)
 	rm -f $(uis)
-	rm -f $(pb_twin_objs) $(pb_test_objs)
+	rm -f $(pb_cui_objs)
+	rm -f $(pb_test_objs)
+	rm -f $(pb_twin_objs)
+	rm -f $(daemons)
 	rm -f $(pb_discover_objs)
-	rm -f discover/pb-discover
-	rm -f ui/test/pb-test
-
+	rm -f $(utils)
+	rm -f $(pb_event_objs)
+	rm -f $(tests)
+	rm -f $(parser_test_objs)
+
+maintainer-clean: clean
+	-rm -f $(top_srcdir)/aclocal.m4
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f $(top_srcdir)/config.h.in
+	-rm -f $(top_srcdir)/configure
+	-rm -f config.h
+	-rm -f config.log
+	-rm -f config.status
+	-rm -f Makefile
+	-rm -f $(PACKAGE)-$(VERSION).tar.gz