From patchwork Sat Feb 28 00:53:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 23853 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 C59FEDDE9E for ; Sat, 28 Feb 2009 12:05:19 +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 7BE09DDE0A; Sat, 28 Feb 2009 11:59:47 +1100 (EST) Received: from hera.kernel.org (IDENT:U2FsdGVkX1+vxYjmOxp5MhN9Xx8eBw1d9gaqwzMM0kk@localhost [127.0.0.1]) by hera.kernel.org (8.14.2/8.14.2) with ESMTP id n1S0xZi9016694 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 28 Feb 2009 00:59:35 GMT Received: (from geoff@localhost) by hera.kernel.org (8.14.2/8.13.1/Submit) id n1S0xZC0016693; Sat, 28 Feb 2009 00:59:35 GMT Message-Id: <20090228005350.606166230@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:53:57 -0800 From: Geoff Levand To: Jeremy Kerr Content-Disposition: inline; filename=makefile-hookup-with-twin.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:37 +0000 (UTC) Cc: cbe-oss-dev@ozlabs.org Subject: [Cbe-oss-dev] [patch 07/16] petitboot: Hookup the --with-twin configure option 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 Add some missing makefile parts to make the --with-twin configure option work properly. Signed-off-by: Geoff Levand --- Makefile.in | 2 ++ configure.ac | 3 ++- rules.mk | 7 +++++-- 3 files changed, 9 insertions(+), 3 deletions(-) --- a/Makefile.in +++ b/Makefile.in @@ -11,6 +11,8 @@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ $(DEFS) # dependencies +PBTWIN = @PBTWIN@ +LIBTWIN = @LIBTWIN@ twin_CFLAGS = @twin_CFLAGS@ twin_LDFLAGS = @twin_LIBS@ --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,7 @@ AC_ARG_WITH([twin], [], [with_twin=check]) +PBTWIN= LIBTWIN= AS_IF([test "x$with_twin" != xno], [PKG_CHECK_MODULES([twin], [libtwin], [], @@ -42,13 +43,13 @@ AS_IF([test "x$with_twin" != xno], AC_MSG_RESULT([Consider adjusting PKG_CONFIG_PATH environment variable])]) AC_CHECK_LIB([twin], [main], [AC_SUBST([LIBTWIN], ["-ltwin"]) + AC_SUBST([PBTWIN], ["y"]) AC_DEFINE([HAVE_LIBTWIN], [1], [Define if you have libtwin])], [if test "x$with_twin" != xcheck; then AC_MSG_FAILURE([--with-twin was given, but test for twin failed]) fi], [${twin_LIBS}])]) - mkdir -p discover ui/test ui/common lib/talloc lib/pb-protocol lib/list \ lib/waiter lib/log --- a/rules.mk +++ b/rules.mk @@ -8,12 +8,15 @@ CPPFLAGS += -I$(top_srcdir) -I$(top_srcd DEFS += '-DPREFIX="$(prefix)"' '-DPKG_SHARE_DIR="$(pkgdatadir)"' \ '-DLOCAL_STATE_DIR="$(localstatedir)"' -#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 +ifeq ($(PBTWIN),y) + uis += ui/twin/pb-twin +endif + log_objs = lib/log/log.o talloc_objs = lib/talloc/talloc.o list_objs = lib/list/list.o @@ -27,7 +30,7 @@ parser_test_objs = parser-test.o $(parse all: $(uis) discover/pb-discover # twin gui -ui/twin/pb-twin: LDFLAGS+=$(twin_LDFLAGS) +ui/twin/pb-twin: LDFLAGS+=$(twin_LDFLAGS) $(LIBTWIN) ui/twin/pb-twin: CFLAGS+=$(twin_CFLAGS) pb_twin_objs = ui/twin/pb-twin.o ui/common/devices.o