From: Yang Tse Date: Tue, 15 Jan 2013 15:28:07 +0000 (+0100) Subject: build: use per-target '_CPPFLAGS' for those currently using default X-Git-Tag: curl-7_29_0~96 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b401b2d99234558029aefd8d86ac747d4d77be8;p=thirdparty%2Fcurl.git build: use per-target '_CPPFLAGS' for those currently using default Automake documents that doing this will make it choose a different name for intermediate object files even when sharing source files across targets of same Makefile.am. Up to automake 1.13.1 target's intermediate object files were placed in the build subdirectory of the target. We depended on this, probably undocumented behavior, to achieve same behavior as if a per-target flag had been specified when building targets that actually belong to different Makefile.am files. It seems automake 1.13.2 is going to break behavior mentioned above. So, lets use a documented behavior in order to achieve same purpose, across automake versions, no matter where automake wishes to place intermediate object files. Our build targets that already were using a per-target '_CFLAGS' or '_CPPFLAGS' need no 'fixing', these were already 'fixed'. The only Makefile.am or Makefile.in files in libcurl's source tree touched by this 'fix' are tests/libtest/Makefile.inc and tests/unit/Makefile.inc. --- diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index 3e6e5f79fa..8e5248d254 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -28,66 +28,92 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ chkhostname_SOURCES = chkhostname.c $(top_srcdir)/lib/curl_gethostname.c chkhostname_LDADD = @CURL_NETWORK_LIBS@ chkhostname_DEPENDENCIES = -chkhostname_CFLAGS = $(AM_CFLAGS) +chkhostname_CPPFLAGS = $(AM_CPPFLAGS) libntlmconnect_SOURCES = libntlmconnect.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) libntlmconnect_LDADD = $(TESTUTIL_LIBS) +libntlmconnect_CPPFLAGS = $(AM_CPPFLAGS) libauthretry_SOURCES = libauthretry.c $(SUPPORTFILES) +libauthretry_CPPFLAGS = $(AM_CPPFLAGS) lib500_SOURCES = lib500.c $(SUPPORTFILES) $(TESTUTIL) $(TSTTRACE) lib500_LDADD = $(TESTUTIL_LIBS) +lib500_CPPFLAGS = $(AM_CPPFLAGS) lib501_SOURCES = lib501.c $(SUPPORTFILES) +lib501_CPPFLAGS = $(AM_CPPFLAGS) lib502_SOURCES = lib502.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib502_LDADD = $(TESTUTIL_LIBS) +lib502_CPPFLAGS = $(AM_CPPFLAGS) lib503_SOURCES = lib503.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib503_LDADD = $(TESTUTIL_LIBS) +lib503_CPPFLAGS = $(AM_CPPFLAGS) lib504_SOURCES = lib504.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib504_LDADD = $(TESTUTIL_LIBS) +lib504_CPPFLAGS = $(AM_CPPFLAGS) lib505_SOURCES = lib505.c $(SUPPORTFILES) +lib505_CPPFLAGS = $(AM_CPPFLAGS) lib506_SOURCES = lib506.c $(SUPPORTFILES) +lib506_CPPFLAGS = $(AM_CPPFLAGS) lib507_SOURCES = lib507.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib507_LDADD = $(TESTUTIL_LIBS) +lib507_CPPFLAGS = $(AM_CPPFLAGS) lib508_SOURCES = lib508.c $(SUPPORTFILES) +lib508_CPPFLAGS = $(AM_CPPFLAGS) lib510_SOURCES = lib510.c $(SUPPORTFILES) +lib510_CPPFLAGS = $(AM_CPPFLAGS) lib511_SOURCES = lib511.c $(SUPPORTFILES) +lib511_CPPFLAGS = $(AM_CPPFLAGS) lib512_SOURCES = lib512.c $(SUPPORTFILES) +lib512_CPPFLAGS = $(AM_CPPFLAGS) lib513_SOURCES = lib513.c $(SUPPORTFILES) +lib513_CPPFLAGS = $(AM_CPPFLAGS) lib514_SOURCES = lib514.c $(SUPPORTFILES) +lib514_CPPFLAGS = $(AM_CPPFLAGS) lib515_SOURCES = lib515.c $(SUPPORTFILES) +lib515_CPPFLAGS = $(AM_CPPFLAGS) lib516_SOURCES = lib516.c $(SUPPORTFILES) +lib516_CPPFLAGS = $(AM_CPPFLAGS) lib517_SOURCES = lib517.c $(SUPPORTFILES) +lib517_CPPFLAGS = $(AM_CPPFLAGS) lib518_SOURCES = lib518.c $(SUPPORTFILES) $(WARNLESS) +lib518_CPPFLAGS = $(AM_CPPFLAGS) lib519_SOURCES = lib519.c $(SUPPORTFILES) +lib519_CPPFLAGS = $(AM_CPPFLAGS) lib520_SOURCES = lib520.c $(SUPPORTFILES) +lib520_CPPFLAGS = $(AM_CPPFLAGS) lib521_SOURCES = lib521.c $(SUPPORTFILES) +lib521_CPPFLAGS = $(AM_CPPFLAGS) lib523_SOURCES = lib523.c $(SUPPORTFILES) +lib523_CPPFLAGS = $(AM_CPPFLAGS) lib524_SOURCES = lib524.c $(SUPPORTFILES) +lib524_CPPFLAGS = $(AM_CPPFLAGS) lib525_SOURCES = lib525.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib525_LDADD = $(TESTUTIL_LIBS) +lib525_CPPFLAGS = $(AM_CPPFLAGS) lib526_SOURCES = lib526.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib526_LDADD = $(TESTUTIL_LIBS) @@ -111,118 +137,161 @@ lib532_CPPFLAGS = $(AM_CPPFLAGS) -DLIB532 lib533_SOURCES = lib533.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib533_LDADD = $(TESTUTIL_LIBS) +lib533_CPPFLAGS = $(AM_CPPFLAGS) lib536_SOURCES = lib536.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib536_LDADD = $(TESTUTIL_LIBS) +lib536_CPPFLAGS = $(AM_CPPFLAGS) lib537_SOURCES = lib537.c $(SUPPORTFILES) $(WARNLESS) +lib537_CPPFLAGS = $(AM_CPPFLAGS) lib539_SOURCES = lib539.c $(SUPPORTFILES) +lib539_CPPFLAGS = $(AM_CPPFLAGS) lib540_SOURCES = lib540.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib540_LDADD = $(TESTUTIL_LIBS) +lib540_CPPFLAGS = $(AM_CPPFLAGS) lib541_SOURCES = lib541.c $(SUPPORTFILES) +lib541_CPPFLAGS = $(AM_CPPFLAGS) lib542_SOURCES = lib542.c $(SUPPORTFILES) +lib542_CPPFLAGS = $(AM_CPPFLAGS) lib543_SOURCES = lib543.c $(SUPPORTFILES) +lib543_CPPFLAGS = $(AM_CPPFLAGS) lib544_SOURCES = lib544.c $(SUPPORTFILES) +lib544_CPPFLAGS = $(AM_CPPFLAGS) lib545_SOURCES = lib544.c $(SUPPORTFILES) lib545_CPPFLAGS = $(AM_CPPFLAGS) -DLIB545 lib547_SOURCES = lib547.c $(SUPPORTFILES) +lib547_CPPFLAGS = $(AM_CPPFLAGS) lib548_SOURCES = lib547.c $(SUPPORTFILES) lib548_CPPFLAGS = $(AM_CPPFLAGS) -DLIB548 lib549_SOURCES = lib549.c $(SUPPORTFILES) +lib549_CPPFLAGS = $(AM_CPPFLAGS) lib552_SOURCES = lib552.c $(SUPPORTFILES) $(WARNLESS) +lib552_CPPFLAGS = $(AM_CPPFLAGS) lib553_SOURCES = lib553.c $(SUPPORTFILES) +lib553_CPPFLAGS = $(AM_CPPFLAGS) lib554_SOURCES = lib554.c $(SUPPORTFILES) +lib554_CPPFLAGS = $(AM_CPPFLAGS) lib555_SOURCES = lib555.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib555_LDADD = $(TESTUTIL_LIBS) +lib555_CPPFLAGS = $(AM_CPPFLAGS) lib556_SOURCES = lib556.c $(SUPPORTFILES) +lib556_CPPFLAGS = $(AM_CPPFLAGS) lib557_SOURCES = lib557.c $(SUPPORTFILES) +lib557_CPPFLAGS = $(AM_CPPFLAGS) lib560_SOURCES = lib560.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib560_LDADD = $(TESTUTIL_LIBS) +lib560_CPPFLAGS = $(AM_CPPFLAGS) lib562_SOURCES = lib562.c $(SUPPORTFILES) +lib562_CPPFLAGS = $(AM_CPPFLAGS) lib564_SOURCES = lib564.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib564_LDADD = $(TESTUTIL_LIBS) +lib564_CPPFLAGS = $(AM_CPPFLAGS) lib565_SOURCES = lib510.c $(SUPPORTFILES) lib565_CPPFLAGS = $(AM_CPPFLAGS) -DLIB565 lib566_SOURCES = lib566.c $(SUPPORTFILES) +lib566_CPPFLAGS = $(AM_CPPFLAGS) lib567_SOURCES = lib567.c $(SUPPORTFILES) +lib567_CPPFLAGS = $(AM_CPPFLAGS) lib568_SOURCES = lib568.c $(SUPPORTFILES) +lib568_CPPFLAGS = $(AM_CPPFLAGS) lib569_SOURCES = lib569.c $(SUPPORTFILES) +lib569_CPPFLAGS = $(AM_CPPFLAGS) lib570_SOURCES = lib570.c $(SUPPORTFILES) +lib570_CPPFLAGS = $(AM_CPPFLAGS) lib571_SOURCES = lib571.c $(SUPPORTFILES) $(WARNLESS) +lib571_CPPFLAGS = $(AM_CPPFLAGS) lib572_SOURCES = lib572.c $(SUPPORTFILES) +lib572_CPPFLAGS = $(AM_CPPFLAGS) lib573_SOURCES = lib573.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(TSTTRACE) lib573_LDADD = $(TESTUTIL_LIBS) +lib573_CPPFLAGS = $(AM_CPPFLAGS) lib574_SOURCES = lib574.c $(SUPPORTFILES) +lib574_CPPFLAGS = $(AM_CPPFLAGS) lib575_SOURCES = lib575.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib575_LDADD = $(TESTUTIL_LIBS) +lib575_CPPFLAGS = $(AM_CPPFLAGS) lib576_SOURCES = lib576.c $(SUPPORTFILES) +lib576_CPPFLAGS = $(AM_CPPFLAGS) lib578_SOURCES = lib578.c $(SUPPORTFILES) +lib578_CPPFLAGS = $(AM_CPPFLAGS) lib579_SOURCES = lib579.c $(SUPPORTFILES) +lib579_CPPFLAGS = $(AM_CPPFLAGS) lib582_SOURCES = lib582.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib582_LDADD = $(TESTUTIL_LIBS) +lib582_CPPFLAGS = $(AM_CPPFLAGS) lib583_SOURCES = lib583.c $(SUPPORTFILES) +lib583_CPPFLAGS = $(AM_CPPFLAGS) lib585_SOURCES = lib500.c $(SUPPORTFILES) $(TESTUTIL) $(TSTTRACE) lib585_LDADD = $(TESTUTIL_LIBS) lib585_CPPFLAGS = $(AM_CPPFLAGS) -DLIB585 lib586_SOURCES = lib586.c $(SUPPORTFILES) +lib586_CPPFLAGS = $(AM_CPPFLAGS) lib587_SOURCES = lib554.c $(SUPPORTFILES) lib587_CPPFLAGS = $(AM_CPPFLAGS) -DLIB587 lib590_SOURCES = lib590.c $(SUPPORTFILES) +lib590_CPPFLAGS = $(AM_CPPFLAGS) lib591_SOURCES = lib591.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib591_LDADD = $(TESTUTIL_LIBS) +lib591_CPPFLAGS = $(AM_CPPFLAGS) lib597_SOURCES = lib597.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib597_LDADD = $(TESTUTIL_LIBS) +lib597_CPPFLAGS = $(AM_CPPFLAGS) lib598_SOURCES = lib598.c $(SUPPORTFILES) +lib598_CPPFLAGS = $(AM_CPPFLAGS) lib599_SOURCES = lib599.c $(SUPPORTFILES) +lib599_CPPFLAGS = $(AM_CPPFLAGS) lib1500_SOURCES = lib1500.c $(SUPPORTFILES) $(TESTUTIL) lib1500_LDADD = $(TESTUTIL_LIBS) +lib1500_CPPFLAGS = $(AM_CPPFLAGS) lib1501_SOURCES = lib1501.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1501_LDADD = $(TESTUTIL_LIBS) +lib1501_CPPFLAGS = $(AM_CPPFLAGS) lib1502_SOURCES = lib1502.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1502_LDADD = $(TESTUTIL_LIBS) diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc index 257e2a61cf..c6d9d28c44 100644 --- a/tests/unit/Makefile.inc +++ b/tests/unit/Makefile.inc @@ -9,11 +9,29 @@ UNITPROGS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307 \ unit1308 unit1309 unit1300_SOURCES = unit1300.c $(UNITFILES) +unit1300_CPPFLAGS = $(AM_CPPFLAGS) + unit1301_SOURCES = unit1301.c $(UNITFILES) +unit1301_CPPFLAGS = $(AM_CPPFLAGS) + unit1302_SOURCES = unit1302.c $(UNITFILES) +unit1302_CPPFLAGS = $(AM_CPPFLAGS) + unit1303_SOURCES = unit1303.c $(UNITFILES) +unit1303_CPPFLAGS = $(AM_CPPFLAGS) + unit1304_SOURCES = unit1304.c $(UNITFILES) +unit1304_CPPFLAGS = $(AM_CPPFLAGS) + unit1305_SOURCES = unit1305.c $(UNITFILES) +unit1305_CPPFLAGS = $(AM_CPPFLAGS) + unit1307_SOURCES = unit1307.c $(UNITFILES) +unit1307_CPPFLAGS = $(AM_CPPFLAGS) + unit1308_SOURCES = unit1308.c $(UNITFILES) +unit1308_CPPFLAGS = $(AM_CPPFLAGS) + unit1309_SOURCES = unit1309.c $(UNITFILES) +unit1309_CPPFLAGS = $(AM_CPPFLAGS) +