Changed the makefile so the doc/examples/ programs are never built in a
normal build/install (only with the 'make check' target), so that a build failure in the examples isn't fatal.
This commit is contained in:
parent
80e7f9b9de
commit
1e482fe6a8
5
CHANGES
5
CHANGES
@ -6,6 +6,11 @@
|
|||||||
|
|
||||||
Changelog
|
Changelog
|
||||||
|
|
||||||
|
Daniel Fandrich (30 Mar 2008)
|
||||||
|
- Changed the makefile so the doc/examples/ programs are never built in a
|
||||||
|
normal build/install (only with the 'make check' target), so that a
|
||||||
|
build failure in the examples isn't fatal.
|
||||||
|
|
||||||
Version 7.18.1 (30 March 2008)
|
Version 7.18.1 (30 March 2008)
|
||||||
|
|
||||||
Daniel Stenberg (28 Mar 2008)
|
Daniel Stenberg (28 Mar 2008)
|
||||||
|
@ -72,7 +72,7 @@ test-torture:
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
examples:
|
examples:
|
||||||
@(cd docs/examples; $(MAKE) all)
|
@(cd docs/examples; $(MAKE) check)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros
|
# Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros
|
||||||
|
@ -709,8 +709,8 @@ REDUCING SIZE
|
|||||||
size of libcurl for embedded applications where binary size is an
|
size of libcurl for embedded applications where binary size is an
|
||||||
important factor. First, be sure to set the CFLAGS variable when
|
important factor. First, be sure to set the CFLAGS variable when
|
||||||
configuring with any relevant compiler optimization flags to reduce the
|
configuring with any relevant compiler optimization flags to reduce the
|
||||||
size of the binary. For gcc, this would mean at minimum the -Os option
|
size of the binary. For gcc, this would mean at minimum the -Os option,
|
||||||
and probably the -march=X option as well, e.g.:
|
potentially the -march=X and -mdynamic-no-pic options as well, e.g.:
|
||||||
|
|
||||||
./configure CFLAGS='-Os' ...
|
./configure CFLAGS='-Os' ...
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ CPPFLAGS = -DCURL_NO_OLDIES $(STATICCPPFLAGS)
|
|||||||
# Dependencies
|
# Dependencies
|
||||||
LDADD = $(LIBDIR)/libcurl.la
|
LDADD = $(LIBDIR)/libcurl.la
|
||||||
|
|
||||||
# Makefile.inc provides the noinst_PROGRAMS and COMPLICATED_EXAMPLES defines
|
# Makefile.inc provides the check_PROGRAMS and COMPLICATED_EXAMPLES defines
|
||||||
include Makefile.inc
|
include Makefile.inc
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# These are all libcurl example programs to be test compiled
|
# These are all libcurl example programs to be test compiled
|
||||||
noinst_PROGRAMS = 10-at-a-time anyauthput cookie_interface \
|
check_PROGRAMS = 10-at-a-time anyauthput cookie_interface \
|
||||||
debug fileupload fopen ftpget ftpgetresp ftpupload \
|
debug fileupload fopen ftpget ftpgetresp ftpupload \
|
||||||
getinfo getinmemory http-post httpput \
|
getinfo getinmemory http-post httpput \
|
||||||
https multi-app multi-debugcallback multi-double \
|
https multi-app multi-debugcallback multi-double \
|
||||||
|
@ -110,10 +110,10 @@ endif
|
|||||||
curl_LDADD += -lws2_32 -lwinmm
|
curl_LDADD += -lws2_32 -lwinmm
|
||||||
COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
|
COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
|
||||||
|
|
||||||
# Makefile.inc provides the noinst_PROGRAMS and COMPLICATED_EXAMPLES defines
|
# Makefile.inc provides the check_PROGRAMS and COMPLICATED_EXAMPLES defines
|
||||||
include Makefile.inc
|
include Makefile.inc
|
||||||
|
|
||||||
example_PROGRAMS := $(patsubst %,%.exe,$(strip $(noinst_PROGRAMS)))
|
example_PROGRAMS := $(patsubst %,%.exe,$(strip $(check_PROGRAMS)))
|
||||||
|
|
||||||
.SUFFIXES: .rc .res .o .exe
|
.SUFFIXES: .rc .res .o .exe
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user