X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=rules.mk;h=1212b5a3cf8b5fd7d9eb2ed13e0a33dfac74145c;hb=4414db4f4442009008ef15658bd4df2349c62ec7;hp=23b23d7e95ce2fdd48f350c53753428afc91edcd;hpb=fe7bfb4f2fa5b582be94409473130674b7d8687f;p=petitboot diff --git a/rules.mk b/rules.mk index 23b23d7..1212b5a 100644 --- a/rules.mk +++ b/rules.mk @@ -33,6 +33,7 @@ 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 @@ -43,7 +44,8 @@ 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 $@ $^