Buildsystem cleanup

10 files changed, 105 insertions, 353 deletions

diff --git a/Makefile.am b/Makefile.am
index 2afb47b..b2f42da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,35 @@
-## top directory
-bin_SCRIPTS=csoap-config
-
-#Build in these directories:
-SUBDIRS= $(NANOHTTP_LIBRARY_NAME) $(GENERIC_LIBRARY_NAME) examples
-
-#Distribute these directories:
-DIST_SUBDIRS = $(GENERIC_LIBRARY_NAME)
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libcsoap.pc
-
-
-
-
+SUBDIRS=nanohttp libcsoap examples
 
+bin_SCRIPTS=csoap-config
 
+pkgconfigdir=$(libdir)/pkgconfig
+pkgconfig_DATA=libcsoap.pc
+
+m4datadir=$(datadir)/aclocal
+m4data_DATA=libcsoap.m4
+
+documentation=doc/Doxyfile.api \
+              doc/compile.xml  \
+              doc/doxygen.css  \
+              doc/footer.html  \
+              doc/header.html  \
+              doc/tutorial.xml \
+              doc/images/logo02.gif
+
+broken_examples=examples/nanohttp/client_get.c   \
+                examples/nanohttp/client_mime.c  \
+                examples/nanohttp/httpcpost.c    \
+                examples/nanohttp/httpget.c      \
+                examples/nanohttp/httppost.c     \
+                examples/nanohttp/postserver.c   \
+                examples/nanohttp/client_post_chunked.c
+
+win32_env=win32/MinGW/Makefile    \
+          win32/MinGW/compile.bat \
+          win32/MinGW/config.h    \
+          win32/MinGW/readme.txt  \
+          win32/include/wsockcompat.h
+
+EXTRA_DIST=$(documentation) $(win32_env) libcsoap.pc.in libcsoap.m4 \
+           $(broken_examples)
 
diff --git a/nanohttp/todo.txt b/TODO
index 3cf9981..3cf9981 100755..100644
--- a/nanohttp/todo.txt
+++ b/TODO
diff --git a/configure.ac b/configure.ac
index 5ad6b14..95f26ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,98 +1,34 @@
-dnl --------------------------------
-dnl Initialization macros.
-dnl --------------------------------
-
-AC_INIT(libcsoap/soap-xml.h)
-AM_CONFIG_HEADER(config.h)
-
-dnl -----------------------------------------------
-dnl Package name and version number (user defined)
-dnl -----------------------------------------------
-
-GENERIC_LIBRARY_NAME=libcsoap
-
-#release versioning
-GENERIC_MAJOR_VERSION=1
-GENERIC_MINOR_VERSION=0
-GENERIC_MICRO_VERSION=4
-
-#API version (often = GENERIC_MAJOR_VERSION.GENERIC_MINOR_VERSION)
-GENERIC_API_VERSION=1.0
-AC_SUBST(GENERIC_API_VERSION)
-
-#shared library versioning
-GENERIC_LIBRARY_VERSION=1:0:0
-#                       | | |
-#                +------+ | +---+
-#                |        |     |
-#             current:revision:age
-#                |        |     |
-#                |        |     +- increment if interfaces have been added
-#                |        |        set to zero if interfaces have been removed
-#                                  or changed
-#                |        +- increment if source code has changed
-#                |           set to zero if current is incremented
-#                +- increment if interfaces have been added, removed or changed
-
-
-NANOHTTP_LIBRARY_NAME=nanohttp
-#release versioning
-NANOHTTP_MAJOR_VERSION=1
-NANOHTTP_MINOR_VERSION=0
-NANOHTTP_MICRO_VERSION=4
-
-#API version (often = GENERIC_MAJOR_VERSION.GENERIC_MINOR_VERSION)
-NANOHTTP_API_VERSION=1.0
-AC_SUBST(NANOHTTP_API_VERSION)
-
-#shared library versioning
-NANOHTTP_LIBRARY_VERSION=1:0:0
-
-dnl --------------------------------
-dnl Package name and version number
-dnl --------------------------------
-
-AC_SUBST(GENERIC_LIBRARY_VERSION)
-
-PACKAGE=$GENERIC_LIBRARY_NAME
-AC_SUBST(GENERIC_LIBRARY_NAME)
-
-GENERIC_VERSION=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION.$GENERIC_MICRO_VERSION
-GENERIC_RELEASE=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION
-AC_SUBST(GENERIC_RELEASE)
-AC_SUBST(GENERIC_VERSION)
-
-VERSION=$GENERIC_VERSION
-
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
-
-
-
-dnl --------------------------------
-dnl Package name and version number (nanohttp)
-dnl --------------------------------
+dnl
+dnl release information
+dnl
+AC_INIT(csoap, 1.1.0)
 
