[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32485 - in libmicrohttpd: . src/examples src/microhttpd sr
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32485 - in libmicrohttpd: . src/examples src/microhttpd src/testcurl src/testcurl/https |
Date: |
Wed, 26 Feb 2014 18:55:27 +0100 |
Author: Karlson2k
Date: 2014-02-26 18:55:27 +0100 (Wed, 26 Feb 2014)
New Revision: 32485
Modified:
libmicrohttpd/configure.ac
libmicrohttpd/src/examples/Makefile.am
libmicrohttpd/src/microhttpd/Makefile.am
libmicrohttpd/src/testcurl/Makefile.am
libmicrohttpd/src/testcurl/https/Makefile.am
Log:
Remove global dependency on PTHREAD_LIBS and use it only where it's required
Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac 2014-02-26 17:55:13 UTC (rev 32484)
+++ libmicrohttpd/configure.ac 2014-02-26 17:55:27 UTC (rev 32485)
@@ -82,8 +82,6 @@
AC_CONFIG_FILES([src/microhttpd/microhttpd_dll_res.rc])
AX_PTHREAD(,[AC_MSG_ERROR([[Compiling libmicrohttpd requires pthread
support]])])
-LIBS="$PTHREAD_LIBS $LIBS"
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"
# set GCC options
Modified: libmicrohttpd/src/examples/Makefile.am
===================================================================
--- libmicrohttpd/src/examples/Makefile.am 2014-02-26 17:55:13 UTC (rev
32484)
+++ libmicrohttpd/src/examples/Makefile.am 2014-02-26 17:55:27 UTC (rev
32485)
@@ -42,10 +42,10 @@
endif
if HAVE_POSTPROCESSOR
noinst_PROGRAMS += \
- post_example
+ post_example
if HAVE_MAGIC
bin_PROGRAMS = \
- demo
+ demo
endif
endif
@@ -69,10 +69,12 @@
$(top_builddir)/src/microhttpd/libmicrohttpd.la
demo_SOURCES = \
- demo.c
+ demo.c
+demo_CFLAGS = \
+ $(PTHREAD_CFLAGS) $(AM_CFLAGS)
demo_LDADD = \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- -lmagic
+ $(PTHREAD_LIBS) -lmagic
mhd2spdy_SOURCES = \
mhd2spdy.c \
Modified: libmicrohttpd/src/microhttpd/Makefile.am
===================================================================
--- libmicrohttpd/src/microhttpd/Makefile.am 2014-02-26 17:55:13 UTC (rev
32484)
+++ libmicrohttpd/src/microhttpd/Makefile.am 2014-02-26 17:55:27 UTC (rev
32485)
@@ -66,12 +66,14 @@
libmicrohttpd_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DBUILDING_MHD_LIB=1
+libmicrohttpd_la_CFLAGS = \
+ $(PTHREAD_CFLAGS) $(AM_CFLAGS)
libmicrohttpd_la_LDFLAGS = \
$(MHD_LIB_LDFLAGS) \
$(W32_MHD_LIB_LDFLAGS) \
-version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@
libmicrohttpd_la_LIBADD = \
- $(MHD_W32_LIB)
+ $(MHD_W32_LIB) $(PTHREAD_LIBS)
if HAVE_W32
MHD_DLL_RES_SRC = microhttpd_dll_res.rc
Modified: libmicrohttpd/src/testcurl/Makefile.am
===================================================================
--- libmicrohttpd/src/testcurl/Makefile.am 2014-02-26 17:55:13 UTC (rev
32484)
+++ libmicrohttpd/src/testcurl/Makefile.am 2014-02-26 17:55:27 UTC (rev
32485)
@@ -93,9 +93,11 @@
test_quiesce_SOURCES = \
test_quiesce.c
+test_quiesce_CFLAGS = \
+ $(PTHREAD_CFLAGS) $(AM_CFLAGS)
test_quiesce_LDADD = \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- @LIBCURL@
+ $(PTHREAD_LIBS) @LIBCURL@
test_callback_SOURCES = \
test_callback.c
Modified: libmicrohttpd/src/testcurl/https/Makefile.am
===================================================================
--- libmicrohttpd/src/testcurl/https/Makefile.am 2014-02-26 17:55:13 UTC
(rev 32484)
+++ libmicrohttpd/src/testcurl/https/Makefile.am 2014-02-26 17:55:27 UTC
(rev 32485)
@@ -59,10 +59,12 @@
test_https_get_parallel_SOURCES = \
test_https_get_parallel.c \
tls_test_common.c
+test_https_get_parallel_CFLAGS = \
+ $(PTHREAD_CFLAGS) $(AM_CFLAGS)
test_https_get_parallel_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
+ $(PTHREAD_LIBS) @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
test_empty_response_SOURCES = \
test_empty_response.c \
@@ -75,10 +77,12 @@
test_https_get_parallel_threads_SOURCES = \
test_https_get_parallel_threads.c \
tls_test_common.c
+test_https_get_parallel_threads_CFLAGS = \
+ $(PTHREAD_CFLAGS) $(AM_CFLAGS)
test_https_get_parallel_threads_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
- @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
+ $(PTHREAD_LIBS) @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
test_tls_authentication_SOURCES = \
test_tls_authentication.c \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32485 - in libmicrohttpd: . src/examples src/microhttpd src/testcurl src/testcurl/https,
gnunet <=