5 files changed, 17 insertions, 13 deletions

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 4cfc7be7..e4335985 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -6,11 +6,12 @@ endif
 
 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 @@ noinst_PROGRAMS += simplepost largepost sessions
 endif
 
 if HAVE_W32
-AM_CFLAGS = -DWINDOWS
+AM_CPPFLAGS += -DWINDOWS
 endif
 
 basicauthentication_SOURCES = \
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 5f6a3e2e..f5fd2be0 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -7,9 +7,9 @@ endif
 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
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index 02153a06..35ab6021 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -5,8 +5,9 @@ endif
 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 @@ libmicrohttpd_la_LDFLAGS = \
   -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@
 
 if USE_COVERAGE
-  AM_CFLAGS = --coverage
+  AM_CFLAGS += --coverage
 endif
 
 if !HAVE_TSEARCH
diff --git a/src/microspdy/Makefile.am b/src/microspdy/Makefile.am
index 52929ee2..1af67a0d 100644
--- a/src/microspdy/Makefile.am
+++ b/src/microspdy/Makefile.am
@@ -5,8 +5,9 @@ endif
 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 = \
@@ -38,5 +39,5 @@ libmicrospdy_la_CFLAGS = -Wextra \
 
 
 if USE_COVERAGE
-  AM_CFLAGS = --coverage
+  AM_CFLAGS += --coverage
 endif
diff --git a/src/spdy2http/Makefile.am b/src/spdy2http/Makefile.am
index 475bcbfe..8b83ee91 100644
--- a/src/spdy2http/Makefile.am
+++ b/src/spdy2http/Makefile.am
@@ -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 @@ AM_CPPFLAGS = \
  -I$(top_srcdir) \
  -I$(top_srcdir)/src/include \
  -I$(top_srcdir)/src/applicationlayer \
+ -DDATA_DIR=\"$(top_srcdir)/src/datadir/\" \
 $(LIBCURL_CPPFLAGS)
 
 if !HAVE_W32