[discover client] Remove device from discover array before notifying UI

[petitboot] / rules.mk

diff --git a/rules.mk b/rules.mk
index 9239d29248cd23947df44a0d0f41f724049c7389..0eb4cab48eac783a8d1add318c89af3401131807 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -1,44 +1,70 @@
 
+
 VPATH = $(srcdir)
 
+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)"'
 
-parsers = native yaboot kboot
+#uis = ui/twin/pb-twin
+uis = ui/test/pb-test
+#parsers = native yaboot kboot
+parsers = kboot
 artwork = background.jpg cdrom.png hdd.png usbpen.png tux.png cursor.gz
 
-petitboot_objs = petitboot.o devices.o
-
-parser_objs = devices/params.o devices/parser.o devices/paths.o \
-             devices/yaboot-cfg.o \
-             $(foreach p,$(parsers),devices/$(p)-parser.o)
+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)
 
-petitboot_udev_helper_objs = devices/petitboot-udev-helper.o $(parser_objs)
 parser_test_objs = parser-test.o $(parser_objs)
 
-all: petitboot petitboot-udev-helper
+all: $(uis) discover/pb-discover
 
-petitboot: LDFLAGS+=$(twin_LDFLAGS)
-petitboot: CFLAGS+=$(twin_CFLAGS)
+# twin gui
+ui/twin/pb-twin: LDFLAGS+=$(twin_LDFLAGS)
+ui/twin/pb-twin: CFLAGS+=$(twin_CFLAGS)
 
-petitboot: $(petitboot_objs)
+pb_twin_objs = ui/twin/pb-twin.o ui/common/devices.o
+
+ui/twin/pb-twin: $(pb_twin_objs)
        $(LINK.o) -o $@ $^
 
-petitboot-udev-helper: $(petitboot_udev_helper_objs)
+# test ui
+pb_test_objs = ui/test/pb-test.o ui/common/discover-client.o \
+       $(log_objs) $(talloc_objs) $(server_objs) $(list_objs)
+
+ui/test/pb-test: $(pb_test_objs)
        $(LINK.o) -o $@ $^
 
-parser-test: $(parser_test_objs)
+# discovery daemon
+#pb_discover_objs = discover/params.o discover/parser.o discover/paths.o \
+#            discover/yaboot-cfg.o \
+#            $(foreach p,$(parsers),discover/$(p)-parser.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) $(log_objs)
+
+discover/pb-discover: $(pb_discover_objs)
        $(LINK.o) -o $@ $^
 
-petitboot-udev-helper: CFLAGS+=-I$(top_srcdir)
+
+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
 
@@ -60,6 +86,9 @@ $(PACKAGE)-$(VERSION): clean
        done
 clean:
        rm -rf $(PACKAGE)-$(VERSION)
-       rm -f petitboot
-       rm -f petitboot-udev-helper
-       rm -f *.o devices/*.o
+       rm -f $(uis)
+       rm -f $(pb_twin_objs) $(pb_test_objs)
+       rm -f $(pb_discover_objs)
+       rm -f discover/pb-discover
+       rm -f ui/test/pb-test
+