tests: fix `BUNDLE` variable references in `Makefile.am`

Bug: https://github.com/curl/curl/pull/17750/files#diff-0c866a04cf144e1595f64820c652daaa923358d4de1b30ca8baf85c70ec12a2dR83

Closes #17751

diff --git a/tests/client/Makefile.am b/tests/client/Makefile.am
index de445295e25afc9b3d1dd5fcdb5f783fa03140de..928ec5b943576f3ae874fa751aef22b2a32a4a4b 100644 (file)
--- a/tests/client/Makefile.am
+++ b/tests/client/Makefile.am
@@ -59,12 +59,12 @@ else
 # These are part of the libcurl static lib. Add them here when linking shared.
 curlx_c_lib = $(CURLX_C)
 endif
-${BUNDLE}.c: $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRST_C) $(curlx_c_lib) $(TESTS_C)
-       @PERL@ $(top_srcdir)/scripts/mk-unity.pl --include $(curlx_c_lib) --test $(TESTS_C) > ${BUNDLE}.c
+$(BUNDLE).c: $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRST_C) $(curlx_c_lib) $(TESTS_C)
+       @PERL@ $(top_srcdir)/scripts/mk-unity.pl --include $(curlx_c_lib) --test $(TESTS_C) > $(BUNDLE).c
 
 noinst_PROGRAMS = $(BUNDLE)
 LDADD = $(top_builddir)/lib/libcurl.la
-CLEANFILES = ${BUNDLE}.c
+CLEANFILES = $(BUNDLE).c
 
 CHECKSRC = $(CS_$(V))
 CS_0 = @echo "  RUN     " $@;
@@ -74,7 +74,7 @@ CS_ = $(CS_0)
 # ignore generated C files since they play by slightly different rules!
 checksrc:
        $(CHECKSRC)(@PERL@ $(top_srcdir)/scripts/checksrc.pl -D$(srcdir) \
-         -W$(srcdir)/${BUNDLE}.c \
+         -W$(srcdir)/$(BUNDLE).c \
          $(srcdir)/*.[ch])
 
 if NOT_CURL_CI

diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index e9444d5bc063f3b948cefdfa45ff1f47c66fd8de..176bcd558a83a7fcad4a6d48f87dfec678176db3 100644 (file)
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -54,12 +54,12 @@ if DOING_NATIVE_WINDOWS
 AM_CPPFLAGS += -DCURL_STATICLIB
 endif
 
-${BUNDLE}.c: $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRST_C) $(UTILS_C) $(CURLX_C) $(TESTS_C)
-       @PERL@ $(top_srcdir)/scripts/mk-unity.pl --include $(UTILS_C) $(CURLX_C) --test $(TESTS_C) > ${BUNDLE}.c
+$(BUNDLE).c: $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRST_C) $(UTILS_C) $(CURLX_C) $(TESTS_C)
+       @PERL@ $(top_srcdir)/scripts/mk-unity.pl --include $(UTILS_C) $(CURLX_C) --test $(TESTS_C) > $(BUNDLE).c
 
 noinst_PROGRAMS = $(BUNDLE)
 LDADD = @CURL_NETWORK_AND_TIME_LIBS@
-CLEANFILES = ${BUNDLE}.c
+CLEANFILES = $(BUNDLE).c
 
 CHECKSRC = $(CS_$(V))
 CS_0 = @echo "  RUN     " $@;
@@ -69,7 +69,7 @@ CS_ = $(CS_0)
 # ignore generated C files since they play by slightly different rules!
 checksrc:
        $(CHECKSRC)(@PERL@ $(top_srcdir)/scripts/checksrc.pl -D$(srcdir) \
-         -W$(srcdir)/${BUNDLE}.c \
+         -W$(srcdir)/$(BUNDLE).c \
          $(srcdir)/*.[ch])
 
 if NOT_CURL_CI

diff --git a/tests/tunit/Makefile.am b/tests/tunit/Makefile.am
index 857f7ffeefb66c9a53573708a803ea291c9f18e5..7434469052ae178e0b23a74039a0ab3360928dae 100644 (file)
--- a/tests/tunit/Makefile.am
+++ b/tests/tunit/Makefile.am
@@ -61,12 +61,12 @@ endif
 AM_CPPFLAGS += -DCURL_NO_OLDIES -DCURL_DISABLE_DEPRECATION
 
 if BUILD_UNITTESTS
-${BUNDLE}.c: $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRST_C) $(TESTS_C)
-       @PERL@ $(top_srcdir)/scripts/mk-unity.pl --test $(TESTS_C) > ${BUNDLE}.c
+$(BUNDLE).c: $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRST_C) $(TESTS_C)
+       @PERL@ $(top_srcdir)/scripts/mk-unity.pl --test $(TESTS_C) > $(BUNDLE).c
 
 noinst_PROGRAMS = $(BUNDLE)
 LDADD = $(top_builddir)/src/libcurltool.la $(top_builddir)/lib/libcurl.la
-CLEANFILES = ${BUNDLE}.c
+CLEANFILES = $(BUNDLE).c
 else
 noinst_PROGRAMS =
 endif
@@ -79,7 +79,7 @@ CS_ = $(CS_0)
 # ignore generated C files since they play by slightly different rules!
 checksrc:
        $(CHECKSRC)(@PERL@ $(top_srcdir)/scripts/checksrc.pl -D$(srcdir) \
-         -W$(srcdir)/${BUNDLE}.c \
+         -W$(srcdir)/$(BUNDLE).c \
          $(srcdir)/*.[ch])
 
 if NOT_CURL_CI

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index fb30741466633b8e839d5ebdc11448fdf9402f3b..00054ec2beef143cbcb39e5d8872236f3e7c74fe 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -60,12 +60,12 @@ AM_CPPFLAGS += -DCURL_NO_OLDIES -DCURL_DISABLE_DEPRECATION
 AM_CPPFLAGS += -DBUILDING_LIBCURL
 
 if BUILD_UNITTESTS
-${BUNDLE}.c: $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRST_C) $(TESTS_C)
-       @PERL@ $(top_srcdir)/scripts/mk-unity.pl --test $(TESTS_C) > ${BUNDLE}.c
+$(BUNDLE).c: $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRST_C) $(TESTS_C)
+       @PERL@ $(top_srcdir)/scripts/mk-unity.pl --test $(TESTS_C) > $(BUNDLE).c
 
 noinst_PROGRAMS = $(BUNDLE)
 LDADD = $(top_builddir)/lib/libcurlu.la
-CLEANFILES = ${BUNDLE}.c
+CLEANFILES = $(BUNDLE).c
 else
 noinst_PROGRAMS =
 endif
@@ -78,7 +78,7 @@ CS_ = $(CS_0)
 # ignore generated C files since they play by slightly different rules!
 checksrc:
        $(CHECKSRC)(@PERL@ $(top_srcdir)/scripts/checksrc.pl -D$(srcdir) \
-         -W$(srcdir)/${BUNDLE}.c \
+         -W$(srcdir)/$(BUNDLE).c \
          $(srcdir)/*.[ch])
 
 if NOT_CURL_CI