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.

diff --git a/CHANGES b/CHANGES
index b76921e..e1bcb94 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
 
                                   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)
 
 Daniel Stenberg (28 Mar 2008)

diff --git a/Makefile.am b/Makefile.am
index cd2103a..560f825 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,7 +72,7 @@ test-torture:
 endif
 
 examples:
-       @(cd docs/examples; $(MAKE) all)
+       @(cd docs/examples; $(MAKE) check)
 
 #
 # Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros

diff --git a/docs/INSTALL b/docs/INSTALL
index c3b18ec..d51e92a 100644 (file)
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -709,8 +709,8 @@ REDUCING SIZE
    size of libcurl for embedded applications where binary size is an
    important factor.  First, be sure to set the CFLAGS variable when
    configuring with any relevant compiler optimization flags to reduce the
-   size of the binary.  For gcc, this would mean at minimum the -Os option
-   and probably the -march=X option as well, e.g.:
+   size of the binary.  For gcc, this would mean at minimum the -Os option,
+   potentially the -march=X and -mdynamic-no-pic options as well, e.g.:
 
       ./configure CFLAGS='-Os' ...
 

diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index 8398049..83069d4 100644 (file)
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -21,7 +21,7 @@ CPPFLAGS = -DCURL_NO_OLDIES $(STATICCPPFLAGS)
 # Dependencies
 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
 
 

diff --git a/docs/examples/Makefile.inc b/docs/examples/Makefile.inc
index 8753d4f..5d0c162 100644 (file)
--- a/docs/examples/Makefile.inc
+++ b/docs/examples/Makefile.inc
@@ -1,5 +1,5 @@
 # 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 \
   getinfo getinmemory http-post httpput \
   https multi-app multi-debugcallback multi-double \

diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32
index e1ebab8..9fec1f4 100644 (file)
--- a/docs/examples/Makefile.m32
+++ b/docs/examples/Makefile.m32
@@ -110,10 +110,10 @@ endif
 curl_LDADD += -lws2_32 -lwinmm
 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
 
-example_PROGRAMS := $(patsubst %,%.exe,$(strip $(noinst_PROGRAMS)))
+example_PROGRAMS := $(patsubst %,%.exe,$(strip $(check_PROGRAMS)))
 
 .SUFFIXES: .rc .res .o .exe