X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=rules.mk;h=097daaee50cdd2e210fdc3457e338935a8615806;hb=ce8a340bffd224290ad5219baa5f0466fcd9fd55;hp=d377f8b30f6722209b2df7922b32e25f6a5c6359;hpb=90615502bf1f12eb7cecd8baad49ade80592b0a3;p=petitboot

diff --git a/rules.mk b/rules.mk
index d377f8b..097daae 100644
--- a/rules.mk
+++ b/rules.mk
@@ -17,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)
 
@@ -38,10 +37,10 @@ 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
@@ -62,10 +61,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 $@ $^
@@ -95,7 +95,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)