test-suite: sorted and fixed build flags

3 files changed, 26 insertions, 18 deletions

diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index c4c15608..c25abab7 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -419,37 +419,45 @@ test_postprocessor_md_SOURCES = \
 
 test_shutdown_select_SOURCES = \
   test_shutdown_select.c
+test_shutdown_select_CFLAGS = $(AM_CFLAGS)
+test_shutdown_select_LDADD = $(LDADD)
 if USE_POSIX_THREADS
-test_shutdown_select_CFLAGS = \
-  $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-test_shutdown_select_LDADD = \
+test_shutdown_select_CFLAGS += \
+  $(PTHREAD_CFLAGS)
+test_shutdown_select_LDADD += \
   $(PTHREAD_LIBS)
 endif
 
 test_shutdown_poll_SOURCES = \
   test_shutdown_select.c mhd_threads.h
+test_shutdown_poll_CFLAGS = $(AM_CFLAGS)
+test_shutdown_poll_LDADD = $(LDADD)
 if USE_POSIX_THREADS
-test_shutdown_poll_CFLAGS = \
+test_shutdown_poll_CFLAGS += \
   $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-test_shutdown_poll_LDADD = \
+test_shutdown_poll_LDADD += \
   $(PTHREAD_LIBS)
 endif
 
 test_shutdown_select_ignore_SOURCES = \
   test_shutdown_select.c
+test_shutdown_select_ignore_CFLAGS = $(AM_CFLAGS)
+test_shutdown_select_ignore_LDADD = $(LDADD)
 if USE_POSIX_THREADS
-test_shutdown_select_ignore_CFLAGS = \
-  $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-test_shutdown_select_ignore_LDADD = \
+test_shutdown_select_ignore_CFLAGS += \
+  $(PTHREAD_CFLAGS)
+test_shutdown_select_ignore_LDADD += \
   $(PTHREAD_LIBS)
 endif
 
 test_shutdown_poll_ignore_SOURCES = \
   test_shutdown_select.c mhd_threads.h
+test_shutdown_poll_ignore_CFLAGS = $(AM_CFLAGS)
+test_shutdown_poll_ignore_LDADD = $(LDADD)
 if USE_POSIX_THREADS
-test_shutdown_poll_ignore_CFLAGS = \
+test_shutdown_poll_ignore_CFLAGS += \
   $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-test_shutdown_poll_ignore_LDADD = \
+test_shutdown_poll_ignore_LDADD += \
   $(PTHREAD_LIBS)
 endif
 
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index a4bc94ef..3fa81ced 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -225,7 +225,7 @@ endif
 test_concurrent_stop_SOURCES = \
   test_concurrent_stop.c
 test_concurrent_stop_CFLAGS = \
-  $(PTHREAD_CFLAGS) $(AM_CFLAGS)
+  $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 test_concurrent_stop_LDADD = \
   $(PTHREAD_LIBS) $(LDADD)
 
@@ -235,14 +235,14 @@ test_get_SOURCES = \
 test_quiesce_SOURCES = \
   test_quiesce.c mhd_has_param.h mhd_has_in_name.h
 test_quiesce_CFLAGS = \
-  $(PTHREAD_CFLAGS) $(AM_CFLAGS)
+  $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 test_quiesce_LDADD = \
   $(PTHREAD_LIBS) $(LDADD)
 
 test_quiesce_stream_SOURCES = \
   test_quiesce_stream.c
 test_quiesce_stream_CFLAGS = \
-  $(PTHREAD_CFLAGS) $(AM_CFLAGS)
+  $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 test_quiesce_stream_LDADD = \
   $(PTHREAD_LIBS) $(LDADD)
 
@@ -257,7 +257,7 @@ perf_get_concurrent_SOURCES = \
   perf_get_concurrent.c \
   gauger.h mhd_has_in_name.h
 perf_get_concurrent_CFLAGS = \
-  $(PTHREAD_CFLAGS) $(AM_CFLAGS)
+  $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 perf_get_concurrent_LDADD = \
   $(PTHREAD_LIBS) $(LDADD)
 
@@ -265,7 +265,7 @@ perf_get_concurrent11_SOURCES = \
   perf_get_concurrent.c \
   gauger.h mhd_has_in_name.h
 perf_get_concurrent11_CFLAGS = \
-  $(PTHREAD_CFLAGS) $(AM_CFLAGS)
+  $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 perf_get_concurrent11_LDADD = \
   $(PTHREAD_LIBS) $(LDADD)
 
@@ -299,7 +299,7 @@ test_digestauth_with_arguments_LDADD = \
 test_digestauth_concurrent_SOURCES = \
   test_digestauth_concurrent.c
 test_digestauth_concurrent_CFLAGS = \
-  $(PTHREAD_CFLAGS) $(AM_CFLAGS)
+  $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 test_digestauth_concurrent_LDADD = \
   @LIBGCRYPT_LIBS@ $(LDADD) $(PTHREAD_LIBS) $(LDADD)
 
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am
index 11b1ea20..39394db1 100644
--- a/src/testcurl/https/Makefile.am
+++ b/src/testcurl/https/Makefile.am
@@ -87,7 +87,7 @@ test_https_get_parallel_SOURCES = \
   tls_test_common.h \
   tls_test_common.c
 test_https_get_parallel_CFLAGS = \
-  $(PTHREAD_CFLAGS) $(AM_CFLAGS)
+  $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 test_https_get_parallel_LDADD = \
   $(PTHREAD_LIBS) $(LDADD)
 
@@ -103,7 +103,7 @@ test_https_get_parallel_threads_SOURCES = \
   tls_test_common.h \
   tls_test_common.c
 test_https_get_parallel_threads_CFLAGS = \
-  $(PTHREAD_CFLAGS) $(AM_CFLAGS)
+  $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 test_https_get_parallel_threads_LDADD = \
   $(PTHREAD_LIBS) $(LDADD)