From patchwork Tue Aug 19 18:41:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 2438 Received: (qmail 11824 invoked by alias); 19 Aug 2014 18:41:46 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 11813 invoked by uid 89); 19 Aug 2014 18:41:46 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Date: Wed, 20 Aug 2014 00:11:38 +0530 From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Subject: [PATCH] Remove redundant CPPFLAGS for some programs Message-ID: <20140819184137.GA2416@spoyarek.pnq.redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.22.1-rc1 (2013-10-16) These programs get the NOT_IN_libc twice, once through the 'other' target and another explicitly. Remove the explicitly added CPPFLAG. Verified that the generated code is unchanged due to this patch on x86_64. * catgets/Makefile (CPPFLAGS-gencat): Remove. * iconv/Makefile (CPPFLAGS-iconv_prog): Likewise. (CPPFLAGS-iconvconfig): Likewise. * timezone/Makefile (CPPFLAGS-zic): Likewise. --- catgets/Makefile | 2 -- iconv/Makefile | 2 -- timezone/Makefile | 2 -- 3 files changed, 6 deletions(-) diff --git a/catgets/Makefile b/catgets/Makefile index 4a03eba..008d7db 100644 --- a/catgets/Makefile +++ b/catgets/Makefile @@ -48,8 +48,6 @@ $(objpfx)gencat: $(gencat-modules:%=$(objpfx)%.o) catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"' -CPPFLAGS-gencat = -DNOT_IN_libc - generated += de.msg test1.cat test1.h test2.cat test2.h sample.SJIS.cat \ test-gencat.h generated-dirs += de diff --git a/iconv/Makefile b/iconv/Makefile index 5de04a0..48d17d7 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -52,9 +52,7 @@ CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"' CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"' CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"' -CPPFLAGS-iconv_prog = -DNOT_IN_libc CPPFLAGS-iconv_charmap = -DNOT_IN_libc -CPPFLAGS-iconvconfig = -DNOT_IN_libc CPPFLAGS-linereader = -DNOT_IN_libc CPPFLAGS-strtab = -DNOT_IN_libc CPPFLAGS-charmap = -DNOT_IN_libc diff --git a/timezone/Makefile b/timezone/Makefile index 6e008bc..66b59ce 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -40,8 +40,6 @@ install-sbin := zic zdump generated-dirs += testdata -CPPFLAGS-zic = -DNOT_IN_libc - install-bin-script = tzselect generated += tzselect