[PATCH] Remove redundant CPPFLAGS for some programs

[PATCH] Remove redundant CPPFLAGS for some programs

[Siddhesh Poyarekar]

[-- Attachment #1: Type: text/plain, Size: 1897 bytes --]

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
 
-- 
1.9.3


[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH] Remove redundant CPPFLAGS for some programs

[Roland McGrath]

OK