aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunter Knauf <gk@gknw.de>2008-02-18 15:32:34 +0000
committerGunter Knauf <gk@gknw.de>2008-02-18 15:32:34 +0000
commit6398f71cc44b60da4c5e579bfdfdd33c572532ba (patch)
tree1d8b93d127457f833ed2f5bca7f13babcc0861d5
parente2b50b203de95bd7db9ab0ab43c3af061685c9c4 (diff)
moved sample program defines into separate Makefile.inc so that other makefiles can pick up the defines from there.
-rw-r--r--docs/examples/Makefile.am20
-rw-r--r--docs/examples/Makefile.inc16
2 files changed, 21 insertions, 15 deletions
diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index 16f3152b5..83980492b 100644
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -4,7 +4,8 @@
AUTOMAKE_OPTIONS = foreign nostdinc
-EXTRA_DIST = README Makefile.example makefile.dj $(COMPLICATED_EXAMPLES)
+EXTRA_DIST = README Makefile.example Makefile.inc Makefile.m32 \
+ makefile.dj $(COMPLICATED_EXAMPLES)
INCLUDES = -I$(top_srcdir)/include
@@ -20,18 +21,7 @@ CPPFLAGS = -DCURL_NO_OLDIES $(STATICCPPFLAGS)
# 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 threaded-ssl.c
+# Makefile.inc provides the noinst_PROGRAMS and COMPLICATED_EXAMPLES defines
+include Makefile.inc
+
diff --git a/docs/examples/Makefile.inc b/docs/examples/Makefile.inc
new file mode 100644
index 000000000..8753d4f4b
--- /dev/null
+++ b/docs/examples/Makefile.inc
@@ -0,0 +1,16 @@
+# 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 threaded-ssl.c
+
+