From: Dan Fandrich <dan@coneharvesters.com>
Date: Sun, 12 Mar 2023 23:58:26 +0000 (-0700)
Subject: tests: use AM_CPPFILES to modify flags in unit tests
X-Git-Tag: curl-8_0_0~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e4a082eff1dd82b8b041879002fcca9e858c8c1;p=thirdparty%2Fcurl.git

tests: use AM_CPPFILES to modify flags in unit tests

Using CPPFLAGS sometimes caused odd compile issues when building tests
with parallel make and AM_CPPFILES is the right flag, anyway.

Follow-up to cb7ed5a

Ref #10749
---

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 88f69bba8b..4f64ff5963 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -32,11 +32,11 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
 # $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files
 
-CPPFLAGS += -I$(top_srcdir)/include        \
-            -I$(top_builddir)/lib          \
-            -I$(top_srcdir)/lib            \
-            -I$(top_srcdir)/src            \
-            -I$(top_srcdir)/tests/libtest
+AM_CPPFLAGS = -I$(top_srcdir)/include        \
+              -I$(top_builddir)/lib          \
+              -I$(top_srcdir)/lib            \
+              -I$(top_srcdir)/src            \
+              -I$(top_srcdir)/tests/libtest
 
 EXTRA_DIST = Makefile.inc CMakeLists.txt README.md
 
@@ -49,7 +49,7 @@ LDADD = $(top_builddir)/src/libcurltool.la   \
         $(top_builddir)/lib/libcurlu.la      \
         @LDFLAGS@ @LIBCURL_LIBS@ @NSS_LIBS@
 
-CPPFLAGS += -DCURL_STATICLIB -DUNITTESTS
+AM_CPPFLAGS += -DCURL_STATICLIB -DUNITTESTS
 
 CHECKSRC = $(CS_$(V))
 CS_0 = @echo "  RUN     " $@;