[GNUnet-SVN] r32383 - in libmicrohttpd: doc/examples src/examples src/microhttpd src/microspdy src/spdy2http

[gnunet]

Author: grothoff
Date: 2014-02-18 08:09:20 +0100 (Tue, 18 Feb 2014)
New Revision: 32383

Modified:
   libmicrohttpd/doc/examples/Makefile.am
   libmicrohttpd/src/examples/Makefile.am
   libmicrohttpd/src/microhttpd/Makefile.am
   libmicrohttpd/src/microspdy/Makefile.am
   libmicrohttpd/src/spdy2http/Makefile.am
Log:
Karlson2k: fix AM_CPPFLAGS vs AM_CFLAGS usage


Modified: libmicrohttpd/doc/examples/Makefile.am
===================================================================
--- libmicrohttpd/doc/examples/Makefile.am      2014-02-17 16:56:05 UTC (rev 
32382)
+++ libmicrohttpd/doc/examples/Makefile.am      2014-02-18 07:09:20 UTC (rev 
32383)
@@ -6,11 +6,12 @@
 
 AM_CPPFLAGS = \
   $(PLIBC_INCLUDE) \
-  -I$(top_srcdir)/src/include \
-  @LIBGCRYPT_CFLAGS@
+  -I$(top_srcdir)/src/include
 
+AM_CFLAGS = @LIBGCRYPT_CFLAGS@
+
 if USE_COVERAGE
-  AM_CFLAGS = --coverage
+  AM_CFLAGS += --coverage
 endif
 
 # example programs
@@ -29,7 +30,7 @@
 endif
 
 if HAVE_W32
-AM_CFLAGS = -DWINDOWS
+AM_CPPFLAGS += -DWINDOWS
 endif
 
 basicauthentication_SOURCES = \

Modified: libmicrohttpd/src/examples/Makefile.am
===================================================================
--- libmicrohttpd/src/examples/Makefile.am      2014-02-17 16:56:05 UTC (rev 
32382)
+++ libmicrohttpd/src/examples/Makefile.am      2014-02-18 07:09:20 UTC (rev 
32383)
@@ -7,9 +7,9 @@
 AM_CPPFLAGS = \
   $(PLIBC_INCLUDE) \
   -I$(top_srcdir)/src/include \
-  @LIBGCRYPT_CFLAGS@
+  -DDATA_DIR=\"$(top_srcdir)/src/datadir/\"
 
-AM_CFLAGS = -DDATA_DIR=\"$(top_srcdir)/src/datadir/\"
+AM_CFLAGS = @LIBGCRYPT_CFLAGS@
 
 if USE_COVERAGE
   AM_CFLAGS += --coverage

Modified: libmicrohttpd/src/microhttpd/Makefile.am
===================================================================
--- libmicrohttpd/src/microhttpd/Makefile.am    2014-02-17 16:56:05 UTC (rev 
32382)
+++ libmicrohttpd/src/microhttpd/Makefile.am    2014-02-18 07:09:20 UTC (rev 
32383)
@@ -5,8 +5,9 @@
 AM_CPPFLAGS = \
   $(PLIBC_INCLUDE) \
   -I$(top_srcdir)/src/include \
-  -I$(top_srcdir)/src/microhttpd \
-  $(HIDDEN_VISIBILITY_CFLAGS) \
+  -I$(top_srcdir)/src/microhttpd
+
+AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS) \
   @LIBGCRYPT_CFLAGS@
 
 lib_LTLIBRARIES = \
@@ -28,7 +29,7 @@
   -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@
 
 if USE_COVERAGE
-  AM_CFLAGS = --coverage
+  AM_CFLAGS += --coverage
 endif
 
 if !HAVE_TSEARCH

Modified: libmicrohttpd/src/microspdy/Makefile.am
===================================================================
--- libmicrohttpd/src/microspdy/Makefile.am     2014-02-17 16:56:05 UTC (rev 
32382)
+++ libmicrohttpd/src/microspdy/Makefile.am     2014-02-18 07:09:20 UTC (rev 
32383)
@@ -5,10 +5,11 @@
 AM_CPPFLAGS = \
   $(PLIBC_INCLUDE) \
   -I$(top_srcdir)/src/include \
-  -I$(top_srcdir)/src/microspdy \
-  $(HIDDEN_VISIBILITY_CFLAGS)
+  -I$(top_srcdir)/src/microspdy
 
+AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS)
 
+
 lib_LTLIBRARIES = \
   libmicrospdy.la
 
@@ -38,5 +39,5 @@
 
 
 if USE_COVERAGE
-  AM_CFLAGS = --coverage
+  AM_CFLAGS += --coverage
 endif

Modified: libmicrohttpd/src/spdy2http/Makefile.am
===================================================================
--- libmicrohttpd/src/spdy2http/Makefile.am     2014-02-17 16:56:05 UTC (rev 
32382)
+++ libmicrohttpd/src/spdy2http/Makefile.am     2014-02-18 07:09:20 UTC (rev 
32383)
@@ -1,6 +1,6 @@
 SUBDIRS  = .
 
-AM_CFLAGS = -DDATA_DIR=\"$(top_srcdir)/src/datadir/\"
+AM_CFLAGS =
 
 if USE_COVERAGE
   AM_CFLAGS += -fprofile-arcs -ftest-coverage
@@ -15,6 +15,7 @@
  -I$(top_srcdir) \
  -I$(top_srcdir)/src/include \
  -I$(top_srcdir)/src/applicationlayer \
+ -DDATA_DIR=\"$(top_srcdir)/src/datadir/\" \
 $(LIBCURL_CPPFLAGS)
 
 if !HAVE_W32