Merge branch '1.3'

[jansson.git] / src / Makefile.am

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