X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=rules.mk;h=0eb4cab48eac783a8d1add318c89af3401131807;hp=607a25ee451b2e20523c3e829aab064c6c1924de;hb=f5192075ca25e91ae72f12c89cab0c9c66eb6606;hpb=812761a1f8ff94e4913529840b905360ff843fc4 diff --git a/rules.mk b/rules.mk index 607a25e..0eb4cab 100644 --- a/rules.mk +++ b/rules.mk @@ -1,4 +1,5 @@ + VPATH = $(srcdir) CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(builddir) @@ -13,7 +14,7 @@ uis = ui/test/pb-test parsers = kboot artwork = background.jpg cdrom.png hdd.png usbpen.png tux.png cursor.gz - +log_objs = lib/log/log.o talloc_objs = lib/talloc/talloc.o list_objs = lib/list/list.o waiter_objs = lib/waiter/waiter.o @@ -36,7 +37,7 @@ ui/twin/pb-twin: $(pb_twin_objs) # test ui pb_test_objs = ui/test/pb-test.o ui/common/discover-client.o \ - $(talloc_objs) $(server_objs) $(list_objs) + $(log_objs) $(talloc_objs) $(server_objs) $(list_objs) ui/test/pb-test: $(pb_test_objs) $(LINK.o) -o $@ $^ @@ -46,10 +47,10 @@ ui/test/pb-test: $(pb_test_objs) # discover/yaboot-cfg.o \ # $(foreach p,$(parsers),discover/$(p)-parser.o) -pb_discover_objs = discover/pb-discover.o discover/udev.o discover/log.o \ +pb_discover_objs = discover/pb-discover.o discover/udev.o \ discover/discover-server.o discover/device-handler.o \ discover/paths.o $(talloc_objs) $(server_objs) \ - $(parser_objs) $(list_objs) $(waiter_objs) + $(parser_objs) $(list_objs) $(waiter_objs) $(log_objs) discover/pb-discover: $(pb_discover_objs) $(LINK.o) -o $@ $^