[GNUnet-SVN] r18258 - in libmwmodem: . src/main

[gnunet]

Author: ruppa
Date: 2011-11-22 16:10:15 +0100 (Tue, 22 Nov 2011)
New Revision: 18258

Added:
   libmwmodem/configure.ac
Modified:
   libmwmodem/libmwmodem.pc.in
   libmwmodem/src/main/Makefile.am
Log:


Added: libmwmodem/configure.ac
===================================================================
--- libmwmodem/configure.ac                             (rev 0)
+++ libmwmodem/configure.ac     2011-11-22 15:10:15 UTC (rev 18258)
@@ -0,0 +1,4 @@
+AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
+
+
+AC_OUTPUT
\ No newline at end of file

Modified: libmwmodem/libmwmodem.pc.in
===================================================================
--- libmwmodem/libmwmodem.pc.in 2011-11-22 14:24:35 UTC (rev 18257)
+++ libmwmodem/libmwmodem.pc.in 2011-11-22 15:10:15 UTC (rev 18258)
@@ -8,6 +8,6 @@
 Version: @VERSION@
 Requires:
 Conflicts:
-Libs: -L${libdir} -lmwmodem
+Libs: -L${libdir} -libmwmodem
 Libs.private: @MHD_LIBDEPS@
 Cflags: -I${includedir}

Modified: libmwmodem/src/main/Makefile.am
===================================================================
--- libmwmodem/src/main/Makefile.am     2011-11-22 14:24:35 UTC (rev 18257)
+++ libmwmodem/src/main/Makefile.am     2011-11-22 15:10:15 UTC (rev 18258)
@@ -1,59 +1,26 @@
 AM_CPPFLAGS = \
   $(PLIBC_INCLUDE) \
   -I$(top_srcdir)/src/include \
-  -I$(top_srcdir)/src/daemon \
+  -I$(top_srcdir)/src/main \
   @LIBGCRYPT_CFLAGS@ 
 
 lib_LTLIBRARIES = \
   libmwmodem.la
 
 
-libmicrohttpd_la_SOURCES = \
-  libmwmode.c libmwmodem.h 
-libmicrohttpd_la_LDFLAGS = \
-  $(MHD_LIB_LDFLAGS) \
-  -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@
+libmwmodem_la_SOURCES = \
+  libmwmodem.c libmwmodem.h 
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage
 endif
 
-if HAVE_POSTPROCESSOR
-libmicrohttpd_la_SOURCES += \
-  postprocessor.c
-endif
-
-if ENABLE_DAUTH
-libmicrohttpd_la_SOURCES += \
-  digestauth.c \
-  md5.c md5.h \
-  base64.c base64.h
-endif
-
-if ENABLE_HTTPS
-libmicrohttpd_la_SOURCES += \
-  connection_https.c connection_https.h
-libmicrohttpd_la_LIBADD = -lgnutls @LIBGCRYPT_LIBS@
-endif
-
 check_PROGRAMS = \
-  postprocessor_test \
-  postprocessor_large_test \
   daemon_test 
 
 TESTS = $(check_PROGRAMS)
 
-daemon_test_SOURCES = \
-  daemon_test.c
+libmwmodem_test_SOURCES = \
+  libmwmodem_test.c
 daemon_test_LDADD = \
-  $(top_builddir)/src/daemon/libmicrohttpd.la 
-
-postprocessor_test_SOURCES = \
-  postprocessor_test.c
-postprocessor_test_LDADD = \
-  $(top_builddir)/src/daemon/libmicrohttpd.la 
-
-postprocessor_large_test_SOURCES = \
-  postprocessor_large_test.c
-postprocessor_large_test_LDADD = \
-  $(top_builddir)/src/daemon/libmicrohttpd.la 
+  $(top_builddir)/src/main/libmwmodem.la