From 0db2e8f1a55ff385e5fea5f218b77f39374bd427 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Sat, 23 Mar 2013 13:12:30 -0400
Subject: [PATCH] build: Remove use of per-target CFLAGS.

These are not necessary, and result in ugly object file names for no
reason.
---
 Makefile.am      | 8 +++-----
 src/gui/render.c | 2 ++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ff0b4a1..9c16381 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
@@ -38,16 +39,13 @@ $(lbxtool_OBJECTS): $(gnulib_headers)
 
 lbximg_SOURCES = src/lbximg.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' \
diff --git a/src/gui/render.c b/src/gui/render.c
index c2101b5..e30e6c8 100644
--- a/src/gui/render.c
+++ b/src/gui/render.c
@@ -16,6 +16,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include <config.h>
 #include <assert.h>
 #include <gtk/gtk.h>
 
-- 
2.43.0