Merge branch '1.3'

[jansson.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index cb9180e..635176e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-include_HEADERS = jansson.h
+include_HEADERS = jansson.h jansson_config.h
 
 lib_LTLIBRARIES = libjansson.la
 libjansson_la_SOURCES = \
@@ -11,10 +11,12 @@ libjansson_la_SOURCES = \
        strbuffer.h \
        utf.c \
        utf.h \
-       util.h \
        value.c
 libjansson_la_LDFLAGS = \
        -export-symbols-regex '^json_' \
        -version-info 3:0:3
 
+if GCC
+# These flags are gcc specific
 AM_CFLAGS = -Wall -Wextra -Werror
+endif