From: fliep <fliep@ddfedd41-794f-dd11-ae45-00112f111e67>
Date: Sun, 29 Mar 2009 15:06:30 +0000 (+0000)
Subject: Automake tweaking
X-Git-Tag: v0.9~431
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=bf197c155b969096a5ee168d36c74c5bc9abbb97;p=projects%2Fchimara%2Fchimara.git

Automake tweaking
---

diff --git a/.svnignore b/.svnignore
index 373f5a2..374828c 100644
--- a/.svnignore
+++ b/.svnignore
@@ -2,6 +2,7 @@ aclocal.m4
 autom4te.cache
 bugreports
 chimara.anjuta
+compile
 config.*
 configure
 depcomp
diff --git a/configure.ac b/configure.ac
index f084467..1e49440 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,7 @@ AM_INIT_AUTOMAKE([-Wall])
 ### DECLARE PROGRAMS ##########################################################
 
 AC_PROG_CC                 # C compiler
+AM_PROG_CC_C_O             # Automake requires this for per-target CFLAGS
 AC_PROG_INSTALL            # Install
 LT_INIT                    # Libtool
 AC_PROG_LIBTOOL            # Old way of declaring Libtool
diff --git a/src/Makefile.am b/src/Makefile.am
index b504287..e67e206 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,22 +1,15 @@
 ## Process this file with automake to produce Makefile.in
 
-## Created by Anjuta
-
 data_DATA = chimara.ui
 
-AM_CPPFLAGS = \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-	@CHIMARA_CFLAGS@
-
-AM_CFLAGS =\
-	 -Wall\
-	 -g
-
 noinst_PROGRAMS = test-chimara
 
 test_chimara_SOURCES = main.c callbacks.c callbacks.h error.c error.h
+test_chimara_CPPFLAGS = \
+	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
+	-DPACKAGE_DATA_DIR=\""$(datadir)"\"
+test_chimara_CFLAGS = @TEST_CFLAGS@
 test_chimara_LDADD = @TEST_LIBS@ -lchimara
 
 lib_LTLIBRARIES = libchimara.la
@@ -35,14 +28,14 @@ libchimara_la_SOURCES = \
 	strio.c \
 	style.c \
 	window.c window.h 
-
+libchimara_la_CFLAGS = @CHIMARA_CFLAGS@ 
 libchimara_la_LIBADD = @CHIMARA_LIBS@
 libchimara_la_LDFLAGS = -no-undefined -export-symbols-regex "^chimara_glk_|^glk_"
 libchimara_includedir = $(includedir)/chimara/chimara
 libchimara_include_HEADERS = chimara-glk.h
 
 PLUGIN_LDFLAGS = -module -shared -avoid-version -export-symbols-regex "^glk_main$$"
-pkglib_LTLIBRARIES = first.la model.la gridtest.la splittest.la
+noinst_LTLIBRARIES = first.la model.la gridtest.la splittest.la
 first_la_SOURCES = first.c
 first_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 model_la_SOURCES = model.c
@@ -57,4 +50,4 @@ CLEANFILES = chimara.ui
 chimara.ui: chimara.glade
 	gtk-builder-convert $< $@
 
-EXTRA_DIST = chimara.glade
+EXTRA_DIST = doc.c chimara.glade