[Freeciv-Dev] (PR#15165) missing GGZ_GTK_INCLUDES
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
<URL: http://bugs.freeciv.org/Ticket/Display.html?id=15165 >
@GGZ_GTK_INCLUDES@ is missing from client/Makefile.am and
gui-gtk-2.0/Makefile.am. This patch adds it. I will commit immediately.
-jason
Index: client/gui-gtk-2.0/Makefile.am
===================================================================
--- client/gui-gtk-2.0/Makefile.am (revision 11437)
+++ client/gui-gtk-2.0/Makefile.am (working copy)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
noinst_LIBRARIES = libguiclient.a
-AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include
-I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore
-I../../intl -I$(srcdir)/../agents @CLIENT_CFLAGS@
+AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include
-I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore
-I../../intl -I$(srcdir)/../agents @CLIENT_CFLAGS@ @GGZ_GTK_INCLUDES@
## Above, note -I../../intl instead of -I$(top_srdir/intl) is deliberate.
# The AM_CPPFLAGS "-I." is so resources.c includes the locally generated
Index: client/Makefile.am
===================================================================
--- client/Makefile.am (revision 11437)
+++ client/Makefile.am (working copy)
@@ -118,7 +118,7 @@
bin_PROGRAMS = civclient
-AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/include
-I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I../intl
-I$(srcdir)/agents @SOUND_CFLAGS@ @LIBGGZ_INCLUDES@ @GGZMOD_INCLUDES@
+AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/include
-I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I../intl
-I$(srcdir)/agents @SOUND_CFLAGS@ @LIBGGZ_INCLUDES@ @GGZMOD_INCLUDES@
@GGZ_GTK_INCLUDES@
## Above, note -I../intl instead of -I$(top_srdir/intl) is deliberate.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Freeciv-Dev] (PR#15165) missing GGZ_GTK_INCLUDES,
Jason Short <=
|
|