diff --git a/src/Makefile.am b/src/Makefile.am
index a973fca0..d718dcdc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,12 +27,18 @@ TESTS =
 
 if ENABLE_SRC
 
-AM_CFLAGS = -Wall
 AM_CPPFLAGS = -Wall -I$(srcdir)/../lib/includes -I$(builddir)/../lib/includes \
-	@LIBSPDYLAY_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@ \
-	@LIBEVENT_OPENSSL_CFLAGS@ @DEFS@
-AM_LDFLAGS = @LIBSPDYLAY_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@ \
-	@LIBEVENT_OPENSSL_LIBS@ @SRC_LIBS@
+	@LIBSPDYLAY_CFLAGS@ \
+	@XML_CPPFLAGS@	\
+	@LIBEVENT_OPENSSL_CFLAGS@ \
+	@OPENSSL_CFLAGS@ \
+	@DEFS@
+AM_LDFLAGS = \
+	@LIBSPDYLAY_LIBS@ \
+	@XML_LIBS@ \
+	@LIBEVENT_OPENSSL_LIBS@ \
+	@OPENSSL_LIBS@ \
+	@SRC_LIBS@
 
 LDADD = $(top_builddir)/lib/libnghttp2.la