X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=rules.mk;h=097daaee50cdd2e210fdc3457e338935a8615806;hp=040f269f9e68a967b6b435735734670658ab2357;hb=7eb1d21503768c849e2d4b8c455a182d82cdc966;hpb=0967cb518d764990eaebc51cb987cf4444a5afd3 diff --git a/rules.mk b/rules.mk index 040f269..097daae 100644 --- a/rules.mk +++ b/rules.mk @@ -37,11 +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 \ - discover/parser-conf.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)