<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39706 >
$subject For S2_2 and trunk. Ready for commit. - ML
diff -Nurd -X.diff_ignore freeciv/ai/Makefile.am freeciv/ai/Makefile.am --- freeciv/ai/Makefile.am 2007-08-04 18:38:34.000000000 +0300 +++ freeciv/ai/Makefile.am 2007-09-14 20:18:15.000000000 +0300 @@ -2,9 +2,7 @@ noinst_LIBRARIES = libcivai.a -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. +AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/../common -I$(srcdir)/../server -I$(top_srcdir)/common/aicore libcivai_a_SOURCES = \ advdomestic.c \ diff -Nurd -X.diff_ignore freeciv/client/agents/Makefile.am freeciv/client/agents/Makefile.am --- freeciv/client/agents/Makefile.am 2007-08-04 18:38:37.000000000 +0300 +++ freeciv/client/agents/Makefile.am 2007-09-14 20:17:15.000000000 +0300 @@ -2,7 +2,7 @@ noinst_LIBRARIES = libagents.a -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) +AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(top_srcdir)/common/aicore -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(srcdir)/../gui-gtk $(CLIENT_CFLAGS) libagents_a_SOURCES = \ agents.c \ diff -Nurd -X.diff_ignore freeciv/client/gui-ftwl/Makefile.am freeciv/client/gui-ftwl/Makefile.am --- freeciv/client/gui-ftwl/Makefile.am 2007-08-04 18:39:05.000000000 +0300 +++ freeciv/client/gui-ftwl/Makefile.am 2007-09-14 20:16:03.000000000 +0300 @@ -3,9 +3,7 @@ SUBDIRS = noinst_LIBRARIES = libguiclient.a -AM_CPPFLAGS = -I. -I$(top_srcdir)/utility -I$(top_srcdir)/utility/ftwl -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I$(srcdir)/.. -I$(srcdir)/../include -I../../intl $(CLIENT_CFLAGS) - -## Above, note -I../../intl instead of -I$(top_srdir)/intl is deliberate. +AM_CPPFLAGS = -I. -I$(top_srcdir)/utility -I$(top_srcdir)/utility/ftwl -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I$(srcdir)/.. -I$(srcdir)/../include $(CLIENT_CFLAGS) libguiclient_a_SOURCES = \ canvas.c \ diff -Nurd -X.diff_ignore freeciv/client/gui-gtk-2.0/Makefile.am freeciv/client/gui-gtk-2.0/Makefile.am --- freeciv/client/gui-gtk-2.0/Makefile.am 2007-08-09 21:49:47.000000000 +0300 +++ freeciv/client/gui-gtk-2.0/Makefile.am 2007-09-14 20:16:39.000000000 +0300 @@ -1,9 +1,8 @@ ## 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) $(GGZ_GTK_INCLUDES) +AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -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 # Freeciv.h in the builddir, in preference to the one # in the source dir (when compiling from another dir). --dwp diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/Makefile.am freeciv/client/gui-sdl/Makefile.am --- freeciv/client/gui-sdl/Makefile.am 2007-08-04 18:39:04.000000000 +0300 +++ freeciv/client/gui-sdl/Makefile.am 2007-09-14 20:15:49.000000000 +0300 @@ -2,9 +2,7 @@ noinst_LIBRARIES = libguiclient.a -AM_CPPFLAGS = -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. +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I$(srcdir)/../agents $(CLIENT_CFLAGS) libguiclient_a_SOURCES = \ SDL_rotozoom.c \ diff -Nurd -X.diff_ignore freeciv/client/gui-stub/Makefile.am freeciv/client/gui-stub/Makefile.am --- freeciv/client/gui-stub/Makefile.am 2007-08-04 18:39:12.000000000 +0300 +++ freeciv/client/gui-stub/Makefile.am 2007-09-14 20:17:53.000000000 +0300 @@ -1,9 +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../../intl $(CLIENT_CFLAGS) - -## Above, note -I../../intl instead of -I$(top_srdir)/intl is deliberate. +AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common $(CLIENT_CFLAGS) libguiclient_a_SOURCES = \ canvas.c \ diff -Nurd -X.diff_ignore freeciv/client/gui-win32/Makefile.am freeciv/client/gui-win32/Makefile.am --- freeciv/client/gui-win32/Makefile.am 2007-08-04 18:38:53.000000000 +0300 +++ freeciv/client/gui-win32/Makefile.am 2007-09-14 20:16:18.000000000 +0300 @@ -2,9 +2,7 @@ noinst_LIBRARIES = libguiclient.a -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. +AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../agents -I$(top_srcdir)/utility -I$(srcdir)/../include -I$(top_srcdir)/common/aicore -I$(top_srcdir)/common $(CLIENT_CFLAGS) libguiclient_a_SOURCES = \ canvas.c \ diff -Nurd -X.diff_ignore freeciv/client/gui-xaw/Makefile.am freeciv/client/gui-xaw/Makefile.am --- freeciv/client/gui-xaw/Makefile.am 2007-08-04 18:38:47.000000000 +0300 +++ freeciv/client/gui-xaw/Makefile.am 2007-09-14 20:17:39.000000000 +0300 @@ -1,9 +1,8 @@ ## 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../../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$(top_srcdir)/common/aicore -I$(srcdir)/../agents $(CLIENT_CFLAGS) -## Above, note -I../../intl instead of -I$(top_srdir/intl) is deliberate. # The AM_CPPFLAGS "-I." is so resources.c includes the locally generated # Freeciv.h in the builddir, in preference to the one # in the source dir (when compiling from another dir). --dwp diff -Nurd -X.diff_ignore freeciv/client/Makefile.am freeciv/client/Makefile.am --- freeciv/client/Makefile.am 2007-09-08 20:06:31.000000000 +0300 +++ freeciv/client/Makefile.am 2007-09-14 20:17:02.000000000 +0300 @@ -53,9 +53,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 $(CLIENT_CFLAGS) $(SOUND_CFLAGS) $(LIBGGZ_INCLUDES) $(GGZMOD_INCLUDES) $(GGZ_GTK_INCLUDES) - -## Above, note -I../intl instead of -I$(top_srdir/intl) is deliberate. +AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/include -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I$(srcdir)/agents $(CLIENT_CFLAGS) $(SOUND_CFLAGS) $(LIBGGZ_INCLUDES) $(GGZMOD_INCLUDES) $(GGZ_GTK_INCLUDES) civclient_SOURCES = $(AUDIO_SDL_FILES) \ attribute.h \ diff -Nurd -X.diff_ignore freeciv/common/aicore/Makefile.am freeciv/common/aicore/Makefile.am --- freeciv/common/aicore/Makefile.am 2007-08-04 18:38:28.000000000 +0300 +++ freeciv/common/aicore/Makefile.am 2007-09-14 20:14:34.000000000 +0300 @@ -2,7 +2,7 @@ noinst_LIBRARIES = libaicore.a -AM_CPPFLAGS = -I$(top_srcdir)/utility -I.. -I$(top_srcdir)/common -I../../intl +AM_CPPFLAGS = -I$(top_srcdir)/utility -I.. -I$(top_srcdir)/common libaicore_a_SOURCES = \ aisupport.c \ diff -Nurd -X.diff_ignore freeciv/common/Makefile.am freeciv/common/Makefile.am --- freeciv/common/Makefile.am 2007-09-07 13:54:28.000000000 +0300 +++ freeciv/common/Makefile.am 2007-09-14 20:14:52.000000000 +0300 @@ -4,9 +4,7 @@ noinst_LIBRARIES = libcivcommon.a -AM_CPPFLAGS = -I../intl -I$(top_srcdir)/utility -I$(srcdir)/aicore - -## Above, note -I../intl instead of -I$(top_srcdir/intl) is deliberate. +AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/aicore libcivcommon_a_SOURCES = \ base.c \ diff -Nurd -X.diff_ignore freeciv/manual/Makefile.am freeciv/manual/Makefile.am --- freeciv/manual/Makefile.am 2007-08-04 18:38:35.000000000 +0300 +++ freeciv/manual/Makefile.am 2007-09-14 20:18:05.000000000 +0300 @@ -1,9 +1,7 @@ ## Process this file with automake to produce Makefile.in bin_PROGRAMS = civmanual -AM_CPPFLAGS = -I$(top_srcdir)/server -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/ai -I../intl -I$(top_srcdir)/common/aicore -I$(top_srcdir)/server/generator -I$(top_srcdir)/client -I$(top_srcdir)/client/include - -## Above, note -I../intl instead of -I$(top_srcdir/intl) is deliberate. +AM_CPPFLAGS = -I$(top_srcdir)/server -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/ai -I$(top_srcdir)/common/aicore -I$(top_srcdir)/server/generator -I$(top_srcdir)/client -I$(top_srcdir)/client/include civmanual_SOURCES = \ civmanual.c diff -Nurd -X.diff_ignore freeciv/server/generator/Makefile.am freeciv/server/generator/Makefile.am --- freeciv/server/generator/Makefile.am 2007-08-04 18:36:18.000000000 +0300 +++ freeciv/server/generator/Makefile.am 2007-09-14 20:18:53.000000000 +0300 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in noinst_LIBRARIES = libgenerator.a -AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/server -I$(top_builddir)/intl -I$(top_srcdir)/server/generator +AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/server -I$(top_srcdir)/server/generator libgenerator_a_SOURCES = \ mapgen.c \ diff -Nurd -X.diff_ignore freeciv/server/Makefile.am freeciv/server/Makefile.am --- freeciv/server/Makefile.am 2007-08-04 18:36:24.000000000 +0300 +++ freeciv/server/Makefile.am 2007-09-14 20:18:32.000000000 +0300 @@ -6,12 +6,10 @@ noinst_LIBRARIES = libcivserver.a AM_CPPFLAGS = \ -I$(top_srcdir)/utility -I$(srcdir)/../common -I$(srcdir)/../ai \ - -I../intl -I$(top_srcdir)/common/aicore \ + -I$(top_srcdir)/common/aicore \ -I$(srcdir)/generator -I$(srcdir)/scripting \ $(LIBGGZ_INCLUDES) $(GGZDMOD_INCLUDES) -## Above, note -I../intl instead of -I$(top_srdir/intl) is deliberate. - if MINGW32 SERVERICON=../win32/servericon.o endif diff -Nurd -X.diff_ignore freeciv/server/scripting/Makefile.am freeciv/server/scripting/Makefile.am --- freeciv/server/scripting/Makefile.am 2007-08-04 18:36:19.000000000 +0300 +++ freeciv/server/scripting/Makefile.am 2007-09-14 20:19:06.000000000 +0300 @@ -4,7 +4,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/utility -I$(top_srcdir)/common \ - -I$(top_srcdir)/intl -I$(top_srcdir)/server \ + -I$(top_srcdir)/server \ -I$(top_srcdir)/dependencies/lua/include \ -I$(top_srcdir)/dependencies/tolua diff -Nurd -X.diff_ignore freeciv/utility/ftwl/Makefile.am freeciv/utility/ftwl/Makefile.am --- freeciv/utility/ftwl/Makefile.am 2007-08-26 22:07:41.000000000 +0300 +++ freeciv/utility/ftwl/Makefile.am 2007-09-14 20:15:27.000000000 +0300 @@ -8,7 +8,7 @@ noinst_LIBRARIES = $(FTWLLIB) -AM_CPPFLAGS = -I. -I$(top_srcdir)/utility -I../../intl $(FTWL_CFLAGS) +AM_CPPFLAGS = -I. -I$(top_srcdir)/utility $(FTWL_CFLAGS) BACKEND_COMMON_FILES= \ be_common_32.c \ @@ -80,7 +80,5 @@ OTHER_FILES=$(ALL_OTHER_FILES) endif -## Above, note -I../../intl instead of -I$(top_srdir)/intl is deliberate. - libftwl_a_SOURCES = $(BACKEND_X11_FILES) \ $(BACKEND_SDL_FILES) $(OTHER_FILES) diff -Nurd -X.diff_ignore freeciv/utility/Makefile.am freeciv/utility/Makefile.am --- freeciv/utility/Makefile.am 2007-08-04 18:36:14.000000000 +0300 +++ freeciv/utility/Makefile.am 2007-09-14 20:15:10.000000000 +0300 @@ -4,10 +4,6 @@ noinst_LIBRARIES = libcivutility.a -AM_CPPFLAGS = -I../intl - -## Above, note -I../intl instead of -I$(top_srdir/intl) is deliberate. - libcivutility_a_SOURCES = \ astring.c \ astring.h \
_______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
