generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

src/Makefile.am: build static lib for unit tests if enabled

Browse Source
This commit is contained in:
Kamil Dudka 2013-05-03 23:03:58 +02:00
parent 2de20dd9a1
commit 683f2b8323
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile.am
View File

@ -66,6 +66,14 @@ curl_LDFLAGS = @LIBMETALINK_LDFLAGS@
curl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS) curl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS)
curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la
# if unit tests are enabled, build a static library to link them with
if BUILD_UNITTESTS
noinst_LTLIBRARIES = libcurltool.la
libcurltool_la_CFLAGS = -DUNITTESTS
libcurltool_la_LDFLAGS = -static $(LINKFLAGS)
libcurltool_la_SOURCES = $(curl_SOURCES)
endif
BUILT_SOURCES = tool_hugehelp.c BUILT_SOURCES = tool_hugehelp.c
CLEANFILES = tool_hugehelp.c CLEANFILES = tool_hugehelp.c
# Use the C locale to ensure that only ASCII characters appear in the # Use the C locale to ensure that only ASCII characters appear in the

4
src/tool_main.c
View File

@ -55,6 +55,9 @@
int vms_show = 0; int vms_show = 0;
#endif #endif
/* if we build a static library for unit tests, there is no main() function */
#ifndef UNITTESTS
/* /*
* Ensure that file descriptors 0, 1 and 2 (stdin, stdout, stderr) are * Ensure that file descriptors 0, 1 and 2 (stdin, stdout, stderr) are
* open before starting to run. Otherwise, the first three network * open before starting to run. Otherwise, the first three network
@ -118,3 +121,4 @@ int main(int argc, char *argv[])
#endif #endif
} }
#endif /* ndef UNITTESTS */

11
tests/unit/Makefile.am
View File

@ -40,6 +40,7 @@ AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/lib \ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-I$(top_srcdir)/src \
-I$(top_srcdir)/tests/libtest \ -I$(top_srcdir)/tests/libtest \
-I$(top_builddir)/ares \ -I$(top_builddir)/ares \
-I$(top_srcdir)/ares -I$(top_srcdir)/ares
@ -49,6 +50,7 @@ AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/lib \ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-I$(top_srcdir)/src \
-I$(top_srcdir)/tests/libtest -I$(top_srcdir)/tests/libtest
endif endif
@ -57,8 +59,13 @@ EXTRA_DIST = Makefile.inc
# Prevent LIBS from being used for all link targets # Prevent LIBS from being used for all link targets
LIBS = $(BLANK_AT_MAKETIME) LIBS = $(BLANK_AT_MAKETIME)
LDADD = $(top_builddir)/lib/libcurlu.la @LDFLAGS@ @LIBCURL_LIBS@ LDADD = $(top_builddir)/src/libcurltool.la \
DEPENDENCIES = $(top_builddir)/lib/libcurlu.la $(top_builddir)/lib/libcurlu.la \
@LDFLAGS@ @LIBCURL_LIBS@
DEPENDENCIES = $(top_builddir)/src/libcurltool.la \
$(top_builddir)/lib/libcurlu.la
AM_CPPFLAGS += -DCURL_STATICLIB -DUNITTESTS AM_CPPFLAGS += -DCURL_STATICLIB -DUNITTESTS
# Makefile.inc provides neat definitions # Makefile.inc provides neat definitions