aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2007-07-12 20:38:54 +0000
committerDan Fandrich <dan@coneharvesters.com>2007-07-12 20:38:54 +0000
commitffff8ddbef298d960bb4f91128298cf28f8d9928 (patch)
tree15336d8ed1feb4573a2af7d4f79b880985ef1afd
parentcf86f8cb78721d04253b0cec9fc01a52456d7448 (diff)
Compile most of the example apps in docs/examples when doing a 'make check'.
-rw-r--r--Makefile.am5
-rw-r--r--docs/examples/Makefile.am42
2 files changed, 32 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am
index 733ec0482..f7affef8a 100644
--- 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 060697a84..64a79dce2 100644
--- 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
+