From 7a47bd6164a6d1806af7557daedb2be5db064140 Mon Sep 17 00:00:00 2001
From: m0gg
Date: Mon, 6 Mar 2006 13:28:21 +0000
Subject: Buildsystem cleanup

---
 examples/Makefile.am          |  2 +-
 examples/csoap/Makefile.am    | 17 ++---------------
 examples/nanohttp/Makefile.am | 26 +++-----------------------
 3 files changed, 6 insertions(+), 39 deletions(-)

(limited to 'examples')

diff --git a/examples/Makefile.am b/examples/Makefile.am
index a79d5c7..c4fcbca 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1 +1 @@
-SUBDIRS=csoap nanohttp
+SUBDIRS=nanohttp csoap
diff --git a/examples/csoap/Makefile.am b/examples/csoap/Makefile.am
index 386bbe9..9cecda6 100644
--- a/examples/csoap/Makefile.am
+++ b/examples/csoap/Makefile.am
@@ -1,28 +1,15 @@
+LDADD=../../nanohttp/libnanohttp.la ../../libcsoap/libcsoap.la -lpthread
+
 noinst_PROGRAMS=simpleclient simpleserver echoattachments-client echoattachments-server
 bin_PROGRAMS=soapclient
 
-INCLUDES=-I$(top_srcdir)/ $(LIBXML_CFLAGS)
-csoap_LDFLAG=-L$(top_builddir)/nanohttp -lnanohttp-$(GENERIC_API_VERSION) \
-	$(LIBSOCKET) $(LIBNSL) -lpthread\
-	-L$(top_builddir)/libcsoap/ -lcsoap-$(GENERIC_API_VERSION) $(LIBS)\
-	$(LIBXML_LIBS)
-
 simpleclient_SOURCES=simpleclient.c
-simpleclient_LDFLAGS=$(csoap_LDFLAG)
 
 simpleserver_SOURCES=simpleserver.c
-simpleserver_LDFLAGS=$(csoap_LDFLAG)
 
 echoattachments_server_SOURCES=echoattachments-server.c
-echoattachments_server_LDFLAGS=$(csoap_LDFLAG)
 
 echoattachments_client_SOURCES=echoattachments-client.c
-echoattachments_client_LDFLAGS=$(csoap_LDFLAG)
 
 soapclient_SOURCES=soapclient.c
-soapclient_LDFLAGS=$(csoap_LDFLAG)
-
-
-
-
 
diff --git a/examples/nanohttp/Makefile.am b/examples/nanohttp/Makefile.am
index 5e24bd1..2e9aee1 100644
--- a/examples/nanohttp/Makefile.am
+++ b/examples/nanohttp/Makefile.am
@@ -1,28 +1,8 @@
-noinst_PROGRAMS=http_server
-#bin_PROGRAMS=http_server  httpget httpgetcb httppost httpcpost postserver
+LDADD=../../nanohttp/libnanohttp.la -lpthread
 
-INCLUDES=-I$(top_srcdir)/ 
-nanohttp_LDFLAG=-L$(top_builddir)/nanohttp -lnanohttp-$(GENERIC_API_VERSION) \
-	$(LIBSOCKET) $(LIBNSL) -lpthread
-
-
-#simpleclient_SOURCES=simpleclient.c
+noinst_PROGRAMS=http_server http_client
 
 http_server_SOURCES=http_server.c
-http_server_LDFLAGS=$(nanohttp_LDFLAG)
-
-#httpget_SOURCES=httpget.c
-#httpget_LDFLAGS=$(nanohttp_LDFLAG)
-
-#httpgetcb_SOURCES=httpgetcb.c
-#httpgetcb_LDFLAGS=$(nanohttp_LDFLAG)
-
-#httppost_SOURCES=httppost.c
-#httppost_LDFLAGS=$(nanohttp_LDFLAG)
-
-#httpcpost_SOURCES=httpcpost.c
-#httpcpost_LDFLAGS=$(nanohttp_LDFLAG)
 
-#postserver_SOURCES=postserver.c
-#postserver_LDFLAGS=$(nanohttp_LDFLAG)
+http_client_SOURCES=http_client.c
 
-- 
cgit v1.1-32-gdbae