From patchwork Sat Feb 28 00:54:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 23857 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 69B69DDF66 for ; Sat, 28 Feb 2009 12:08:31 +1100 (EST) X-Original-To: cbe-oss-dev@ozlabs.org Delivered-To: cbe-oss-dev@ozlabs.org Received: from hera.kernel.org (hera.kernel.org [140.211.167.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 931C7DDE23; Sat, 28 Feb 2009 11:59:51 +1100 (EST) Received: from hera.kernel.org (IDENT:U2FsdGVkX1+evMmSzisisNzEbQ08526J9Jan+StiQPI@localhost [127.0.0.1]) by hera.kernel.org (8.14.2/8.14.2) with ESMTP id n1S0xhlx016736 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 28 Feb 2009 00:59:43 GMT Received: (from geoff@localhost) by hera.kernel.org (8.14.2/8.13.1/Submit) id n1S0xgsW016735; Sat, 28 Feb 2009 00:59:42 GMT Message-Id: <20090228005350.826883191@am.sony.com> References: <20090228005350.203477145@am.sony.com> In-reply-to: <20090228005350.203477145@am.sony.com> User-Agent: quilt/0.46-1 Date: Fri, 27 Feb 2009 16:54:01 -0800 From: Geoff Levand To: Jeremy Kerr Content-Disposition: inline; filename=makefile-cleanups.diff X-Virus-Scanned: ClamAV 0.93.3/9055/Fri Feb 27 20:16:01 2009 on hera.kernel.org X-Virus-Status: Clean X-Spam-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00, UNPARSEABLE_RELAY,URIBL_SBL autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on hera.kernel.org X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Sat, 28 Feb 2009 00:59:44 +0000 (UTC) Cc: cbe-oss-dev@ozlabs.org Subject: [Cbe-oss-dev] [patch 11/16] petitboot: Makefile cleanups X-BeenThere: cbe-oss-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Discussion about Open Source Software for the Cell Broadband Engine List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org General cleanup of the makefile. Signed-off-by: Geoff Levand --- v2: Rebase to option-with-twin-2.diff. v3: Remove header deps. Remove AM_CONDITIONAL. configure.ac | 4 +- rules.mk | 112 ++++++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 75 insertions(+), 41 deletions(-) --- a/configure.ac +++ b/configure.ac @@ -50,7 +50,7 @@ AS_IF([test "x$with_twin" != xno], fi], [${twin_LIBS}])]) -mkdir -p discover ui/test ui/common lib/talloc lib/pb-protocol lib/list \ - lib/waiter lib/log +mkdir -p discover lib/list lib/log lib/pb-protocol lib/talloc lib/waiter \ + test ui/common ui/ncurses ui/test ui/twin AC_OUTPUT --- a/rules.mk +++ b/rules.mk @@ -1,5 +1,4 @@ - VPATH = $(srcdir) CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(builddir) @@ -8,74 +7,106 @@ CPPFLAGS += -I$(top_srcdir) -I$(top_srcd DEFS += '-DPREFIX="$(prefix)"' '-DPKG_SHARE_DIR="$(pkgdatadir)"' \ '-DLOCAL_STATE_DIR="$(localstatedir)"' -uis = ui/test/pb-test -#parsers = native yaboot kboot +# programs +pb_discover = discover/pb-discover +pb_cui = ui/ncurses/pb-cui +pb_test = ui/test/pb-test +pb_twin = ui/twin/pb-twin +parser_test = test/parser-test + +# install targets and components +daemons = $(pb_discover) +#parsers = kboot native yaboot (todo) parsers = kboot -artwork = background.jpg cdrom.png hdd.png usbpen.png tux.png cursor.gz +uis = $(pb_test) +tests = $(parser_test) ifeq ($(PBTWIN),y) - uis += ui/twin/pb-twin + uis += $(pb_twin) endif +# other to install +artwork = background.jpg cdrom.png hdd.png usbpen.png tux.png cursor.gz +rules = utils/99-petitboot.rules + +# client/daemon lib objs +list_objs = lib/list/list.o log_objs = lib/log/log.o +protocol_objs = lib/pb-protocol/pb-protocol.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 + +# daemon objs parser_objs = discover/parser.o discover/parser-utils.o \ - $(foreach p, $(parsers), discover/$(p)-parser.o) + $(foreach p, $(parsers), discover/$(p)-parser.o) +discover_objs = discover/udev.o discover/discover-server.o \ + discover/device-handler.o discover/paths.o -parser_test_objs = parser-test.o $(parser_objs) +# client objs +ui_common_objs = ui/common/discover-client.o +ncurses_objs = +twin_objs = ui/twin/pb-twin.o -all: $(uis) discover/pb-discover +# object collections +lib_objs = $(list_objs) $(log_objs) $(protocol_objs) $(talloc_objs) \ + $(waiter_objs) -# twin gui -ui/twin/pb-twin: LDFLAGS+=$(twin_LDFLAGS) $(LIBTWIN) -ui/twin/pb-twin: CFLAGS+=$(twin_CFLAGS) +daemon_objs = $(lib_objs) $(parser_objs) $(discover_objs) + +client_objs = $(lib_objs) $(ui_common_objs) + +all: $(uis) $(daemons) -pb_twin_objs = ui/twin/pb-twin.o ui/common/devices.o +# ncurses cui +pb_cui_objs = $(client_objs) $(ncurses_objs) ui/ncurses/ps3-cui.o -ui/twin/pb-twin: $(pb_twin_objs) +$(pb_cui): LDFLAGS += -lncurses + +$(pb_cui): $(pb_cui_objs) $(LINK.o) -o $@ $^ # test ui -pb_test_objs = ui/test/pb-test.o ui/common/discover-client.o \ - $(log_objs) $(talloc_objs) $(server_objs) $(list_objs) +pb_test_objs = $(client_objs) ui/test/pb-test.o -ui/test/pb-test: $(pb_test_objs) +$(pb_test): $(pb_test_objs) + $(LINK.o) -o $@ $^ + +# twin gui +pb_twin_objs = $(client_objs) $(twin_objs) ui/twin/ps3-twin.o + +$(pb_twin): LDFLAGS+=$(twin_LDFLAGS) $(LIBTWIN) +$(pb_twin): CFLAGS+=$(twin_CFLAGS) + +$(pb_twin): $(pb_twin_objs) $(LINK.o) -o $@ $^ # 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) +pb_discover_objs = $(daemon_objs) discover/pb-discover.o -discover/pb-discover: $(pb_discover_objs) +$(pb_discover): $(pb_discover_objs) $(LINK.o) -o $@ $^ +# parser-test +parser_test_objs = $(parser_objs) test/parser-test.o -parser-test: $(parser_test_objs) +$(parser_test): $(parser_test_objs) $(LINK.o) -o $@ $^ -install: all utils/99-petitboot.rules +parser-test: $(parser_test) + +install: all $(rules) $(INSTALL) -d $(DESTDIR)$(sbindir)/ - $(INSTALL) discover/pb-discover $(uis) $(DESTDIR)$(sbindir)/ + $(INSTALL) $(daemons) $(uis) $(DESTDIR)$(sbindir)/ $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/artwork/ $(INSTALL) $(addprefix $(top_srcdir)/ui/twin/artwork/,$(artwork)) \ $(DESTDIR)$(pkgdatadir)/artwork/ $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/utils - $(INSTALL) $(top_srcdir)/utils/99-petitboot.rules \ - $(DESTDIR)$(pkgdatadir)/utils + $(INSTALL) $(top_srcdir)/$(rules) $(DESTDIR)$(pkgdatadir)/utils -dist: $(PACKAGE)-$(VERSION).tar.gz +dist: $(PACKAGE)-$(VERSION).tar.gz -check: parser-test - devices/parser-test.sh +check: parser-test + $(SHELL) test/parser-test.sh distcheck: dist tar -xvf $(PACKAGE)-$(VERSION).tar.gz @@ -90,13 +121,17 @@ $(PACKAGE)-$(VERSION): clean mkdir -p $$d; \ cp -a $$f $$d; \ done + clean: rm -rf $(PACKAGE)-$(VERSION) rm -f $(uis) - rm -f $(pb_twin_objs) $(pb_test_objs) + rm -f $(pb_cui_objs) + rm -f $(pb_test_objs) + rm -f $(pb_twin_objs) + rm -f $(daemons) rm -f $(pb_discover_objs) - rm -f discover/pb-discover - rm -f ui/test/pb-test + rm -f $(tests) + rm -f $(parser_test_objs) maintainer-clean: clean -rm -f $(top_srcdir)/aclocal.m4 @@ -108,4 +143,3 @@ maintainer-clean: clean -rm -f config.status -rm -f Makefile -rm -f $(PACKAGE)-$(VERSION).tar.gz -