X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=rules.mk;h=3251b0454607bf2c1505d1b894a07caeb3662c94;hp=1c91661cc722924fa253ffbd67bbb3a85a2a04b4;hb=cf3593ef4be341aace4843148a7999c5660e8b2b;hpb=d7ce19907ff585e7fb6b950a40bd638d49c96a27 diff --git a/rules.mk b/rules.mk index 1c91661..3251b04 100644 --- a/rules.mk +++ b/rules.mk @@ -13,13 +13,15 @@ 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 daemons = $(pb_discover) -parsers = kboot yaboot +parsers = event kboot yaboot uis = $(pb_test) tests = $(parser_test) +utils = $(pb_event) ifeq ($(PBTWIN),y) uis += $(pb_twin) @@ -40,8 +42,9 @@ waiter_objs = lib/waiter/waiter.o # daemon objs parser_objs = discover/parser.o discover/parser-conf.o discover/paths.o \ $(foreach p, $(parsers), discover/$(p)-parser.o) -discover_objs = discover/event.o discover/udev.o discover/discover-server.o \ - discover/device-handler.o discover/paths.o discover/parser-utils.o +discover_objs = discover/event.o discover/user-event.o discover/udev.o \ + discover/discover-server.o discover/device-handler.o discover/paths.o \ + discover/parser-utils.o # client objs ui_common_objs = ui/common/discover-client.o ui/common/loader.o \ @@ -60,7 +63,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 \ @@ -96,6 +99,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) @@ -107,7 +117,7 @@ parser-test: $(parser_test) install: all $(rules) $(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/ @@ -141,6 +151,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)