romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 11:43:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

autotools: simplify configuration in tests, examples

Browse source 
- GHA/windows: make a mingw autotools build static only.
- GHA/windows: fix a CI script issue with the build above.
- src: fix to pass `LIBCURL_PC_LIBS_PRIVATE` instead of `LINKFLAGS`.
  This makes the libs propagate to tunits, making the local hack there
  unnecessary. `LINKFLAGS` had this single use in the repo, and it was
  empty in local tests.
- tests: drop passing redundant `LIBCURL_PC_LDFLAGS_PRIVATE`.
- tests: drop redundant target name from config variables.
- examples, tests/client: drop `LIBDIR` temp variables with single uses.
- examples, tests: formatting to sync `Makefile.am` scripts with each
  other.

Closes #17661
This commit is contained in:
Viktor Szakats 2025-06-18 10:33:15 +02:00
parent af309fb17b
commit ea782134e5
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
8 changed files with 19 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/client/Makefile.am
View file

@ -48,15 +48,12 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
# Prevent LIBS from being used for all link targets
LIBS = $(BLANK_AT_MAKETIME)
LIBDIR = $(top_builddir)/lib
if USE_CPPFLAG_CURL_STATICLIB
AM_CPPFLAGS += -DCURL_STATICLIB
endif
if DOING_NATIVE_WINDOWS
AM_CPPFLAGS += -DWIN32_LEAN_AND_MEAN
endif
AM_CPPFLAGS += -DCURL_NO_OLDIES
bundle_extra =
@ -69,10 +66,8 @@ $(BUNDLE_SRC): $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRSTFILES) $(bu
@PERL@ $(top_srcdir)/scripts/mk-unity.pl --include $(bundle_extra) --test $(TESTFILES) > $(BUNDLE_SRC)
noinst_PROGRAMS = $(BUNDLE)
nodist_clients_SOURCES = $(BUNDLE_SRC)
clients_SOURCES =
clients_LDADD = $(LIBDIR)/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
clients_CFLAGS = $(AM_CFLAGS)
nodist_SOURCES = $(BUNDLE_SRC)
LDADD = $(top_builddir)/lib/libcurl.la
CLEANFILES = $(BUNDLE_SRC)
CHECKSRC = $(CS_$(V))

7
tests/libtest/Makefile.am
View file

@ -53,9 +53,6 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
# Prevent LIBS from being used for all link targets
LIBS = $(BLANK_AT_MAKETIME)
# Dependencies (may need to be overridden)
LDADD = $(top_builddir)/lib/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
noinst_LTLIBRARIES =
if USE_CPPFLAG_CURL_STATICLIB
@ -67,7 +64,6 @@ endif
if CURLDEBUG
AM_CPPFLAGS += -DCURLDEBUG
endif
AM_CPPFLAGS += -DCURL_NO_OLDIES -DCURL_DISABLE_DEPRECATION
AM_LDFLAGS =
@ -98,7 +94,8 @@ $(BUNDLE_SRC): $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRSTFILES) $(UT
@PERL@ $(top_srcdir)/scripts/mk-unity.pl --include $(UTILS) $(bundle_extra) --test $(TESTFILES) lib1521.c > $(BUNDLE_SRC)
noinst_PROGRAMS = $(BUNDLE)
nodist_libtests_SOURCES = $(BUNDLE_SRC)
nodist_SOURCES = $(BUNDLE_SRC)
LDADD = $(top_builddir)/lib/libcurl.la
CLEANFILES = $(BUNDLE_SRC) lib1521.c
lib1521.c: $(top_srcdir)/tests/libtest/mk-lib1521.pl $(top_srcdir)/include/curl/curl.h

6
tests/server/Makefile.am
View file

@ -53,16 +53,14 @@ LIBS = $(BLANK_AT_MAKETIME)
if DOING_NATIVE_WINDOWS
AM_CPPFLAGS += -DCURL_STATICLIB
endif
AM_CPPFLAGS += -DWITHOUT_LIBCURL -DCURL_NO_OLDIES
$(BUNDLE_SRC): $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRSTFILES) $(UTILS) $(CURLX_SRCS) $(TESTFILES)
@PERL@ $(top_srcdir)/scripts/mk-unity.pl --include $(UTILS) $(CURLX_SRCS) --test $(TESTFILES) > $(BUNDLE_SRC)
noinst_PROGRAMS = $(BUNDLE)
nodist_servers_SOURCES = $(BUNDLE_SRC)
servers_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
servers_CFLAGS = $(AM_CFLAGS)
nodist_SOURCES = $(BUNDLE_SRC)
LDADD = @CURL_NETWORK_AND_TIME_LIBS@
CLEANFILES = $(BUNDLE_SRC)
CHECKSRC = $(CS_$(V))

6
tests/tunit/Makefile.am
View file

@ -51,10 +51,6 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
# Prevent LIBS from being used for all link targets
LIBS = $(BLANK_AT_MAKETIME)
LDADD = $(top_builddir)/src/libcurltool.la \
$(top_builddir)/lib/libcurl.la \
@LIBCURL_PC_LDFLAGS_PRIVATE@ @LIBCURL_PC_LIBS_PRIVATE@
AM_CPPFLAGS += -DCURL_STATICLIB -DUNITTESTS
if DEBUGBUILD
AM_CPPFLAGS += -DDEBUGBUILD
@ -62,7 +58,6 @@ endif
if CURLDEBUG
AM_CPPFLAGS += -DCURLDEBUG
endif
AM_CPPFLAGS += -DCURL_NO_OLDIES -DCURL_DISABLE_DEPRECATION
if BUILD_UNITTESTS
@ -71,6 +66,7 @@ $(BUNDLE_SRC): $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRSTFILES) $(UT
noinst_PROGRAMS = $(BUNDLE)
nodist_tunits_SOURCES = $(BUNDLE_SRC)
LDADD = $(top_builddir)/src/libcurltool.la $(top_builddir)/lib/libcurl.la
CLEANFILES = $(BUNDLE_SRC)
else
noinst_PROGRAMS =

5
tests/unit/Makefile.am
View file

@ -50,9 +50,6 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
# Prevent LIBS from being used for all link targets
LIBS = $(BLANK_AT_MAKETIME)
LDADD = $(top_builddir)/lib/libcurlu.la \
@LIBCURL_PC_LDFLAGS_PRIVATE@ @LIBCURL_PC_LIBS_PRIVATE@
AM_CPPFLAGS += -DCURL_STATICLIB -DUNITTESTS -DBUILDING_LIBCURL
if DEBUGBUILD
AM_CPPFLAGS += -DDEBUGBUILD
@ -60,7 +57,6 @@ endif
if CURLDEBUG
AM_CPPFLAGS += -DCURLDEBUG
endif
AM_CPPFLAGS += -DCURL_NO_OLDIES -DCURL_DISABLE_DEPRECATION
if BUILD_UNITTESTS
@ -69,6 +65,7 @@ $(BUNDLE_SRC): $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRSTFILES) $(UT
noinst_PROGRAMS = $(BUNDLE)
nodist_units_SOURCES = $(BUNDLE_SRC)
LDADD = $(top_builddir)/lib/libcurlu.la
CLEANFILES = $(BUNDLE_SRC)
else
noinst_PROGRAMS =