X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/313abcb87669a8fd631f331fc94f749b838f3710..af13a143c8bfcd713216b1382448174e21b9f278:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ff0b4a1..48398a6 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,22 +33,19 @@ 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 src/pnm.c
 lbximg_LDADD = liblbx.la libgnu.la $(LIBPNG_LIBS)
-lbximg_CFLAGS = $(LIBPNG_CFLAGS)
 $(lbximg_OBJECTS): $(gnulib_headers)
 
 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)
 
 .xml.c:
 	$(AM_V_GEN) printf '%s\n' $(*F) | sed -e 's/[^[:alnum:]]/_/g' \