Loop through valid kboot conf names

[petitboot] / rules.mk

diff --git a/rules.mk b/rules.mk
index af6223beb45f8bc8117b7903d90b5bf57c5ed193..0eb4cab48eac783a8d1add318c89af3401131807 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -1,4 +1,5 @@
 
+
 VPATH = $(srcdir)
 
 CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(builddir)
@@ -13,9 +14,10 @@ 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
 server_objs = lib/pb-protocol/pb-protocol.o
 parser_objs = discover/parser.o discover/parser-utils.o \
              $(foreach p, $(parsers), discover/$(p)-parser.o)
@@ -35,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 $@ $^
@@ -45,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 \
-                  discover/waiter.o discover/discover-server.o \
-                  discover/device-handler.o discover/paths.o \
-                  $(talloc_objs) $(server_objs) $(parser_objs) $(list_objs)
+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) $(log_objs)
 
 discover/pb-discover: $(pb_discover_objs)
        $(LINK.o) -o $@ $^