-AC_SUBST(NANOHTTP_LIBRARY_VERSION)
+dnl
+dnl version information
+dnl
+csoap_version=1:1:0
+nanohttp_version=1:1:0
 
-PACKAGE=$NANOHTTP_LIBRARY_NAME
-AC_SUBST(NANOHTTP_LIBRARY_NAME)
+AC_CONFIG_SRCDIR([nanohttp/nanohttp-server.c])
+AC_CONFIG_SRCDIR([libcsoap/soap-server.c])
+AM_INIT_AUTOMAKE
 
-NANOHTTP_VERSION=$NANOHTTP_MAJOR_VERSION.$NANOHTTP_MINOR_VERSION.$NANOHTTP_MICRO_VERSION
-NANOHTTP_RELEASE=$NANOHTTP_MAJOR_VERSION.$NANOHTTP_MINOR_VERSION
-AC_SUBST(NANOHTTP_RELEASE)
-AC_SUBST(NANOHTTP_VERSION)
+csoap_release=AC_PACKAGE_VERSION
+AC_SUBST(csoap_release)
+AC_SUBST(csoap_version)
+csoap_version_dotted=`echo $csoap_version | sed 's/:/./g'`
+AC_SUBST(csoap_version_dotted)
 
+nanohttp_release=AC_PACKAGE_VERSION
+AC_SUBST(nanohttp_release)
+AC_SUBST(nanohttp_version)
 
-# Process this file with autoconf to produce a configure script.
-#AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
-#AC_INIT(src/csoap.c)
-# AC_CONFIG_SRCDIR([csoap.c])
+AM_CONFIG_HEADER(config.h)
 
-# Checks for programs.
+AC_LANG_C
 AC_PROG_CC
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
-# Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_TIME
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h malloc.h netdb.h netinet/in.h stdint.h stdlib.h signal.h pthread.h string.h sys/socket.h sys/time.h unistd.h io.h stdio.h stdarg.h errno.h ctype.h openssl/rand.h openssl/err.h])
@@ -110,19 +46,29 @@ AC_FUNC_MALLOC
 AC_FUNC_VPRINTF
 AC_FUNC_STRFTIME
 AC_FUNC_SELECT_ARGTYPES
-AC_CHECK_FUNCS([gethostbyname inet_ntoa localtime_r memmove memset mkdir select socket strchr strdup strncasecmp strpbrk strspn strstr strtol])
+AC_CHECK_FUNCS([gethostbyname inet_ntoa memmove memset mkdir select socket strchr strdup strncasecmp strpbrk strspn strstr strtol])
+
+if test x_$build_os = x_solaris2.8; then
+  CFLAGS="$CFLAGS -D_REENTRANT"
+fi
+
+AC_CHECK_FUNCS([localtime_r strtok_r])
 
 # ------------------------------------------
-dnl Check socket library (for Solaris)
+# Check socket library (for Solaris)
 # ------------------------------------------
 AC_CHECK_LIB(socket, socket, [LIBSOCKET="-lsocket"])
 AC_SUBST(LIBSOCKET)
+
+AC_CHECK_LIB(nsl, inet_ntoa, [LIBNSL="-lnsl"])
 AC_CHECK_LIB(nsl, gethostbyname, [LIBNSL="-lnsl"])
 AC_SUBST(LIBNSL)
 
+AM_PATH_XML2(2.6.0,CFLAGS="$CFLAGS $XML_CPPFLAGS"; LDFLAGS="$LDFLAGS $XML_LIBS",exit 1)
+
 # ------------------------------------------
