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.

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.

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

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

timezone/Makefile

@@ -40,8 +40,6 @@ install-sbin := zic zdump
 
 generated-dirs += testdata
 
-CPPFLAGS-zic = -DNOT_IN_libc
-
 install-bin-script = tzselect
 generated += tzselect