Add ncurses boot option editor

[petitboot] / rules.mk

diff --git a/rules.mk b/rules.mk
index ff807e40f36b83c574f84e3bdb74a185fcb3f365..de5f0138f4c1bce4614699a0b68b6bd793da56e4 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -13,6 +13,7 @@ pb_discover = discover/pb-discover
 pb_cui = ui/ncurses/pb-cui
 pb_test = ui/test/pb-test
 pb_twin = ui/twin/pb-twin
+pb_event = utils/pb-event
 parser_test = test/parser-test
 
 # install targets and components
@@ -20,6 +21,7 @@ daemons = $(pb_discover)
 parsers = event kboot yaboot
 uis = $(pb_test)
 tests = $(parser_test)
+utils = $(pb_event)
 
 ifeq ($(PBTWIN),y)
        uis += $(pb_twin)
@@ -28,6 +30,7 @@ endif
 # other to install
 artwork = background.jpg cdrom.png hdd.png usbpen.png tux.png cursor.gz
 rules = utils/99-petitboot.rules
+udhcpc = utils/udhcpc
 
 # client/daemon lib objs
 list_objs = lib/list/list.o
@@ -47,7 +50,8 @@ discover_objs = discover/event.o discover/user-event.o discover/udev.o \
 # client objs
 ui_common_objs = ui/common/discover-client.o ui/common/loader.o \
        ui/common/ui-system.o ui/common/url.o
-ncurses_objs =
+ncurses_objs = ui/ncurses/nc-scr.o ui/ncurses/nc-menu.o \
+        ui/ncurses/nc-ked.o
 twin_objs = ui/twin/pb-twin.o
 
 # Makefiles
@@ -61,7 +65,7 @@ daemon_objs = $(lib_objs) $(parser_objs) $(discover_objs)
 
 client_objs = $(lib_objs) $(ui_common_objs)
 
-all: $(uis) $(daemons)
+all: $(uis) $(daemons) $(utils)
 
 # ncurses cui
 pb_cui_objs = $(client_objs) $(ncurses_objs) ui/ncurses/ps3-cui.o \
@@ -97,6 +101,13 @@ $(pb_discover_objs): $(makefiles)
 $(pb_discover): $(pb_discover_objs)
        $(LINK.o) -o $@ $^
 
+# utils
+pb_event_objs = utils/pb-event.o
+$(pb_event_objs): $(makefiles)
+
+$(pb_event): $(pb_event_objs)
+       $(LINK.o) -o $@ $^
+
 # parser-test
 parser_test_objs = $(lib_objs) $(parser_objs) test/parser-test.o
 $(parser_test_objs): $(makefiles)
@@ -106,14 +117,15 @@ $(parser_test): $(parser_test_objs)
 
 parser-test: $(parser_test)
 
-install: all $(rules)
+install: all $(rules) $(udhcpc)
        $(INSTALL) -d $(DESTDIR)$(sbindir)/
-       $(INSTALL) $(daemons) $(uis) $(DESTDIR)$(sbindir)/
+       $(INSTALL) $(daemons) $(uis) $(utils) $(DESTDIR)$(sbindir)/
        $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/artwork/
        $(INSTALL) $(addprefix $(top_srcdir)/ui/twin/artwork/,$(artwork)) \
                $(DESTDIR)$(pkgdatadir)/artwork/
        $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/utils
        $(INSTALL) -m 644 $(top_srcdir)/$(rules) $(DESTDIR)$(pkgdatadir)/utils
+       $(INSTALL) -m 644 $(top_srcdir)/$(udhcpc) $(DESTDIR)$(pkgdatadir)/utils
 
 dist: $(PACKAGE)-$(VERSION).tar.gz
 
@@ -142,6 +154,8 @@ clean:
        rm -f $(pb_twin_objs)
        rm -f $(daemons)
        rm -f $(pb_discover_objs)
+       rm -f $(utils)
+       rm -f $(pb_event_objs)
        rm -f $(tests)
        rm -f $(parser_test_objs)