-dnl Check ssl library 
-dnl Original work at: http://autoconf-archive.cryp.to/check_ssl.html
+# Check ssl library 
+# Original work at: http://autoconf-archive.cryp.to/check_ssl.html
 # ------------------------------------------
 AC_DEFUN([CHECK_SSL],
 [AC_MSG_CHECKING(if ssl is wanted)
@@ -135,14 +81,12 @@ AC_ARG_WITH(ssl,
         ssldir="$dir"
         if test -f "$dir/include/openssl/ssl.h"; then
             found_ssl="yes";
-            CFLAGS="$CFLAGS -I$ssldir/include/openssl -DHAVE_SSL";
-            CXXFLAGS="$CXXFLAGS -I$ssldir/include/openssl -DHAVE_SSL";
+            CFLAGS="$CFLAGS -I$ssldir/include/openssl";
             break;
         fi
         if test -f "$dir/include/ssl.h"; then
             found_ssl="yes";
-            CFLAGS="$CFLAGS -I$ssldir/include/ -DHAVE_SSL";
-            CXXFLAGS="$CXXFLAGS -I$ssldir/include/ -DHAVE_SSL";
+            CFLAGS="$CFLAGS -I$ssldir/include";
             break
         fi
     done
@@ -154,9 +98,8 @@ AC_ARG_WITH(ssl,
         printf "OpenSSL found in $ssldir\n";
         LIBS="$LIBS -lssl -lcrypto";
         LDFLAGS="$LDFLAGS -L$ssldir/lib";
-        HAVE_SSL=yes
+        AC_DEFINE(HAVE_SSL,1,Define to 1 if you have requested --with-ssl)
     fi
-    AC_SUBST(HAVE_SSL)
 ],
 [
     AC_MSG_RESULT(no)
@@ -165,132 +108,12 @@ AC_ARG_WITH(ssl,
 
 CHECK_SSL
 
-dnl
-dnl The following new parameters were added to offer
-dnl the ability to specify the location of the libxml
-dnl library during linking and compilation.
-dnl
-dnl original work - Mathieu Lacage 30/03/2000
-dnl
-
-LIBXML_CONFIG_PREFIX=""
-LIBXML_SRC=""
-
-AC_ARG_WITH(libxml-prefix,
-        [  --with-libxml-prefix=[PFX]		Specify location of libxml config],
-	LIBXML_CONFIG_PREFIX=$withval
-)
-        
-AC_ARG_WITH(libxml-include-prefix,
-        [  --with-libxml-include-prefix=[PFX]	Specify location of libxml headers],
-        LIBXML_CFLAGS="-I$withval"
-)
-
-AC_ARG_WITH(libxml-libs-prefix,
-        [  --with-libxml-libs-prefix=[PFX]	Specify location of libxml libs],
-        LIBXML_LIBS="-L$withval"
-)
-
-AC_ARG_WITH(libxml-src,
-	[  --with-libxml-src=[DIR]              For libxml thats not installed yet (sets all three above)],
-	LIBXML_SRC="$withval"
-)
-
-dnl
-dnl where is xml2-config
-dnl
-
-AC_SUBST(LIBXML_REQUIRED_VERSION)
-AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) 
-if test "x$LIBXML_CONFIG_PREFIX" != "x"
-then
-	XML_CONFIG=${LIBXML_CONFIG_PREFIX}/bin/xml2-config
-else
-	XML_CONFIG=xml2-config
-fi
-
-dnl
-dnl imported from libxml2, c.f. #77827 
-dnl
-if test "${GCC}" != "yes" ; then
-    case "${host}" in
-          *-*-hpux* )
-	       CFLAGS="${CFLAGS} -Wp,-H30000"
-	       ;;
-          *-dec-osf* )
-               CFLAGS="${CFLAGS} -ieee"
-               ;;
-    esac
-else
-    CFLAGS="${CFLAGS} -Wall"
-    case "${host}" in
-          alpha*-*-linux* )
-	       CFLAGS="${CFLAGS} -mieee"
-	       ;;
-	  alpha*-*-osf* )
-	       CFLAGS="${CFLAGS} -mieee"
-	       ;;
-    esac
-fi
-
-dnl
-dnl Override other variables if LIBXML_SRC is set
-dnl
-
-if test "x$LIBXML_SRC" != "x"
-then
-	CWD=`pwd`
-	if cd $LIBXML_SRC
-	then
-		SRC_DIR=`pwd`
-		XML_CONFIG=${SRC_DIR}/xml2-config
-		LIBXML_CFLAGS="-I${SRC_DIR}/include"
-		LIBXML_LIBS="-L${SRC_DIR}"
-		cd $CWD
-	else
-		AC_MSG_ERROR([libxml source dir not found (${LIBXML_SRC}), typo?])
-	fi
-fi
-
-dnl
-dnl make sure xml2-config is executable,
-dnl test version and init our variables
-dnl
-
-AC_DEFUN([VERSION_TO_NUMBER],
-[`$1 | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`])
-if ${XML_CONFIG} --libs print > /dev/null 2>&1
-then
-	XMLVERS=`$XML_CONFIG --version`
-	if test VERSION_TO_NUMBER(echo $XMLVERS) -ge VERSION_TO_NUMBER(echo $LIBXML_REQUIRED_VERSION)
-	then
-		LIBXML_LIBS="$LIBXML_LIBS `$XML_CONFIG --libs`"
-		LIBXML_CFLAGS="$LIBXML_CFLAGS `$XML_CONFIG --cflags`"
-		AC_MSG_RESULT($XMLVERS found)
-	else
-		AC_MSG_ERROR(Version $XMLVERS found. You need at least libxml2 $LIBXML_REQUIRED_VERSION for this version of libxslt)
-	fi
-else
-	AC_MSG_ERROR([Could not find libxml2 anywhere, check ftp://xmlsoft.org/.])
-fi
-
-AC_SUBST(XML_CONFIG)
-AC_SUBST(LIBXML_LIBS)
-AC_SUBST(LIBXML_CFLAGS)
-
-AC_SUBST(CFLAGS)
-#dnl AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
-
-
-#AC_CONFIG_FILES([])
 AC_OUTPUT(Makefile 
 libcsoap/Makefile 
 nanohttp/Makefile 
-xsd2c/Makefile 
-wsdl2c/Makefile
 examples/Makefile
 examples/nanohttp/Makefile
 examples/csoap/Makefile
 libcsoap.pc
 csoap-config)
+
diff --git a/csoap-config.in b/csoap-config.in
index 2f127f7..a24f9e3 100755
--- a/csoap-config.in
+++ b/csoap-config.in
@@ -4,6 +4,8 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 includedir=@includedir@
 libdir=@libdir@
+relcsoap=@csoap_release@
+relnanohttp=@nanohttp_release@
 
 usage()
 {
@@ -57,7 +59,7 @@ while test $# -gt 0; do
 			;;
 
 		--version)
-			echo @VERSION@
+			echo @csoap_version_dotted@
 			exit 0
 			;;
 
@@ -66,11 +68,11 @@ while test $# -gt 0; do
 			;;
 
 		--cflags)
-			echo @LIBXML_CFLAGS@ -I${includedir}/@GENERIC_LIBRARY_NAME@-@GENERIC_API_VERSION@/ -I${includedir}/@NANOHTTP_LIBRARY_NAME@-@NANOHTTP_API_VERSION@/
+			echo @XML_CPPFLAGS@ -I${includedir}/libcsoap-$relcsoap -I${includedir}/nanohttp-$relnanohttp
 		 	;;
 
 		--libs)
