X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/1d4e663a1c4d3ab14f20b576e71446412ca6f5dc..4e74df93acc6594cd8a212c30dc2b429520caef2:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0eaf49e..8cfec29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,8 @@ CLEANFILES         =
 MOSTLYCLEANFILES   =
 noinst_LTLIBRARIES =
 
-AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
+AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/src
+AM_CFLAGS = $(LIBPNG_CFLAGS) $(GTK_CFLAGS)
 
 dist_man_MANS = doc/man/lbxtool.1 doc/man/lbximg.1
 dist_doc_DATA = doc/txt/moo2-data.txt
@@ -32,30 +33,30 @@ if BUILD_LBXGUI
 bin_PROGRAMS += lbxgui
 endif
 
-lbxtool_SOURCES = src/lbxtool.c
+lbxtool_SOURCES = src/lbxtool.c src/tools.c
 lbxtool_LDADD = liblbx.la libgnu.la
 $(lbxtool_OBJECTS): $(gnulib_headers)
 
-lbximg_SOURCES = src/lbximg.c
+lbximg_SOURCES = src/lbximg.c src/tools.c src/png.c
 lbximg_LDADD = liblbx.la libgnu.la $(LIBPNG_LIBS)
-lbximg_CFLAGS = $(LIBPNG_CFLAGS)
 $(lbximg_OBJECTS): $(gnulib_headers)
 
-nodist_lbxgui_SOURCES = src/gui/lbxgui_xml.c
+nodist_lbxgui_SOURCES = src/gui/lbxgui.glade.c
 lbxgui_SOURCES = src/gui/lbxgui.c src/gui/render.c src/gui/render.h \
 	src/gui/bg.xbm
-lbxgui_LDADD = liblbx.la $(GTK_LIBS)
-lbxgui_CPPFLAGS = -I$(top_srcdir)/src
-lbxgui_CFLAGS = $(GTK_CFLAGS)
 lbxgui_LDFLAGS = $(AM_LDFLAGS) -export-dynamic
+lbxgui_LDADD = liblbx.la $(GTK_LIBS)
 
-src/gui/lbxgui_xml.c: src/gui/lbxgui.glade
-	$(AM_V_GEN) sed -e 's/"/\\"/g' \
-	                -e 's/.*/"&"/' \
-	                -e '1 s/^/char lbxgui_xml[] =\n/' \
-	                -e '$$ s/$$/;/' $? > $@
-
-CLEANFILES += src/gui/lbxgui_xml.c
-EXTRA_DIST += src/gui/lbxgui.glade
+.xml.c:
+	$(AM_V_GEN) printf '%s\n' $(*F) | sed -e 's/[^[:alnum:]]/_/g' \
+		-e 's/.*/const char &[] =/' > $@.tmp
+	$(AM_V_at) sed -e 's/\\/\\\\/g' \
+		-e 's/"/\\"/g' \
+		-e 's/.*/"&\\n"/' \
+		-e '$$ s/$$/;/' $< >> $@.tmp
+	$(AM_V_at) mv -f $@.tmp $@
+
+EXTRA_DIST += src/gui/lbxgui.glade.xml
+CLEANFILES += src/gui/lbxgui.glade.c
 
 include lib/gnulib.mk