diff options
| author | Yang Tse <yangsita@gmail.com> | 2013-01-15 16:28:07 +0100 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2013-01-15 16:31:50 +0100 |
| commit | 4b401b2d99234558029aefd8d86ac747d4d77be8 (patch) | |
| tree | bf83f8498ff93e83de28d9f715d9e6bd8caa0968 /tests/unit | |
| parent | d7f2c3af5f69ab9a43cf280bdac89a9a549e3f1d (diff) | |
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.
Diffstat (limited to 'tests/unit')
| -rw-r--r-- | tests/unit/Makefile.inc | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc index 257e2a61c..c6d9d28c4 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) + |