X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=rules.mk;h=af6223beb45f8bc8117b7903d90b5bf57c5ed193;hb=44fe1998097c50802eeac0a831b0b730809ac4b0;hp=475d096df097cdbab9d45682a76ff012f2c4b310;hpb=5eb7f7bcd3431cd8f634b02b71bd78f6162c2af3;p=petitboot

diff --git a/rules.mk b/rules.mk
index 475d096..af6223b 100644
--- a/rules.mk
+++ b/rules.mk
@@ -1,7 +1,7 @@
 
 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)"' \
@@ -9,13 +9,16 @@ DEFS += '-DPREFIX="$(prefix)"' '-DPKG_SHARE_DIR="$(pkgdatadir)"' \
 
 #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)
 
@@ -32,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 $@ $^
@@ -45,7 +48,7 @@ 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 discover/paths.o \
-		   $(talloc_objs) $(server_objs) $(list_objs)
+		   $(talloc_objs) $(server_objs) $(parser_objs) $(list_objs)
 
 discover/pb-discover: $(pb_discover_objs)
 	$(LINK.o) -o $@ $^
@@ -55,12 +58,11 @@ parser-test: $(parser_test_objs)
 	$(LINK.o) -o $@ $^
 
 install: all
-	$(INSTALL) -D petitboot $(DESTDIR)$(sbindir)/petitboot
-	$(INSTALL) -D petitboot-udev-helper \
-		$(DESTDIR)$(sbindir)/petitboot-udev-helper
-	$(INSTALL) -Dd $(DESTDIR)$(pkgdatadir)/artwork/
-	$(INSTALL) -t $(DESTDIR)$(pkgdatadir)/artwork/ \
-		$(foreach a,$(artwork),$(top_srcdir)/artwork/$(a))
+	$(INSTALL) -d $(DESTDIR)$(sbindir)/
+	$(INSTALL) discover/pb-discover $(uis) $(DESTDIR)$(sbindir)/
+	$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/artwork/
+	$(INSTALL) $(addprefix $(top_srcdir)/ui/twin/artwork/,$(artwork)) \
+		$(DESTDIR)$(pkgdatadir)/artwork/
 
 dist:	$(PACKAGE)-$(VERSION).tar.gz