[Freeciv-Dev] Re: (PR#9755) provide distribute() in the utility code

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=9755 >

Mateusz Stefek wrote:
> <URL: http://rt.freeciv.org/Ticket/Display.html?id=9755 >
> 
> I get following error when I compile client
> make[1]: Entering directory `/home/mateusz/cvs/freeciv/client'
> gcc  -O0 -g -Werror -Wall -Wpointer-arith -Wcast-align
> -Wmissing-prototypes -Wmissing-declarations  -o civclient  audio_esd.o
> audio_sdl.o audio_alsa.o attribute.o citydlg_common.o cityrepdata.o
> civclient.o chatline_common.o connectdlg_common.o climisc.o climap.o
> clinet.o control.o goto.o helpdata.o mapctrl_common.o mapview_common.o
> messagewin_common.o packhand.o packhand_gen.o plrdlg_common.o options.o
> repodlgs_common.o text.o tilespec.o audio.o audio_none.o
> gui-gtk-2.0/libguiclient.a        ../common/aicore/libaicore.a        
> ../utility/libcivutility.a ../common/libcivcommon.a        
> agents/libagents.a ../common/aicore/libaicore.a         
> -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0
> -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0
> -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0    -lesd -laudiofile -lm
> -L/usr/lib -lSDL -lpthread -lSDL_mixer -laudiofile -lasound -lz
> ../common/libcivcommon.a(city.o)(.text+0x31e5): In function
> `get_tax_income':
> /home/mateusz/cvs/freeciv/common/city.c:1836: undefined reference to
> `distribute'
> collect2: ld returned 1 exit status
> 
> Yes. I run ./autogen.sh, even make clean
> This looks really strange, because server compiles, but client doesn't.

Does this patch help?

(Of course you must rerun autogen again, and maybe remove client/civclient.)

jason

Index: client/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/Makefile.am,v
retrieving revision 1.59
diff -u -r1.59 Makefile.am
--- client/Makefile.am  18 Aug 2004 05:24:45 -0000      1.59
+++ client/Makefile.am  26 Aug 2004 16:28:54 -0000
@@ -193,12 +193,12 @@
        audio_none.h
 
 civclient_LDFLAGS = @CLIENT_LDFLAGS@
-civclient_DEPENDENCIES = @gui_sources@/libguiclient.a \
-       ../utility/libcivutility.a ../common/libcivcommon.a agents/libagents.a \
-        ../common/aicore/libaicore.a $(LIBFTWL)
-
-civclient_LDADD        = @gui_sources@/libguiclient.a \
-       @INTLLIBS@ ../common/aicore/libaicore.a \
-        ../utility/libcivutility.a ../common/libcivcommon.a \
-        agents/libagents.a ../common/aicore/libaicore.a \
-        $(LIBFTWL) @CLIENT_LIBS@ @SOUND_LIBS@
+fc_civclient_libs =    ../utility/libcivutility.a      \
+                       $(LIBFTWL)                      \
+                       ../common/libcivcommon.a        \
+                       ../common/aicore/libaicore.a    \
+                       agents/libagents.a              \
+                       @gui_sources@/libguiclient.a
+civclient_DEPENDENCIES = $(fc_civclient_libs)
+civclient_LDADD        = $(fc_civclient_libs) $(fc_civclient_libs) \
+       @INTLLIBS@ @CLIENT_LIBS@ @SOUND_LIBS@
Index: server/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/Makefile.am,v
retrieving revision 1.34
diff -u -r1.34 Makefile.am
--- server/Makefile.am  18 Aug 2004 05:24:45 -0000      1.34
+++ server/Makefile.am  26 Aug 2004 16:28:54 -0000
@@ -76,12 +76,12 @@
                unittools.c     \
                unittools.h
 
-civserver_DEPENDENCIES = ../utility/libcivutility.a ../common/libcivcommon.a \
-      ../ai/libcivai.a ../utility/libcivutility.a ./libcivserver.a \
-      ../utility/libcivutility.a ../common/aicore/libaicore.a $(USER_DB_DEP)
-civserver_LDADD        = ../utility/libcivutility.a ../common/libcivcommon.a \
-      ../ai/libcivai.a ../utility/libcivutility.a ./libcivserver.a @INTLLIBS@ \
-      ../utility/libcivutility.a ../common/libcivcommon.a ../ai/libcivai.a \
-      ../utility/libcivutility.a ./libcivserver.a ../utility/libcivutility.a \
-      ../common/aicore/libaicore.a $(USER_DB_LIB) $(SERVER_LIBS)
+fc_civserver_libs =    ../utility/libcivutility.a      \
+                       ../common/libcivcommon.a        \
+                       ../common/aicore/libaicore.a    \
+                       ../ai/libcivai.a                \
+                       ./libcivserver.a
+civserver_DEPENDENCIES = $(fc_civserver_libs) $(USER_DB_DEP)
+civserver_LDADD        = $(fc_civserver_libs) $(fc_civserver_libs) \
+       @INTLLIBS@ $(USER_DB_LIB) $(SERVER_LIBS)