[Freeciv-Dev] [Patch] CMA 1.0 (Update)

[Andreas Kemnade <akemnade@xxxxxxxxxxx>]

I have cleaned up the patch a bit:
- Insert $(srcdir) in include path
- #include "client/attributes.h" -> #include "attributes.h"
  Then you don't need to build the client in the source dir.
- remove assumption about directory for glib includes

Todo: Make the other clients compile

either
  move gtk code from gtk to gui-gtk
or
  add some automake/autoconf magic to disable compiling of
  agents/*_gtk.c when another client is compiled (and switch to the
  correct file)

Greetings
Andreas Kemnade

The patch is against plain cvs + cma1_0.diff.gz

diff --exclude-from freeciv/diff_ignore -Nur freeciv/client/Makefile.am 
freeciv2/client/Makefile.am
--- freeciv/client/Makefile.am  Fri Sep 21 13:24:35 2001
+++ freeciv2/client/Makefile.am Fri Sep 21 11:25:08 2001
@@ -99,7 +99,7 @@
 
 bin_PROGRAMS = civclient
 
-INCLUDES = -I$(srcdir)/include -I$(top_srcdir)/common -I../intl -Iagents
+INCLUDES = -I$(srcdir)/include -I$(top_srcdir)/common -I../intl 
-I$(srcdir)/agents
 
 ## Above, note -I../intl instead of -I$(top_srdir/intl) is deliberate.
 
diff --exclude-from freeciv/diff_ignore -Nur freeciv/client/agents/Makefile.am 
freeciv2/client/agents/Makefile.am
--- freeciv/client/agents/Makefile.am   Fri Sep 21 13:24:35 2001
+++ freeciv2/client/agents/Makefile.am  Fri Sep 21 12:24:53 2001
@@ -2,7 +2,7 @@
 
 noinst_LIBRARIES = libagents.a
 
-INCLUDES = -I.. -I../gui-gtk -I../include -I$(top_srcdir)/common -I../intl 
-I/usr/lib/glib/include @CLIENT_CFLAGS@
+INCLUDES = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/common 
-I../../intl -I$(srcdir)/../gui-gtk @CLIENT_CFLAGS@
 
 libagents_a_SOURCES =                          \
        agents.c                                \
diff --exclude-from freeciv/diff_ignore -Nur 
freeciv/client/agents/citizen_management_frontend_common.c 
freeciv2/client/agents/citizen_management_frontend_common.c
--- freeciv/client/agents/citizen_management_frontend_common.c  Fri Sep 21 
13:24:36 2001
+++ freeciv2/client/agents/citizen_management_frontend_common.c Fri Sep 21 
12:35:08 2001
@@ -22,7 +22,7 @@
 #include "log.h"
 #include "support.h"
 #include "game.h"
-#include "client/attribute.h"
+#include "attribute.h"
 
 #include "citizen_management_frontend_common.h"
 
diff --exclude-from freeciv/diff_ignore -Nur freeciv/client/gui-gtk/Makefile.am 
freeciv2/client/gui-gtk/Makefile.am
--- freeciv/client/gui-gtk/Makefile.am  Fri Sep 21 13:24:36 2001
+++ freeciv2/client/gui-gtk/Makefile.am Fri Sep 21 11:25:52 2001
@@ -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)/common 
-I../../intl -I../agents @CLIENT_CFLAGS@
+INCLUDES = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/common 
-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