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 b76921e172cd1d255f9d271295244948fb3b2d0a..e1bcb945683d1f6175e1553024dcf3978b322a24 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 cd2103a1175b415d06f9944b4353b9270128e4f2..560f8259a5c1d851aca8b4f1fc1420e98af0303e 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 c3b18ecbf04e2debb0a8fec7362d3e0587374b2f..d51e92ae7a56fbad0add27d5e8db5b4e7ad2147b 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 83980492b1ee901d9d2245684aa081e10cadb116..83069d4425ee28fe45bcfaabe5e5a02e4c8e4eaa 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 8753d4f4be0a7da62adce83de90c85a1db282d26..5d0c162a51c562502b3f311a7d304267ca247a0f 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 e1ebab85365c25de1917c83249f69bc36d7f1673..9fec1f42f21d560ef47373036433bea5b50f80f2 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