X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=rules.mk;h=436d0338f70eedf5e4660117123d9546c890ad42;hp=de5f0138f4c1bce4614699a0b68b6bd793da56e4;hb=d3e5eadbdcce508c48258b15664baa753ce6fc81;hpb=fb613e9e67ae52ba07585845f52d751916cf480a

diff --git a/rules.mk b/rules.mk
index de5f013..436d033 100644
--- a/rules.mk
+++ b/rules.mk
@@ -19,7 +19,7 @@ parser_test = test/parser-test
 # install targets and components
 daemons = $(pb_discover)
 parsers = event kboot yaboot
-uis = $(pb_test)
+uis = $(pb_cui) $(pb_test)
 tests = $(parser_test)
 utils = $(pb_event)
 
@@ -48,10 +48,11 @@ discover_objs = discover/event.o discover/user-event.o discover/udev.o \
 	discover/parser-utils.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 = ui/ncurses/nc-scr.o ui/ncurses/nc-menu.o \
-	 ui/ncurses/nc-ked.o
+ui_common_objs = ui/common/discover-client.o ui/common/joystick.o \
+	ui/common/loader.o ui/common/ui-system.o ui/common/timer.o \
+	ui/common/url.o
+ncurses_objs = ui/ncurses/nc-scr.o ui/ncurses/nc-menu.o ui/ncurses/nc-ked.o \
+	ui/ncurses/nc-cui.o
 twin_objs = ui/twin/pb-twin.o
 
 # Makefiles
@@ -68,11 +69,13 @@ client_objs = $(lib_objs) $(ui_common_objs)
 all: $(uis) $(daemons) $(utils)
 
 # ncurses cui
-pb_cui_objs = $(client_objs) $(ncurses_objs) ui/ncurses/ps3-cui.o \
-	ui/common/ps3.o
-$(pb_cui_objs): $(makefiles)
+pb_cui_objs-y$(ENABLE_PS3) += ui/ncurses/pb-cui.o
+pb_cui_objs-$(ENABLE_PS3) += ui/ncurses/ps3-cui.o ui/common/ps3.o
+pb_cui_ldflags-$(ENABLE_PS3) += -lps3-utils
 
-$(pb_cui): LDFLAGS += -lps3-utils -lmenu -lform -lncurses
+pb_cui_objs = $(client_objs) $(ncurses_objs) $(pb_cui_objs-y)
+$(pb_cui_objs): $(makefiles)
+$(pb_cui): LDFLAGS += $(pb_cui_ldflags-y) -lmenu -lform -lncurses
 
 $(pb_cui): $(pb_cui_objs)
 	$(LINK.o) -o $@ $^
@@ -119,13 +122,13 @@ parser-test: $(parser_test)
 
 install: all $(rules) $(udhcpc)
 	$(INSTALL) -d $(DESTDIR)$(sbindir)/
-	$(INSTALL) $(daemons) $(uis) $(utils) $(DESTDIR)$(sbindir)/
+	$(INSTALL_PROGRAM) $(daemons) $(uis) $(utils) $(DESTDIR)$(sbindir)/
 	$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/artwork/
-	$(INSTALL) $(addprefix $(top_srcdir)/ui/twin/artwork/,$(artwork)) \
+	$(INSTALL_DATA) $(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
+	$(INSTALL_DATA) $(top_srcdir)/$(rules) $(DESTDIR)$(pkgdatadir)/utils
+	$(INSTALL_DATA) $(top_srcdir)/$(udhcpc) $(DESTDIR)$(pkgdatadir)/utils
 
 dist: $(PACKAGE)-$(VERSION).tar.gz