Remove redundant CPPFLAGS for some programs

These programs get the NOT_IN_libc twice, once through the 'other'
target and another explicitly.  Remove the explicitly added CPFLAG.

	* catgets/Makefile (CPPFLAGS-gencat): Remove.
	* iconv/Makefile (CPPFLAGS-iconv_prog): Likewise.
	(CPPFLAGS-iconvconfig): Likewise.
	* timezone/Makefile (CPPFLAGS-zic): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 75cfd5c5413d79d5d8323b3cb447a0da499a8475..533517a606a8cceebff00a722ec98dd4f93fbbae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-08-21  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
+       * catgets/Makefile (CPPFLAGS-gencat): Remove.
+       * iconv/Makefile (CPPFLAGS-iconv_prog): Likewise.
+       (CPPFLAGS-iconvconfig): Likewise.
+       * timezone/Makefile (CPPFLAGS-zic): Likewise.
+
        * include/libc-symbols.h: Remove unnecessary check for
        NOT_IN_libc.
        * nptl/pthreadP.h: Likewise.

diff --git a/catgets/Makefile b/catgets/Makefile
index 4a03eba377747b1e92e3f5af3a71d862cd5a80c5..008d7dbf7aece17b520f5b0f475e43c75d007d85 100644 (file)
--- 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 5de04a0b76b722db570aca788e71c1f53132e45f..48d17d7a5506b4f13af2ce9be85b4f5aae04d433 100644 (file)
--- 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 6e008bc95623f8de418f442a8d4fdb66dd4af8ca..66b59ceedadcc5f83d4b7f6b7d7fcacfa708ab55 100644 (file)
--- 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