[Freeciv-Dev] (PR#9698) [Patch] Replace INCLUDES with AM_CPPFLAGS
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
|
To: |
undisclosed-recipients: ; |
|
Subject: |
[Freeciv-Dev] (PR#9698) [Patch] Replace INCLUDES with AM_CPPFLAGS |
|
From: |
"Marko Lindqvist" <marko.lindqvist@xxxxxxxxxxx> |
|
Date: |
Fri, 13 Aug 2004 14:42:47 -0700 |
|
Reply-to: |
rt@xxxxxxxxxxx |
<URL: http://rt.freeciv.org/Ticket/Display.html?id=9698 >
For some time now (since version 1.3?) automake macro AM_CPPFLAGS is
preferred over obsolete INCLUDES. Not a big deal, but since it takes
just a one-liner to fix...
find . -name Makefile.am | ( while read FILEPATH ; do sed
"s/INCLUDES/AM_CPPFLAGS/" $FILEPATH > $FILEPATH.new ; mv $FILEPATH.new
$FILEPATH ; done )
- Caz
diff -Nurd freeciv/ai/Makefile.am freeciv/ai/Makefile.am
--- freeciv/ai/Makefile.am 2004-08-13 21:31:23.687500000 +0300
+++ freeciv/ai/Makefile.am 2004-08-14 00:27:22.046875000 +0300
@@ -2,7 +2,7 @@
noinst_LIBRARIES = libcivai.a
-INCLUDES = -I$(top_srcdir)/utility -I$(srcdir)/../common -I$(srcdir)/../server
-I../intl -I$(top_srcdir)/common/aicore
+AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/../common
-I$(srcdir)/../server -I../intl -I$(top_srcdir)/common/aicore
## Above, note -I../intl instead of -I$(top_srdir/intl) is deliberate.
diff -Nurd freeciv/client/Makefile.am freeciv/client/Makefile.am
--- freeciv/client/Makefile.am 2004-08-13 21:31:38.281250000 +0300
+++ freeciv/client/Makefile.am 2004-08-14 00:27:22.656250000 +0300
@@ -138,7 +138,7 @@
bin_PROGRAMS = civclient
-INCLUDES = -I$(top_srcdir)/utility -I$(srcdir)/include -I$(top_srcdir)/common
-I$(top_srcdir)/common/aicore -I../intl -I$(srcdir)/agents @SOUND_CFLAGS@
+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@
## Above, note -I../intl instead of -I$(top_srdir/intl) is deliberate.
diff -Nurd freeciv/client/agents/Makefile.am freeciv/client/agents/Makefile.am
--- freeciv/client/agents/Makefile.am 2004-08-13 21:31:24.015625000 +0300
+++ freeciv/client/agents/Makefile.am 2004-08-14 00:27:22.093750000 +0300
@@ -2,7 +2,7 @@
noinst_LIBRARIES = libagents.a
-INCLUDES = -I. -I$(srcdir)/.. -I$(top_srcdir)/common/aicore
-I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common
-I../../intl -I$(srcdir)/../gui-gtk @CLIENT_CFLAGS@
+AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(top_srcdir)/common/aicore
-I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common
-I../../intl -I$(srcdir)/../gui-gtk @CLIENT_CFLAGS@
libagents_a_SOURCES = \
agents.c \
diff -Nurd freeciv/client/gui-ftwl/Makefile.am
freeciv/client/gui-ftwl/Makefile.am
--- freeciv/client/gui-ftwl/Makefile.am 2004-08-13 21:31:25.015625000 +0300
+++ freeciv/client/gui-ftwl/Makefile.am 2004-08-14 00:27:22.140625000 +0300
@@ -3,7 +3,7 @@
SUBDIRS =
noinst_LIBRARIES = libguiclient.a
-INCLUDES = -I. -I$(top_srcdir)/utility -I$(top_srcdir)/utility/ftwl
-I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/common -I../../intl
@CLIENT_CFLAGS@
+AM_CPPFLAGS = -I. -I$(top_srcdir)/utility -I$(top_srcdir)/utility/ftwl
-I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/common -I../../intl
@CLIENT_CFLAGS@
## Above, note -I../../intl instead of -I$(top_srdir)/intl is deliberate.
diff -Nurd freeciv/client/gui-gtk/Makefile.am freeciv/client/gui-gtk/Makefile.am
--- freeciv/client/gui-gtk/Makefile.am 2004-08-13 21:31:26.296875000 +0300
+++ freeciv/client/gui-gtk/Makefile.am 2004-08-14 00:27:22.218750000 +0300
@@ -1,10 +1,10 @@
## Process this file with automake to produce Makefile.in
noinst_LIBRARIES = libguiclient.a
-INCLUDES = -I. -I$(srcdir)/.. -I$(top_srcdir)/utility -I$(srcdir)/../include
-I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I../../intl
-I$(srcdir)/../agents @CLIENT_CFLAGS@
+AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(top_srcdir)/utility
-I$(srcdir)/../include -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore
-I../../intl -I$(srcdir)/../agents @CLIENT_CFLAGS@
## Above, note -I../../intl instead of -I$(top_srdir/intl) is deliberate.
-# The INCLUDES "-I." is so resources.c includes the locally generated
+# The AM_CPPFLAGS "-I." is so resources.c includes the locally generated
# Freeciv.h in the compilation dir, in preference to the one
# in the source dir (when compiling from another dir). --dwp
diff -Nurd freeciv/client/gui-gtk-2.0/Makefile.am
freeciv/client/gui-gtk-2.0/Makefile.am
--- freeciv/client/gui-gtk-2.0/Makefile.am 2004-08-13 21:31:27.796875000
+0300
+++ freeciv/client/gui-gtk-2.0/Makefile.am 2004-08-14 00:27:22.265625000
+0300
@@ -1,10 +1,10 @@
## Process this file with automake to produce Makefile.in
noinst_LIBRARIES = libguiclient.a
-INCLUDES = -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@
## Above, note -I../../intl instead of -I$(top_srdir/intl) is deliberate.
-# The INCLUDES "-I." is so resources.c includes the locally generated
+# The AM_CPPFLAGS "-I." is so resources.c includes the locally generated
# Freeciv.h in the compilation dir, in preference to the one
# in the source dir (when compiling from another dir). --dwp
diff -Nurd freeciv/client/gui-sdl/Makefile.am freeciv/client/gui-sdl/Makefile.am
--- freeciv/client/gui-sdl/Makefile.am 2004-08-13 21:31:31.703125000 +0300
+++ freeciv/client/gui-sdl/Makefile.am 2004-08-14 00:27:22.312500000 +0300
@@ -1,10 +1,10 @@
## Process this file with automake to produce Makefile.in
noinst_LIBRARIES = libguiclient.a
-INCLUDES = -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@
## Above, note -I../../intl instead of -I$(top_srdir/intl) is deliberate.
-# The INCLUDES "-I." is so resources.c includes the locally generated
+# The AM_CPPFLAGS "-I." is so resources.c includes the locally generated
# Freeciv.h in the compilation dir, in preference to the one
# in the source dir (when compiling from another dir). --dwp
diff -Nurd freeciv/client/gui-stub/Makefile.am
freeciv/client/gui-stub/Makefile.am
--- freeciv/client/gui-stub/Makefile.am 2004-08-13 21:31:33.531250000 +0300
+++ freeciv/client/gui-stub/Makefile.am 2004-08-14 00:27:22.390625000 +0300
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
noinst_LIBRARIES = libguiclient.a
-INCLUDES = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility
-I$(top_srcdir)/common -I../../intl @CLIENT_CFLAGS@
+AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include
-I$(top_srcdir)/utility -I$(top_srcdir)/common -I../../intl @CLIENT_CFLAGS@
## Above, note -I../../intl instead of -I$(top_srdir)/intl is deliberate.
diff -Nurd freeciv/client/gui-win32/Makefile.am
freeciv/client/gui-win32/Makefile.am
--- freeciv/client/gui-win32/Makefile.am 2004-08-13 21:31:35.218750000
+0300
+++ freeciv/client/gui-win32/Makefile.am 2004-08-14 00:27:22.437500000
+0300
@@ -2,7 +2,7 @@
noinst_LIBRARIES = libguiclient.a
-INCLUDES = -I. -I$(srcdir)/.. -I$(srcdir)/../agents -I$(top_srcdir)/utility
-I$(srcdir)/../include -I$(top_srcdir)/common/aicore -I$(top_srcdir)/common
-I../../intl @CLIENT_CFLAGS@
+AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../agents -I$(top_srcdir)/utility
-I$(srcdir)/../include -I$(top_srcdir)/common/aicore -I$(top_srcdir)/common
-I../../intl @CLIENT_CFLAGS@
## Above, note -I../../intl instead of -I$(top_srdir)/intl is deliberate.
diff -Nurd freeciv/client/gui-xaw/Makefile.am freeciv/client/gui-xaw/Makefile.am
--- freeciv/client/gui-xaw/Makefile.am 2004-08-13 21:31:36.937500000 +0300
+++ freeciv/client/gui-xaw/Makefile.am 2004-08-14 00:27:22.546875000 +0300
@@ -1,10 +1,10 @@
## Process this file with automake to produce Makefile.in
noinst_LIBRARIES = libguiclient.a
-INCLUDES = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility
-I$(top_srcdir)/common -I../../intl -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../../intl
-I$(top_srcdir)/common/aicore -I../../intl -I$(srcdir)/../agents @CLIENT_CFLAGS@
## Above, note -I../../intl instead of -I$(top_srdir/intl) is deliberate.
-# The INCLUDES "-I." is so resources.c includes the locally generated
+# The AM_CPPFLAGS "-I." is so resources.c includes the locally generated
# Freeciv.h in the compliation dir, in preference to the one
# in the source dir (when compiling from another dir). --dwp
diff -Nurd freeciv/common/Makefile.am freeciv/common/Makefile.am
--- freeciv/common/Makefile.am 2004-08-13 21:31:41.046875000 +0300
+++ freeciv/common/Makefile.am 2004-08-14 00:27:22.765625000 +0300
@@ -4,7 +4,7 @@
noinst_LIBRARIES = libcivcommon.a
-INCLUDES = -I../intl -I$(top_srcdir)/utility -I$(srcdir)/aicore
+AM_CPPFLAGS = -I../intl -I$(top_srcdir)/utility -I$(srcdir)/aicore
## Above, note -I../intl instead of -I$(top_srcdir/intl) is deliberate.
diff -Nurd freeciv/common/aicore/Makefile.am freeciv/common/aicore/Makefile.am
--- freeciv/common/aicore/Makefile.am 2004-08-13 21:31:39.515625000 +0300
+++ freeciv/common/aicore/Makefile.am 2004-08-14 00:27:22.718750000 +0300
@@ -2,7 +2,7 @@
noinst_LIBRARIES = libaicore.a
-INCLUDES = -I$(top_srcdir)/utility -I.. -I$(top_srcdir)/common -I../../intl
+AM_CPPFLAGS = -I$(top_srcdir)/utility -I.. -I$(top_srcdir)/common -I../../intl
libaicore_a_SOURCES = \
aisupport.c \
diff -Nurd freeciv/server/Makefile.am freeciv/server/Makefile.am
--- freeciv/server/Makefile.am 2004-08-13 21:32:16.843750000 +0300
+++ freeciv/server/Makefile.am 2004-08-14 00:27:24.109375000 +0300
@@ -4,7 +4,7 @@
bin_PROGRAMS = civserver
noinst_LIBRARIES = libcivserver.a
-INCLUDES = -I$(top_srcdir)/utility -I$(srcdir)/../common -I$(srcdir)/../ai
-I../intl -I$(top_srcdir)/common/aicore -I$(srcdir)/userdb
+AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/../common -I$(srcdir)/../ai
-I../intl -I$(top_srcdir)/common/aicore -I$(srcdir)/userdb
## Above, note -I../intl instead of -I$(top_srdir/intl) is deliberate.
diff -Nurd freeciv/server/userdb/Makefile.am freeciv/server/userdb/Makefile.am
--- freeciv/server/userdb/Makefile.am 2004-08-13 21:32:17.656250000 +0300
+++ freeciv/server/userdb/Makefile.am 2004-08-14 00:27:24.140625000 +0300
@@ -2,7 +2,7 @@
noinst_LIBRARIES = libuserdb.a
-INCLUDES = -I$(top_srcdir)/utility -I$(top_srcdir)/common
+AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(top_srcdir)/common
libuserdb_a_SOURCES = \
lockfile.c \
diff -Nurd freeciv/utility/Makefile.am freeciv/utility/Makefile.am
--- freeciv/utility/Makefile.am 2004-08-13 21:32:19.421875000 +0300
+++ freeciv/utility/Makefile.am 2004-08-14 00:27:24.328125000 +0300
@@ -4,7 +4,7 @@
noinst_LIBRARIES = libcivutility.a
-INCLUDES = -I../intl
+AM_CPPFLAGS = -I../intl
## Above, note -I../intl instead of -I$(top_srdir/intl) is deliberate.
diff -Nurd freeciv/utility/ftwl/Makefile.am freeciv/utility/ftwl/Makefile.am
--- freeciv/utility/ftwl/Makefile.am 2004-08-13 21:32:18.687500000 +0300
+++ freeciv/utility/ftwl/Makefile.am 2004-08-14 00:27:24.281250000 +0300
@@ -2,7 +2,7 @@
noinst_LIBRARIES = libftwl.a
-INCLUDES = -I. -I$(top_srcdir)/utility -I../../intl -I/usr/include/freetype2
@CLIENT_CFLAGS@
+AM_CPPFLAGS = -I. -I$(top_srcdir)/utility -I../../intl
-I/usr/include/freetype2 @CLIENT_CFLAGS@
BACKEND_COMMON_FILES= \
be_common_24.c \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Freeciv-Dev] (PR#9698) [Patch] Replace INCLUDES with AM_CPPFLAGS,
Marko Lindqvist <=
|
|
