Hook up parsers to device discovery

[petitboot] / rules.mk

diff --git a/rules.mk b/rules.mk
index 00241c30279a8645d52ea7055c4a00e8b8d909d4..708c5a2f9f6702e6f230dcf337143e47fa1de6fb 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -1,20 +1,24 @@
 
 VPATH = $(srcdir)
 
-CFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(builddir)
+CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(builddir)
 
 # we need paths to be overridable at build-time
-DEFS += '-DPREFIX="$(prefix)"' '-DPKG_SHARE_DIR="$(pkgdatadir)"'
+DEFS += '-DPREFIX="$(prefix)"' '-DPKG_SHARE_DIR="$(pkgdatadir)"' \
+       '-DLOCAL_STATE_DIR="$(localstatedir)"'
 
 #uis = ui/twin/pb-twin
 uis = ui/test/pb-test
-parsers = native yaboot kboot
+#parsers = native yaboot kboot
+parsers = kboot
 artwork = background.jpg cdrom.png hdd.png usbpen.png tux.png cursor.gz
 
 
 talloc_objs = lib/talloc/talloc.o
 list_objs = lib/list/list.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)
 
 parser_test_objs = parser-test.o $(parser_objs)
 
@@ -31,7 +35,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)
+       $(talloc_objs) $(server_objs) $(list_objs)
 
 ui/test/pb-test: $(pb_test_objs)
        $(LINK.o) -o $@ $^
@@ -43,8 +47,8 @@ ui/test/pb-test: $(pb_test_objs)
 
 pb_discover_objs = discover/pb-discover.o discover/udev.o discover/log.o \
                   discover/waiter.o discover/discover-server.o \
-                  discover/device-handler.o \
-                  $(talloc_objs) $(server_objs) $(list_objs)
+                  discover/device-handler.o discover/paths.o \
+                  $(talloc_objs) $(server_objs) $(parser_objs) $(list_objs)
 
 discover/pb-discover: $(pb_discover_objs)
        $(LINK.o) -o $@ $^