X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=rules.mk;h=dd6562ca1e615cf2861ac44e60cb2209dad5f4f5;hp=3a343c14e96d2e64736541455de125f61cc9b898;hb=dc709e716e19865f709d05b54893c06b6d0d3430;hpb=b118597194815910897ccf86d77b8b5a066adf5a

diff --git a/rules.mk b/rules.mk
index 3a343c1..dd6562c 100644
--- a/rules.mk
+++ b/rules.mk
@@ -1,4 +1,5 @@
 
+
 VPATH = $(srcdir)
 
 CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(builddir)
@@ -7,22 +8,29 @@ CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(builddir)
 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
 
+ifeq ($(PBTWIN),y)
+	uis += ui/twin/pb-twin
+endif
 
+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)
 
 parser_test_objs = parser-test.o $(parser_objs)
 
 all: $(uis) discover/pb-discover
 
 # twin gui
-ui/twin/pb-twin: LDFLAGS+=$(twin_LDFLAGS)
+ui/twin/pb-twin: LDFLAGS+=$(twin_LDFLAGS) $(LIBTWIN)
 ui/twin/pb-twin: CFLAGS+=$(twin_CFLAGS)
 
 pb_twin_objs = ui/twin/pb-twin.o ui/common/devices.o
@@ -32,7 +40,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 $@ $^
@@ -42,10 +50,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) $(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 $@ $^
@@ -55,12 +63,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