Add ui-system helper routines

[petitboot] / rules.mk

diff --git a/rules.mk b/rules.mk
index 9b6d5ba110bf013059efde0c2f3d35291e42ceba..1212b5a3cf8b5fd7d9eb2ed13e0a33dfac74145c 100644 (file)
--- 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)"' \
@@ -16,8 +17,7 @@ parser_test = test/parser-test
 
 # install targets and components
 daemons = $(pb_discover)
-#parsers = kboot native yaboot (todo)
-parsers = kboot
+parsers = kboot yaboot
 uis = $(pb_test)
 tests = $(parser_test)
 
@@ -33,17 +33,19 @@ rules = utils/99-petitboot.rules
 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/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
+ui_common_objs = ui/common/discover-client.o ui/common/loader.o \
+       ui/common/ui-system.o ui/common/url.o
 ncurses_objs =
 twin_objs = ui/twin/pb-twin.o
 
@@ -51,8 +53,8 @@ twin_objs = ui/twin/pb-twin.o
 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)
 
@@ -61,10 +63,11 @@ client_objs = $(lib_objs) $(ui_common_objs)
 all: $(uis) $(daemons)
 
 # ncurses cui
-pb_cui_objs = $(client_objs) $(ncurses_objs) ui/ncurses/ps3-cui.o
+pb_cui_objs = $(client_objs) $(ncurses_objs) ui/ncurses/ps3-cui.o \
+       ui/common/ps3.o
 $(pb_cui_objs): $(makefiles)
 
-$(pb_cui): LDFLAGS += -lncurses
+$(pb_cui): LDFLAGS += -lps3-utils -lmenu -lform -lncurses
 
 $(pb_cui): $(pb_cui_objs)
        $(LINK.o) -o $@ $^
@@ -94,7 +97,7 @@ $(pb_discover): $(pb_discover_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)
@@ -109,7 +112,7 @@ install: all $(rules)
        $(INSTALL) $(addprefix $(top_srcdir)/ui/twin/artwork/,$(artwork)) \
                $(DESTDIR)$(pkgdatadir)/artwork/
        $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/utils
-       $(INSTALL) $(top_srcdir)/$(rules) $(DESTDIR)$(pkgdatadir)/utils
+       $(INSTALL) -m 644 $(top_srcdir)/$(rules) $(DESTDIR)$(pkgdatadir)/utils
 
 dist: $(PACKAGE)-$(VERSION).tar.gz
 
@@ -124,10 +127,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: