From patchwork Sun Jul 20 22:24:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 33937 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E4330202DA for ; Sun, 20 Jul 2014 22:25:21 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id y10sf45587455pdj.8 for ; Sun, 20 Jul 2014 15:25:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=WQt2BbLD+RXHlqy/Imc7wf6g4drn477/tyL1u36YmYA=; b=JB3lgITcHOFRm5tRQTswkrMOD4AQUuct+B8H7RNC8atu0d2NTMkjOfxBZ2/tzuMxdO DPosegVoosByhiqmlDhqP15mqpJK3+Sroyc8cDdy+69e/Ogu8XQ60P1SuiYowvH8DSXo A/P41/lifxWvnJh1KistGQvcwaK8ZaQJhu06sBwnik334xDfONLo0QhCC7M2PRbVrLZf psYHnOVBISIUxyPAVE4Zba3EgHuVFMOFiLp4CSLT4l72FXFQRZoY11jeYfN59P++DL7M Q88AeL518Fl84QZ9xvP2vf30Fas2ZVcj6WuOxHA/I/wtCAlEP02UbxXhYkGMLY+g5i1m zjLA== X-Gm-Message-State: ALoCoQmnKEbRnSLs3YVjoaFAa9rV7ikag6OIOe5s/gjHFAcMAbUMWWQl/cI9hCGbi7EBpMP5Nb8q X-Received: by 10.70.48.66 with SMTP id j2mr10468342pdn.9.1405895121033; Sun, 20 Jul 2014 15:25:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.20.23 with SMTP id 23ls1676474qgi.26.gmail; Sun, 20 Jul 2014 15:25:20 -0700 (PDT) X-Received: by 10.221.56.5 with SMTP id wa5mr21477673vcb.25.1405895120918; Sun, 20 Jul 2014 15:25:20 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id r4si10253662vdr.12.2014.07.20.15.25.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 20 Jul 2014 15:25:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hy4so10610102vcb.22 for ; Sun, 20 Jul 2014 15:25:20 -0700 (PDT) X-Received: by 10.52.232.200 with SMTP id tq8mr21224997vdc.32.1405895120737; Sun, 20 Jul 2014 15:25:20 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp65968vcb; Sun, 20 Jul 2014 15:25:20 -0700 (PDT) X-Received: by 10.224.92.83 with SMTP id q19mr34139968qam.29.1405895120328; Sun, 20 Jul 2014 15:25:20 -0700 (PDT) Received: from ip-10-141-164-156.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id l4si25487482qat.125.2014.07.20.15.25.19 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 20 Jul 2014 15:25:20 -0700 (PDT) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-141-164-156.ec2.internal) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1X8zXj-0006vi-5d; Sun, 20 Jul 2014 22:25:19 +0000 Received: from mail-la0-f46.google.com ([209.85.215.46]) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1X8zXd-0006vZ-Tv for lng-odp@lists.linaro.org; Sun, 20 Jul 2014 22:25:14 +0000 Received: by mail-la0-f46.google.com with SMTP id b8so4228206lan.19 for ; Sun, 20 Jul 2014 15:25:07 -0700 (PDT) X-Received: by 10.112.180.39 with SMTP id dl7mr11585847lbc.34.1405895107698; Sun, 20 Jul 2014 15:25:07 -0700 (PDT) Received: from localhost (c-4f66bc92-74736162.cust.telenor.se. [79.102.188.146]) by mx.google.com with ESMTPSA id ks4sm9919576lac.18.2014.07.20.15.25.06 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 20 Jul 2014 15:25:06 -0700 (PDT) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Mon, 21 Jul 2014 00:24:55 +0200 Message-Id: <1405895095-6624-1-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: patch Subject: [lng-odp] [PATCH] remove unnecessary guards from build system X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: anders.roxell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Signed-off-by: Anders Roxell --- configure.ac | 3 --- platform/linux-generic/Makefile.am | 3 --- platform/linux-keystone2/Makefile.am | 3 --- 3 files changed, 9 deletions(-) diff --git a/configure.ac b/configure.ac index 873ea9e..438a7d0 100644 --- a/configure.ac +++ b/configure.ac @@ -49,9 +49,6 @@ AC_ARG_WITH([platform], [], [with_platform=linux-generic]) -AM_CONDITIONAL([ODP_PLATFORM_GENERIC], [test "x$with_platform" = xlinux-generic]) -AM_CONDITIONAL([ODP_PLATFORM_KEYSTONE2], [test "x$with_platform" = xlinux-keystone2]) - AC_SUBST([with_platform]) ########################################################################## diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 749482f..9be1f4b 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -12,7 +12,6 @@ AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(srcdir)/include/api AM_CFLAGS += -I$(top_srcdir)/include VPATH = $(srcdir) $(builddir) -if ODP_PLATFORM_GENERIC lib_LTLIBRARIES = $(LIB)/libodp.la include_HEADERS = \ @@ -81,5 +80,3 @@ __LIB__libodp_la_SOURCES = \ odp_ticketlock.c \ odp_time.c \ odp_timer.c - -endif diff --git a/platform/linux-keystone2/Makefile.am b/platform/linux-keystone2/Makefile.am index 0cd4be3..12c9f5c 100644 --- a/platform/linux-keystone2/Makefile.am +++ b/platform/linux-keystone2/Makefile.am @@ -24,7 +24,6 @@ AM_CFLAGS += -I$(top_srcdir)/platform/linux-generic/include AM_CFLAGS += -I$(top_srcdir)/platform/linux-generic/include/api AM_CFLAGS += -I$(top_srcdir)/include VPATH = $(srcdir) $(builddir) -#if ODP_PLATFORM_KEYSTONE2 lib_LTLIBRARIES = $(LIB)/libodp.la KS2_LIBS="-lopenem_rh -lopenem_osal" LIBS += $(KS2_LIBS) @@ -92,5 +91,3 @@ __LIB__libodp_la_SOURCES = \ ../linux-generic/odp_ticketlock.c \ ../linux-generic/odp_time.c \ ../linux-generic/odp_timer.c - -#endif