[Wesnoth-cvs-commits] wesnoth ./configure.ac src/Makefile.am src/serv...

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/03/03 23:04:00

Modified files:
        .              : configure.ac 
        src            : Makefile.am 
Removed files:
        src/server     : Makefile.am 

Log message:
        Drag wesnothd into src/ and drop the object files into their 
subdirectories to avoid superfluous compilations.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.119&tr2=1.120&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.74&tr2=1.75&r1=text&r2=text

Patches:
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.119 wesnoth/configure.ac:1.120
--- wesnoth/configure.ac:1.119  Thu Mar  3 22:19:57 2005
+++ wesnoth/configure.ac        Thu Mar  3 23:04:00 2005
@@ -9,7 +9,7 @@
 dnl AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["server.wesnoth.org"], [The default 
server for this version])
 AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org"], [The default 
server for this version])
 
-AC_REVISION([$Revision: 1.119 $])
+AC_REVISION([$Revision: 1.120 $])
 
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([foreign 1.5])
@@ -187,6 +187,7 @@
 AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_INSTALL
+AM_PROG_CC_C_O
 
 have_libx11='no'
 if test "$with_x" != 'no'; then
@@ -724,7 +725,6 @@
                 intl/Makefile 
                 icons/Makefile
                 src/Makefile
-                src/server/Makefile
                 src/zip/Makefile
                 doc/Makefile
                 doc/man/Makefile])
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.74 wesnoth/src/Makefile.am:1.75
--- wesnoth/src/Makefile.am:1.74        Thu Mar  3 22:43:25 2005
+++ wesnoth/src/Makefile.am     Thu Mar  3 23:04:00 2005
@@ -1,15 +1,16 @@
+AUTOMAKE_OPTIONS = subdir-objects
 SUBDIRS = .
 
-if SERVER
-SUBDIRS += server
-endif
-
 bin_PROGRAMS =
 
 if GAME
 bin_PROGRAMS += wesnoth
 endif
 
+if SERVER
+bin_PROGRAMS += wesnothd
+endif
+
 if CAMPAIGNSERVER
 bin_PROGRAMS += campaignd
 endif
@@ -364,6 +365,47 @@
                         wesconfig.h
 
 #############################################################################
+#    Wesnothd Server                                                        #
+#############################################################################
+
+wesnothd_SOURCES = \
+       server/game.cpp \
+       server/input_stream.cpp \
+       server/metrics.cpp \
+       server/player.cpp \
+       server/server.cpp \
+       server/variable.cpp \
+       config.cpp \
+       filesystem.cpp \
+       game_config.cpp \
+       gettext.cpp \
+       log.cpp \
+       network.cpp \
+       network_worker.cpp \
+       thread.cpp \
+       serialization/preprocessor.cpp \
+       serialization/string_utils.cpp \
+       zipios++/xcoll.cpp \
+       server/game.hpp \
+       game_events.hpp \
+       server/input_stream.hpp \
+       server/metrics.hpp \
+       server/player.hpp \
+       config.hpp \
+       filesystem.hpp \
+       game_config.hpp \
+       gettext.hpp \
+       log.hpp \
+       network.hpp \
+       network_worker.hpp \
+       thread.hpp \
+       serialization/preprocessor.hpp \
+       serialization/string_utils.hpp \
+       zipios++/xcoll.hpp
+
+wesnothd_LDADD = @SDL_NET_LIBS@ @SDL_LIBS@ $(LIBZIPIOS)
+
+#############################################################################
 #    Campaign Server                                                        #
 #############################################################################