Compile most of the example apps in docs/examples when doing a 'make check'.

diff --git a/Makefile.am b/Makefile.am
index 733ec0482378833d78cc6d01c86667326fe7b1ce..f7affef8aa31337cb3e917cf62d3b040ce361542 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,7 +49,7 @@ html:
 pdf:
        cd docs; make pdf
 
-check: test
+check: test examples
 
 if CROSSCOMPILING
 test-full: test
@@ -71,6 +71,9 @@ test-torture:
 
 endif
 
+examples:
+       @(cd docs/examples; $(MAKE) all)
+
 #
 # Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros
 # must contain the following line:

diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index 060697a8452e6b0003e9a6691a2522a7126fa0e8..64a79dce29e2d1e4e38e15c55be6c64c436a19d6 100644 (file)
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -2,17 +2,31 @@
 # $Id$
 #
 
-AUTOMAKE_OPTIONS = foreign no-dependencies
-
-EXTRA_DIST = README curlgtk.c sepheaders.c simple.c postit2.c          \
- persistant.c ftpget.c Makefile.example multithread.c getinmemory.c    \
- ftpupload.c httpput.c simplessl.c ftpgetresp.c http-post.c            \
- post-callback.c multi-app.c multi-double.c multi-single.c             \
- multi-post.c fopen.c simplepost.c makefile.dj curlx.c https.c         \
- multi-debugcallback.c fileupload.c getinfo.c ftp3rdparty.c debug.c    \
- anyauthput.c htmltitle.cc htmltidy.c opensslthreadlock.c              \
- cookie_interface.c cacertinmem.c synctime.c sampleconv.c ftpuploadresume.c \
- 10-at-a-time.c hiperfifo.c ghiper.c
-
-all:
-       @echo "done"
+AUTOMAKE_OPTIONS = foreign nostdinc
+
+EXTRA_DIST = README Makefile.example makefile.dj $(COMPLICATED_EXAMPLES)
+
+INCLUDES = -I$(top_srcdir)/include/curl \
+           -I$(top_builddir)/lib   \
+           -I$(top_srcdir)/lib
+
+LIBDIR = $(top_builddir)/lib
+
+# Dependencies
+LDADD = $(LIBDIR)/libcurl.la
+
+# These are all libcurl example programs to be test compiled
+noinst_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 \
+  multi-post multi-single persistant post-callback \
+  postit2 sepheaders simple simplepost simplessl
+
+# These examples require external dependencies that may not be commonly
+# available on POSIX systems, so don't bother attempting to compile them here.
+COMPLICATED_EXAMPLES = \
+ curlgtk.c curlx.c htmltitle.cc cacertinmem.c ftpuploadresume.c \
+ ghiper.c hiperfifo.c htmltidy.c multithread.c \
+ opensslthreadlock.c sampleconv.c synctime.c
+