-			echo -L${libdir} -lcsoap-@GENERIC_API_VERSION@ -l@NANOHTTP_LIBRARY_NAME@-@NANOHTTP_API_VERSION@ @LIBXML_LIBS@
+			echo -L${libdir} -lcsoap-$relcsoap -lnanohttp-$relnanohttp @XML_LIBS@
 			;;
 		*)
 			usage
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
 
diff --git a/libcsoap.pc.in b/libcsoap.pc.in
index f6365cd..edc3c78 100644
--- a/libcsoap.pc.in
+++ b/libcsoap.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: csoap
 Description: C API for SOAP applications
-Version: @VERSION@
-Libs: -L${libdir} -L${libdir} -lcsoap-@GENERIC_API_VERSION@ -lnanohttp-@NANOHTTP_API_VERSION@ @LIBXML_LIBS@
-Cflags: @LIBXML_CFLAGS@ -I${includedir}/@GENERIC_LIBRARY_NAME@-@GENERIC_API_VERSION@/ -I${includedir}/@NANOHTTP_LIBRARY_NAME@-@NANOHTTP_API_VERSION@/
+Version: @csoap_version_dotted@
+Libs: -L${libdir} -lcsoap-@csoap_release@ -lnanohttp-@nanohttp_release@ @XML_LIBS@
+Cflags: @XML_CPPFLAGS@ -I${includedir}/libcsoap-@csoap_release@ -I${includedir}/nanohttp-@nanohttp_release@
 
