build: Remove use of per-target CFLAGS.

These are not necessary, and result in ugly object file names for no
reason.

diff --git a/Makefile.am b/Makefile.am
index ff0b4a124020fe91da3ba2c1d4dd1f633ae6c18a..9c16381a1984877917ca805205cbbbeefab90c34 100644 (file)
--- 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 c2101b53a415df4b4554144787caabef61e91b24..e30e6c845623feb011fb8397ce05bb80807a6434 100644 (file)
--- 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>