X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=4f05a5b66399fafee9d1302171863ddf4398abe1;hb=24aef54d7203143092c9a7c91096c54494590851;hp=e67e206a558a29984e6b1a0b1b152707005cda7a;hpb=3c678195610789166e1133575789f25da8f1a291;p=rodin%2Fchimara.git

diff --git a/src/Makefile.am b/src/Makefile.am
index e67e206..4f05a5b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+AM_CFLAGS = -Wall
+
 data_DATA = chimara.ui
 
 noinst_PROGRAMS = test-chimara
@@ -9,7 +11,7 @@ test_chimara_CPPFLAGS = \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\"
-test_chimara_CFLAGS = @TEST_CFLAGS@
+test_chimara_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
 test_chimara_LDADD = @TEST_LIBS@ -lchimara
 
 lib_LTLIBRARIES = libchimara.la
@@ -23,27 +25,38 @@ libchimara_la_SOURCES = \
 	fileref.c fileref.h \
 	gestalt.c \
 	glk.c glk.h \
+	magic.c magic.h \
 	input.c input.h \
 	stream.c stream.h \
 	strio.c \
 	style.c \
 	window.c window.h 
-libchimara_la_CFLAGS = @CHIMARA_CFLAGS@ 
+libchimara_la_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Chimara\"
+libchimara_la_CFLAGS = @CHIMARA_CFLAGS@ $(AM_CFLAGS)
 libchimara_la_LIBADD = @CHIMARA_LIBS@
-libchimara_la_LDFLAGS = -no-undefined -export-symbols-regex "^chimara_glk_|^glk_"
+libchimara_la_LDFLAGS = -no-undefined -export-symbols-regex "^(chimara_)?glk_"
 libchimara_includedir = $(includedir)/chimara/chimara
 libchimara_include_HEADERS = chimara-glk.h
 
-PLUGIN_LDFLAGS = -module -shared -avoid-version -export-symbols-regex "^glk_main$$"
-noinst_LTLIBRARIES = first.la model.la gridtest.la splittest.la
+pkglib_LTLIBRARIES = first.la model.la gridtest.la splittest.la
+PLUGIN_LIBTOOL_FLAGS=-module -avoid-version -export-symbols-regex "^glk_main$$"
+
 first_la_SOURCES = first.c
-first_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+first_la_CFLAGS = @GLIB_CFLAGS@
+first_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+
 model_la_SOURCES = model.c
-model_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+model_la_CFLAGS = @GLIB_CFLAGS@
+model_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+
 gridtest_la_SOURCES = gridtest.c
-gridtest_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+gridtest_la_CFLAGS = @GLIB_CFLAGS@
+gridtest_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+
 splittest_la_SOURCES = splittest.c
-splittest_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+splittest_la_CFLAGS = @GLIB_CFLAGS@
+splittest_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 
 CLEANFILES = chimara.ui