diff --git a/libcsoap/Makefile.am b/libcsoap/Makefile.am
index 3a19e5b..73f64ab 100644
--- a/libcsoap/Makefile.am
+++ b/libcsoap/Makefile.am
@@ -1,40 +1,13 @@
-## Source directory
-
-
-h_sources = soap-xml.h\
-soap-fault.h\
-soap-env.h\
-soap-service.h\
-soap-router.h\
-soap-client.h\
-soap-server.h\
-soap-ctx.h
-
-cc_sources = soap-xml.c\
-soap-fault.c\
-soap-env.c\
-soap-service.c\
-soap-router.c\
-soap-client.c\
-soap-server.c\
-soap-ctx.c
-
-library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)-$(GENERIC_API_VERSION)/$(GENERIC_LIBRARY_NAME)
-library_include_HEADERS = $(h_sources)
-
-INCLUDES = -I$(top_srcdir)  $(LIBXML_CFLAGS)
-
-# GENERIC_API_VERSION is 1.0
-lib_LTLIBRARIES= libcsoap-1.0.la
-libcsoap_1_0_la_SOURCES= $(h_sources) $(cc_sources)
-#libexamplelib_1_0_la_LIBADD= sub/libsub.la
-libcsoap_1_0_la_LDFLAGS= -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE) -L$(top_builddir)/nanohttp -lnanohttp-$(GENERIC_API_VERSION) $(LIBXML_LIBS)
-#libcsoap_1_0_la_CFLAGS= @LIBXML_CCFLAGS@
-
-
 
+lib_LTLIBRARIES=libcsoap.la
 
+libcsoap_ladir=$(includedir)/libcsoap-@csoap_release@/libcsoap
 
+libcsoap_la_SOURCES=soap-xml.c soap-fault.c soap-env.c soap-service.c    \
+                    soap-router.c soap-client.c soap-server.c soap-ctx.c
 
+libcsoap_la_HEADERS=soap-xml.h soap-fault.h soap-env.h soap-service.h    \
+                    soap-router.h soap-client.h soap-server.h soap-ctx.h
 
+libcsoap_la_LDFLAGS= -version-info @csoap_version@ -release @csoap_release@
 
diff --git a/nanohttp/Makefile.am b/nanohttp/Makefile.am
index 2ad1fb8..48f9364 100644
--- a/nanohttp/Makefile.am
+++ b/nanohttp/Makefile.am
@@ -1,46 +1,16 @@
-## Source directory
-
-	
-h_sources = nanohttp-common.h\
-nanohttp-socket.h\
-nanohttp-client.h\
-nanohttp-server.h\
-nanohttp-stream.h\
-nanohttp-mime.h\
-nanohttp-request.h\
-nanohttp-response.h\
-nanohttp-base64.h\
-nanohttp-ssl.h
-
-
-cc_sources = nanohttp-common.c\
-nanohttp-socket.c\
-nanohttp-client.c\
-nanohttp-server.c\
-nanohttp-stream.c\
-nanohttp-mime.c\
-nanohttp-request.c\
-nanohttp-response.c\
-nanohttp-base64.c\
-nanohttp-ssl.c
-
-
-
-library_includedir=$(includedir)/$(NANOHTTP_LIBRARY_NAME)-$(NANOHTTP_API_VERSION)/$(NANOHTTP_LIBRARY_NAME)
-library_include_HEADERS = $(h_sources)
-
-INCLUDES = -I$(top_srcdir) 
-
-# GENERIC_API_VERSION is 1.0
-lib_LTLIBRARIES= libnanohttp-1.0.la
-libnanohttp_1_0_la_SOURCES= $(h_sources) $(cc_sources)
-libnanohttp_1_0_la_LDFLAGS= -version-info $(NANOHTTP_LIBRARY_VERSION) -release $(NANOHTTP_RELEASE)
-
-
-
-
+lib_LTLIBRARIES=libnanohttp.la
 
+libnanohttp_ladir=$(includedir)/nanohttp-@nanohttp_release@/nanohttp
 
+libnanohttp_la_SOURCES=nanohttp-common.c nanohttp-socket.c nanohttp-client.c     \
+                           nanohttp-server.c nanohttp-stream.c nanohttp-mime.c   \
+                           nanohttp-request.c nanohttp-response.c                \
+                           nanohttp-base64.c nanohttp-ssl.c
 
+libnanohttp_la_HEADERS=nanohttp-common.h nanohttp-socket.h nanohttp-client.h     \
+                           nanohttp-server.h nanohttp-stream.h nanohttp-mime.h   \
+                           nanohttp-request.h nanohttp-response.h                \
+                           nanohttp-base64.h nanohttp-ssl.h
 
+libnanohttp_la_LDFLAGS= -version-info @nanohttp_version@ -release @nanohttp_release@