<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40177 >
2009/1/8 Madeline Book:
> Maybe dummy.c could be renamed civclient.c and the
> existing civclient.[ch] renamed to client.[ch]? Or
> perhaps client_main.[ch] would be a better name,
> since there is already "clinet". It's just that
> calling it "dummy" makes it look like a hack... :/
It *is* a hack, but ok, I'll move files around when committing this.
I'm not updating this to patch, as moving has to be made with 'svn mv'
and not by 'patch'.
- Fixed building of civmanual when shared libraries are enabled and
static libraries disabled
- ML
diff -Nurd -X.diff_ignore freeciv/ai/Makefile.am freeciv/ai/Makefile.am
--- freeciv/ai/Makefile.am 2008-10-27 04:13:32.000000000 +0200
+++ freeciv/ai/Makefile.am 2009-01-08 10:33:45.000000000 +0200
@@ -1,10 +1,10 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libcivai.a
+noinst_LTLIBRARIES = libcivai.la
AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/../common
-I$(srcdir)/../server -I$(top_srcdir)/common/aicore
-I$(top_srcdir)/server/generator
-libcivai_a_SOURCES = \
+libcivai_la_SOURCES = \
advdomestic.c \
advdomestic.h \
advmilitary.c \
diff -Nurd -X.diff_ignore freeciv/autogen.sh freeciv/autogen.sh
--- freeciv/autogen.sh 2008-10-27 04:14:13.000000000 +0200
+++ freeciv/autogen.sh 2009-01-08 10:33:45.000000000 +0200
@@ -238,6 +238,8 @@
AUTOMAKE=$REALPKGNAME
real_package_name "aclocal" "ftp://ftp.gnu.org/pub/gnu/automake/"; 1 6 || DIE=1
ACLOCAL=$REALPKGNAME
+real_package_name "libtoolize" "ftp://ftp.gnu.org/pub/gnu/libtool/"; 1 || DIE=1
+LIBTOOLIZE=$REALPKGNAME
if [ "$FC_USE_NLS" = "yes" ]; then
DIE2=0
@@ -274,6 +276,12 @@
echo "$AUTOCONF failed"
exit 1
}
+echo "+ running $LIBTOOLIZE ... "
+$LIBTOOLIZE -f || {
+ echo
+ echo "$LIBTOOLIZE failed"
+ exit 1
+}
echo "+ running $AUTOMAKE ... "
$AUTOMAKE -a -c || {
echo
diff -Nurd -X.diff_ignore freeciv/client/agents/Makefile.am
freeciv/client/agents/Makefile.am
--- freeciv/client/agents/Makefile.am 2008-10-27 04:13:58.000000000 +0200
+++ freeciv/client/agents/Makefile.am 2009-01-08 10:33:45.000000000 +0200
@@ -1,10 +1,10 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libagents.a
+noinst_LTLIBRARIES = libagents.la
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 = \
+libagents_la_SOURCES = \
agents.c \
agents.h \
cma_core.c \
diff -Nurd -X.diff_ignore freeciv/client/dummy.c freeciv/client/dummy.c
--- freeciv/client/dummy.c 1970-01-01 02:00:00.000000000 +0200
+++ freeciv/client/dummy.c 2009-01-08 10:33:45.000000000 +0200
@@ -0,0 +1,6 @@
+/*
+ * Binaries cannot be linked from libraries only.
+ * Some sources are required directly. This is
+ * dummy sourcefile.
+ *
+ */
diff -Nurd -X.diff_ignore freeciv/client/gui-ftwl/Makefile.am
freeciv/client/gui-ftwl/Makefile.am
--- freeciv/client/gui-ftwl/Makefile.am 2008-10-27 04:14:02.000000000 +0200
+++ freeciv/client/gui-ftwl/Makefile.am 2009-01-08 10:33:45.000000000 +0200
@@ -1,11 +1,9 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS =
-
-noinst_LIBRARIES = libguiclient.a
+noinst_LTLIBRARIES = libguiclient.la
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 = \
+libguiclient_la_SOURCES = \
canvas.c \
canvas.h \
chatline.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 2008-10-27 04:13:59.000000000
+0200
+++ freeciv/client/gui-gtk-2.0/Makefile.am 2009-01-08 10:33:45.000000000
+0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libguiclient.a
+noinst_LTLIBRARIES = libguiclient.la
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)
# The AM_CPPFLAGS "-I." is so resources.c includes the locally generated
@@ -16,9 +16,9 @@
echo '/*********************************************************/' >>
Freeciv.h
$(srcdir)/rc2c $(top_srcdir)/data/freeciv.rc-2.0 >> Freeciv.h
-libguiclient_a_DEPENDENCIES = rc2c
+libguiclient_la_DEPENDENCIES = rc2c
-libguiclient_a_SOURCES = \
+libguiclient_la_SOURCES = \
rc2c \
Freeciv.h \
canvas.c \
diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/Makefile.am
freeciv/client/gui-sdl/Makefile.am
--- freeciv/client/gui-sdl/Makefile.am 2008-10-27 04:14:02.000000000 +0200
+++ freeciv/client/gui-sdl/Makefile.am 2009-01-08 10:33:45.000000000 +0200
@@ -1,10 +1,10 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libguiclient.a
+noinst_LTLIBRARIES = libguiclient.la
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 = \
+libguiclient_la_SOURCES = \
SDL_rotozoom.c \
SDL_rotozoom.h \
SDL_ttf.c \
diff -Nurd -X.diff_ignore freeciv/client/gui-stub/Makefile.am
freeciv/client/gui-stub/Makefile.am
--- freeciv/client/gui-stub/Makefile.am 2008-10-27 04:14:03.000000000 +0200
+++ freeciv/client/gui-stub/Makefile.am 2009-01-08 10:33:45.000000000 +0200
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libguiclient.a
+noinst_LTLIBRARIES = libguiclient.la
AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include
-I$(top_srcdir)/utility -I$(top_srcdir)/common $(CLIENT_CFLAGS)
-libguiclient_a_SOURCES = \
+libguiclient_la_SOURCES = \
canvas.c \
canvas.h \
chatline.c \
diff -Nurd -X.diff_ignore freeciv/client/gui-win32/Makefile.am
freeciv/client/gui-win32/Makefile.am
--- freeciv/client/gui-win32/Makefile.am 2008-10-27 04:14:01.000000000
+0200
+++ freeciv/client/gui-win32/Makefile.am 2009-01-08 10:33:45.000000000
+0200
@@ -1,10 +1,10 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libguiclient.a
+noinst_LTLIBRARIES = libguiclient.la
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 = \
+libguiclient_la_SOURCES = \
canvas.c \
canvas.h \
chatline.c \
diff -Nurd -X.diff_ignore freeciv/client/gui-xaw/Makefile.am
freeciv/client/gui-xaw/Makefile.am
--- freeciv/client/gui-xaw/Makefile.am 2008-10-27 04:14:00.000000000 +0200
+++ freeciv/client/gui-xaw/Makefile.am 2009-01-08 10:33:45.000000000 +0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libguiclient.a
+noinst_LTLIBRARIES = libguiclient.la
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)
# The AM_CPPFLAGS "-I." is so resources.c includes the locally generated
@@ -16,9 +16,9 @@
echo '/**************************************************/' >> Freeciv.h
$(srcdir)/ad2c $(top_builddir)/data/Freeciv >> Freeciv.h
-libguiclient_a_DEPENDENCIES = ad2c
+libguiclient_la_DEPENDENCIES = ad2c
-libguiclient_a_SOURCES = \
+libguiclient_la_SOURCES = \
ad2c \
Freeciv.h \
actions.c \
diff -Nurd -X.diff_ignore freeciv/client/Makefile.am freeciv/client/Makefile.am
--- freeciv/client/Makefile.am 2008-10-27 04:14:03.000000000 +0200
+++ freeciv/client/Makefile.am 2009-01-08 10:33:45.000000000 +0200
@@ -4,6 +4,8 @@
## SUBDIRS = $(gui_sources)
## but that doesn't work properly for "make dist"
+noinst_LTLIBRARIES = libfreeciv-client.la
+
if CLIENT_GUI_SDL
GUI_SUBDIR = gui-sdl
endif
@@ -24,7 +26,7 @@
endif
if CLIENT_GUI_FTWL
GUI_SUBDIR = gui-ftwl
-LIBFTWL = ../utility/ftwl/libftwl.a
+LIBFTWL = $(top_builddir)/utility/ftwl/libftwl.la
endif
ALL_AUDIO_SDL_FILES=audio_sdl.c audio_sdl.h
@@ -55,7 +57,10 @@
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) \
+# Build client common functionality in to library
+# instead linking them directly to civclient. This is necessary
+# for static linking.
+libfreeciv_client_la_SOURCES = $(AUDIO_SDL_FILES) \
attribute.h \
attribute.c \
citydlg_common.c \
@@ -123,16 +128,33 @@
# generated outside this directory (when building common) there's no point in
# setting them to BUILT_SOURCES.
+# Automake requires binary to have some sources directly.
+civclient_SOURCES = \
+ dummy.c
+
+# There is no dependency against changes to gui_sources -variable.
+# There might be no relinking with correct gui, if it already exist
+# and is not recompiled.
+libfreeciv_client_la_DEPENDENCIES = \
+ $(top_builddir)/client/agents/libagents.la \
+ $(gui_sources)/libguiclient.la
+
+libfreeciv_client_la_LIBADD = \
+ $(top_builddir)/client/agents/libagents.la \
+ $(gui_sources)/libguiclient.la
+
+fc_civclient_libs = \
+ ./libfreeciv-client.la \
+ $(LIBFTWL) \
+ $(top_builddir)/common/libfreeciv.la
civclient_LDFLAGS = $(CLIENT_LDFLAGS) $(GGZMOD_LDFLAGS)
-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) $(LIB_GGZMOD) $(CLIENTICON)
+civclient_LDADD = \
+ $(fc_civclient_libs) \
+ $(fc_civclient_libs) \
+ $(INTLLIBS) $(CLIENT_LIBS) $(SOUND_LIBS) $(LIB_GGZMOD) \
+ $(fc_civclient_libs) \
+ $(INTLLIBS) $(CLIENT_LIBS) $(SOUND_LIBS) $(LIB_GGZMOD) $(CLIENTICON)
desktopfiledir = $(prefix)/share/applications
desktopfile_DATA = \
freeciv.desktop
diff -Nurd -X.diff_ignore freeciv/common/aicore/Makefile.am
freeciv/common/aicore/Makefile.am
--- freeciv/common/aicore/Makefile.am 2008-10-27 04:13:29.000000000 +0200
+++ freeciv/common/aicore/Makefile.am 2009-01-08 10:33:45.000000000 +0200
@@ -1,10 +1,10 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libaicore.a
+noinst_LTLIBRARIES = libaicore.la
AM_CPPFLAGS = -I$(top_srcdir)/utility -I.. -I$(top_srcdir)/common
-libaicore_a_SOURCES = \
+libaicore_la_SOURCES = \
aisupport.c \
aisupport.h \
path_finding.c \
diff -Nurd -X.diff_ignore freeciv/common/Makefile.am freeciv/common/Makefile.am
--- freeciv/common/Makefile.am 2009-01-07 22:34:01.000000000 +0200
+++ freeciv/common/Makefile.am 2009-01-08 10:33:45.000000000 +0200
@@ -1,12 +1,12 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS= aicore
+SUBDIRS = aicore
-noinst_LIBRARIES = libcivcommon.a
+lib_LTLIBRARIES = libfreeciv.la
AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/aicore
-libcivcommon_a_SOURCES = \
+libfreeciv_la_SOURCES = \
base.c \
base.h \
capstr.c \
@@ -75,6 +75,14 @@
version.c \
version.h
+libfreeciv_la_DEPENDENCIES = \
+ $(top_builddir)/utility/libcivutility.la \
+ $(top_builddir)/common/aicore/libaicore.la
+
+libfreeciv_la_LIBADD = \
+ $(top_builddir)/utility/libcivutility.la \
+ $(top_builddir)/common/aicore/libaicore.la
+
BUILT_SOURCES = packets_gen.c packets_gen.h
# packets_gen.h must be generated before it can be included.
@@ -107,6 +115,3 @@
.PHONY : fc_svnrev_gen.h
fc_svnrev_gen.h :
$(top_srcdir)/bootstrap/generate_svnrev.sh $(top_srcdir) $(top_builddir)
-
-#libcivcommon_a_DEPENDENCIES = ../utility/libcivutility.a
-#libcivcommon_a_LIBADD = ../utility/libcivutility.a
diff -Nurd -X.diff_ignore freeciv/configure.ac freeciv/configure.ac
--- freeciv/configure.ac 2008-11-15 00:03:26.000000000 +0200
+++ freeciv/configure.ac 2009-01-08 10:33:45.000000000 +0200
@@ -206,7 +206,10 @@
AC_PROG_CPP
AC_PROG_CXX
AC_PROG_LN_S
-AC_PROG_RANLIB
+AC_DISABLE_SHARED
+AC_PROG_LIBTOOL
+LIBTOOL="$LIBTOOL --preserve-dup-deps"
+AC_SUBST(LIBTOOL)
AC_CHECK_TOOL(AR, ar)
if test -z $AR; then
AC_MSG_ERROR([*** 'ar' missing. Install binutils, fix your \$PATH, or
set \$AR manually. ***])
@@ -566,6 +569,8 @@
AC_CHECK_FUNCS([chdir mkdtemp])
fi
+FC_ADD_WORDS_TO_VAR([LDFLAGS], ["-Wl,-rpath=${lib_prefix}"])
+
AC_SUBST(gui_sources)
AC_SUBST(CLIENT_CFLAGS)
AC_SUBST(CLIENT_CXXFLAGS)
diff -Nurd -X.diff_ignore freeciv/m4/compiler.m4 freeciv/m4/compiler.m4
--- freeciv/m4/compiler.m4 2008-10-27 04:13:23.000000000 +0200
+++ freeciv/m4/compiler.m4 2009-01-08 10:33:45.000000000 +0200
@@ -2,7 +2,7 @@
#
# Helper function that adds flags (words) to variable listing them.
-# Makes sure there is no extra spaces even in any situation
+# Makes sure there is no extra spaces in any situation
#
# $1 - Name of the target variable
# $2 - Flags to add
diff -Nurd -X.diff_ignore freeciv/manual/Makefile.am freeciv/manual/Makefile.am
--- freeciv/manual/Makefile.am 2008-10-27 04:13:58.000000000 +0200
+++ freeciv/manual/Makefile.am 2009-01-08 10:34:06.000000000 +0200
@@ -8,21 +8,19 @@
# This is a bit of a hack. The program links in with the server lib
# but also uses some files from the client.
-civmanual_DEPENDENCIES = ../utility/libcivutility.a ../common/libcivcommon.a \
- ../ai/libcivai.a ../utility/libcivutility.a ../server/libcivserver.a \
- ../utility/libcivutility.a ../common/aicore/libaicore.a \
- ../client/helpdata.o \
- ../server/scripting/libscripting.a \
- $(LUA_AS_DEPENDENCY) $(TOLUA_AS_DEPENDENCY) \
- ../server/generator/libgenerator.a
+civmanual_DEPENDENCIES = \
+ $(top_builddir)/common/libfreeciv.la \
+ $(top_builddir)/server/libfreeciv-srv.la \
+ $(top_builddir)/client/helpdata.lo \
+ $(top_builddir)/server/scripting/libscripting.la \
+ $(LUA_AS_DEPENDENCY) $(TOLUA_AS_DEPENDENCY) \
+ $(top_builddir)/server/generator/libgenerator.la
civmanual_LDFLAGS = $(GGZDMOD_LDFLAGS)
-civmanual_LDADD = ../utility/libcivutility.a ../common/libcivcommon.a \
- ../ai/libcivai.a ../utility/libcivutility.a ../server/libcivserver.a \
- $(INTLLIBS) ../client/helpdata.o \
- ../utility/libcivutility.a ../common/libcivcommon.a ../ai/libcivai.a \
- ../utility/libcivutility.a ../server/libcivserver.a \
- ../utility/libcivutility.a ../common/aicore/libaicore.a \
- ../server/scripting/libscripting.a \
- $(LUA_LIBS) $(TOLUA_LIBS) \
- ../server/generator/libgenerator.a \
- $(SERVER_LIBS) $(AUTH_LIBS) $(LIB_GGZDMOD)
+civmanual_LDADD = \
+ $(top_builddir)/server/libfreeciv-srv.la \
+ ../client/helpdata.lo \
+ $(top_builddir)/server/scripting/libscripting.la \
+ $(LUA_LIBS) $(TOLUA_LIBS) \
+ $(top_builddir)/server/generator/libgenerator.la \
+ $(top_builddir)/common/libfreeciv.la $(INTLLIBS) \
+ $(SERVER_LIBS) $(AUTH_LIBS) $(LIB_GGZDMOD)
diff -Nurd -X.diff_ignore freeciv/server/generator/Makefile.am
freeciv/server/generator/Makefile.am
--- freeciv/server/generator/Makefile.am 2008-10-27 04:13:34.000000000
+0200
+++ freeciv/server/generator/Makefile.am 2009-01-08 10:33:45.000000000
+0200
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libgenerator.a
+noinst_LTLIBRARIES = libgenerator.la
AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(top_srcdir)/common
-I$(top_srcdir)/server -I$(top_srcdir)/server/generator
-libgenerator_a_SOURCES = \
+libgenerator_la_SOURCES = \
mapgen.c \
mapgen.h \
mapgen_topology.c \
diff -Nurd -X.diff_ignore freeciv/server/Makefile.am freeciv/server/Makefile.am
--- freeciv/server/Makefile.am 2008-11-19 18:37:50.000000000 +0200
+++ freeciv/server/Makefile.am 2009-01-08 10:33:45.000000000 +0200
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS= generator scripting
+SUBDIRS = generator scripting
bin_PROGRAMS = civserver
-noinst_LIBRARIES = libcivserver.a
+lib_LTLIBRARIES = libfreeciv-srv.la
AM_CPPFLAGS = \
-I$(top_srcdir)/utility -I$(srcdir)/../common -I$(srcdir)/../ai \
-I$(top_srcdir)/common/aicore \
@@ -18,7 +18,7 @@
civserver.c \
civserver.h
-libcivserver_a_SOURCES = \
+libfreeciv_srv_la_SOURCES = \
airgoto.c \
airgoto.h \
auth.c \
@@ -94,23 +94,32 @@
# outside this directory (when building common) there's no point in
# setting them to BUILT_SOURCES.
-civserver_DEPENDENCIES = ../utility/libcivutility.a ../common/libcivcommon.a \
- ../ai/libcivai.a ../utility/libcivutility.a ./libcivserver.a \
- ../utility/libcivutility.a ../common/aicore/libaicore.a \
- ./scripting/libscripting.a \
- $(LUA_AS_DEPENDENCY) $(TOLUA_AS_DEPENDENCY) \
- ./generator/libgenerator.a
+# FIXME: Server library is calling AI functions.
+# We should get rid of this dependency.
+libfreeciv_srv_la_DEPENDENCIES = \
+ $(top_builddir)/ai/libcivai.la
+
+libfreeciv_srv_la_LIBADD = \
+ $(top_builddir)/ai/libcivai.la
+
+civserver_DEPENDENCIES = \
+ $(top_builddir)/common/libfreeciv.la \
+ ./libfreeciv-srv.la \
+ ./scripting/libscripting.la \
+ $(LUA_AS_DEPENDENCY) $(TOLUA_AS_DEPENDENCY) \
+ ./generator/libgenerator.la
civserver_LDFLAGS = $(GGZDMOD_LDFLAGS)
-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 ./generator/libgenerator.a \
- ./scripting/libscripting.a \
- $(LUA_LIBS) $(TOLUA_LIBS) \
- $(AUTH_LIBS) $(SERVER_LIBS) $(LIB_GGZDMOD) $(SERVERICON)
+civserver_LDADD = \
+ $(top_builddir)/common/libfreeciv.la \
+ ./libfreeciv-srv.la \
+ $(top_builddir)/common/libfreeciv.la \
+ ./libfreeciv-srv.la \
+ $(top_builddir)/common/libfreeciv.la \
+ ./generator/libgenerator.la \
+ ./scripting/libscripting.la $(INTLLIBS) \
+ $(LUA_LIBS) $(TOLUA_LIBS) \
+ $(AUTH_LIBS) $(SERVER_LIBS) $(LIB_GGZDMOD) $(SERVERICON)
desktopfiledir = $(prefix)/share/applications
desktopfile_DATA = \
freeciv-server.desktop
-
diff -Nurd -X.diff_ignore freeciv/server/scripting/Makefile.am
freeciv/server/scripting/Makefile.am
--- freeciv/server/scripting/Makefile.am 2008-10-27 04:13:34.000000000
+0200
+++ freeciv/server/scripting/Makefile.am 2009-01-08 10:33:45.000000000
+0200
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libscripting.a
+noinst_LTLIBRARIES = libscripting.la
AM_CPPFLAGS = \
-I$(top_srcdir)/utility -I$(top_srcdir)/common \
@@ -8,7 +8,7 @@
$(LUA_CFLAGS) $(TOLUA_CFLAGS)
# api_gen.[ch] are now distributed to aid in cross-compiling. See PR#13571.
-dist_libscripting_a_SOURCES = \
+dist_libscripting_la_SOURCES = \
api_actions.c \
api_actions.h \
api_find.c \
diff -Nurd -X.diff_ignore freeciv/utility/ftwl/Makefile.am
freeciv/utility/ftwl/Makefile.am
--- freeciv/utility/ftwl/Makefile.am 2008-10-27 04:13:33.000000000 +0200
+++ freeciv/utility/ftwl/Makefile.am 2009-01-08 10:33:45.000000000 +0200
@@ -1,12 +1,12 @@
## Process this file with automake to produce Makefile.in
if FTWL
-FTWLLIB=libftwl.a
+FTWLLIB=libftwl.la
else
FTWLLIB=
endif
-noinst_LIBRARIES = $(FTWLLIB)
+noinst_LTLIBRARIES = $(FTWLLIB)
AM_CPPFLAGS = -I. -I$(top_srcdir)/utility $(FTWL_CFLAGS)
@@ -80,5 +80,5 @@
OTHER_FILES=$(ALL_OTHER_FILES)
endif
-libftwl_a_SOURCES = $(BACKEND_X11_FILES) \
+libftwl_la_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 2008-10-27 04:13:33.000000000 +0200
+++ freeciv/utility/Makefile.am 2009-01-08 10:33:45.000000000 +0200
@@ -1,10 +1,10 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS= ftwl
+SUBDIRS = ftwl
-noinst_LIBRARIES = libcivutility.a
+noinst_LTLIBRARIES = libcivutility.la
-libcivutility_a_SOURCES = \
+libcivutility_la_SOURCES = \
astring.c \
astring.h \
capability.c \
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
