X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=rules.mk;h=097daaee50cdd2e210fdc3457e338935a8615806;hp=9239d29248cd23947df44a0d0f41f724049c7389;hb=7eb1d21503768c849e2d4b8c455a182d82cdc966;hpb=000a92b4fa909c432732ac3ed8f28eeeaeac70ee

diff --git a/rules.mk b/rules.mk
index 9239d29..097daae 100644
--- a/rules.mk
+++ b/rules.mk
@@ -1,49 +1,121 @@
 
 VPATH = $(srcdir)
 
-# we need paths to be overridable at build-time
-DEFS += '-DPREFIX="$(prefix)"' '-DPKG_SHARE_DIR="$(pkgdatadir)"'
+CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(builddir)
+LDFLAGS += $(CFLAGS)
 
-parsers = native yaboot kboot
+# we need paths to be overridable at build-time
+DEFS += '-DPREFIX="$(prefix)"' '-DPKG_SHARE_DIR="$(pkgdatadir)"' \
+	'-DLOCAL_STATE_DIR="$(localstatedir)"'
+
+# programs
+pb_discover = discover/pb-discover
+pb_cui = ui/ncurses/pb-cui
+pb_test = ui/test/pb-test
+pb_twin = ui/twin/pb-twin
+parser_test = test/parser-test
+
+# install targets and components
+daemons = $(pb_discover)
+parsers = kboot yaboot
+uis = $(pb_test)
+tests = $(parser_test)
+
+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
+
+# client/daemon lib objs
+list_objs = lib/list/list.o
+log_objs = lib/log/log.o
+protocol_objs = lib/pb-protocol/pb-protocol.o
+talloc_objs = lib/talloc/talloc.o
+waiter_objs = lib/waiter/waiter.o
+
+# daemon objs
+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/parser-utils.o
+
+# client objs
+ui_common_objs = ui/common/discover-client.o
+ncurses_objs =
+twin_objs = ui/twin/pb-twin.o
 
-petitboot_objs = petitboot.o devices.o
+# Makefiles
+makefiles = Makefile $(top_srcdir)/rules.mk
 
-parser_objs = devices/params.o devices/parser.o devices/paths.o \
-	      devices/yaboot-cfg.o \
-	      $(foreach p,$(parsers),devices/$(p)-parser.o)
+# object collections
+lib_objs = $(list_objs) $(log_objs) $(protocol_objs) $(talloc_objs) \
+	$(waiter_objs)
 
-petitboot_udev_helper_objs = devices/petitboot-udev-helper.o $(parser_objs)
-parser_test_objs = parser-test.o $(parser_objs)
+daemon_objs = $(lib_objs) $(parser_objs) $(discover_objs)
 
-all: petitboot petitboot-udev-helper
+client_objs = $(lib_objs) $(ui_common_objs)
 
-petitboot: LDFLAGS+=$(twin_LDFLAGS)
-petitboot: CFLAGS+=$(twin_CFLAGS)
+all: $(uis) $(daemons)
 
-petitboot: $(petitboot_objs)
+# ncurses cui
+pb_cui_objs = $(client_objs) $(ncurses_objs) ui/ncurses/ps3-cui.o \
+	ui/common/ps3.o
+$(pb_cui_objs): $(makefiles)
+
+$(pb_cui): LDFLAGS += -lps3-utils -lmenu -lform -lncurses
+
+$(pb_cui): $(pb_cui_objs)
 	$(LINK.o) -o $@ $^
 
-petitboot-udev-helper: $(petitboot_udev_helper_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 $@ $^
 
-parser-test: $(parser_test_objs)
+# 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 = $(daemon_objs) discover/pb-discover.o
+$(pb_discover_objs): $(makefiles)
+
+$(pb_discover): $(pb_discover_objs)
 	$(LINK.o) -o $@ $^
 
-petitboot-udev-helper: CFLAGS+=-I$(top_srcdir)
+# parser-test
+parser_test_objs = $(lib_objs) $(parser_objs) test/parser-test.o
+$(parser_test_objs): $(makefiles)
 
-install: all
-	$(INSTALL) -D petitboot $(DESTDIR)$(sbindir)/petitboot
-	$(INSTALL) -D petitboot-udev-helper \
-		$(DESTDIR)$(sbindir)/petitboot-udev-helper
-	$(INSTALL) -Dd $(DESTDIR)$(pkgdatadir)/artwork/
-	$(INSTALL) -t $(DESTDIR)$(pkgdatadir)/artwork/ \
-		$(foreach a,$(artwork),$(top_srcdir)/artwork/$(a))
+$(parser_test): $(parser_test_objs)
+	$(LINK.o) -o $@ $^
+
+parser-test: $(parser_test)
 
-dist:	$(PACKAGE)-$(VERSION).tar.gz
+install: all $(rules)
+	$(INSTALL) -d $(DESTDIR)$(sbindir)/
+	$(INSTALL) $(daemons) $(uis) $(DESTDIR)$(sbindir)/
+	$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/artwork/
+	$(INSTALL) $(addprefix $(top_srcdir)/ui/twin/artwork/,$(artwork)) \
+		$(DESTDIR)$(pkgdatadir)/artwork/
+	$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/utils
+	$(INSTALL) -m 644 $(top_srcdir)/$(rules) $(DESTDIR)$(pkgdatadir)/utils
 
-check:	parser-test
-	devices/parser-test.sh
+dist: $(PACKAGE)-$(VERSION).tar.gz
+
+check: parser-test
+	$(SHELL) test/parser-test.sh
 
 distcheck: dist
 	tar -xvf $(PACKAGE)-$(VERSION).tar.gz
@@ -53,13 +125,30 @@ $(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 petitboot
-	rm -f petitboot-udev-helper
-	rm -f *.o devices/*.o
+	rm -f $(uis)
+	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 $(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