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

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/02/20 20:11:27

Modified files:
        .              : configure.ac 
        src            : Makefile.am 
Removed files:
        src/campaign_server: Makefile.am 
        src/tools      : Makefile.am 

Log message:
        I can't stand these subdirectories full of the same object files than 
their parent. Let's build everything into src/ to prevent duplication. I 
haven't moved the server because of a name conflict, and the zip thingie 
because I don't know what it is. Let's hope it works fine for everybody.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.116&tr2=1.117&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.69&tr2=1.70&r1=text&r2=text

Patches:
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.116 wesnoth/configure.ac:1.117
--- wesnoth/configure.ac:1.116  Sat Feb 19 22:21:27 2005
+++ wesnoth/configure.ac        Sun Feb 20 20:11:27 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.116 $])
+AC_REVISION([$Revision: 1.117 $])
 
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([foreign 1.5])
@@ -718,8 +718,6 @@
                 icons/Makefile
                 src/Makefile
                 src/server/Makefile
-                src/campaign_server/Makefile
-                src/tools/Makefile
                 src/zip/Makefile
                 doc/Makefile
                 doc/man/Makefile])
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.69 wesnoth/src/Makefile.am:1.70
--- wesnoth/src/Makefile.am:1.69        Sun Feb 20 19:22:31 2005
+++ wesnoth/src/Makefile.am     Sun Feb 20 20:11:27 2005
@@ -4,16 +4,16 @@
 SUBDIRS += server
 endif
 
+bin_PROGRAMS = wesnoth
+
 if CAMPAIGNSERVER
-SUBDIRS += campaign_server
+bin_PROGRAMS += campaignd
 endif
 
 if TOOLS
-SUBDIRS += tools
+bin_PROGRAMS += exploder cutter
 endif
 
-bin_PROGRAMS = wesnoth
-
 if EDITOR
 bin_PROGRAMS += wesnoth_editor
 endif
@@ -351,6 +351,94 @@
                         sdl_ttf/SDL_ttf.h \
                         wesconfig.h
 
+#############################################################################
+#    Campaign Server                                                        #
+#############################################################################
+
+campaignd_SOURCES = \
+       campaign_server/campaign_server.cpp \
+       server/variable.cpp \
+       config.cpp \
+       filesystem.cpp \
+       game_config.cpp \
+       gettext.cpp \
+       log.cpp \
+       network.cpp \
+       network_worker.cpp \
+       publish_campaign.cpp \
+       thread.cpp \
+       serialization/preprocessor.cpp \
+       serialization/string_utils.cpp \
+       zipios++/xcoll.cpp \
+       game_events.hpp \
+       config.hpp \
+       filesystem.hpp \
+       game_config.hpp \
+       gettext.hpp \
+       log.hpp \
+       network.hpp \
+       network_worker.hpp \
+       publish_campaign.hpp \
+       serialization/preprocessor.hpp \
+       serialization/string_utils.hpp \
+       thread.hpp \
+       zipios++/xcoll.hpp
+
+campaignd_LDADD = @SDL_NET_LIBS@ @SDL_LIBS@ $(LIBZIPIOS)
+
+#############################################################################
+#    Castle building helpers                                                #
+#############################################################################
+
+exploder_SOURCES = \
+       tools/exploder.cpp \
+       tools/exploder_utils.cpp \
+       tools/exploder_cutter.cpp \
+       tools/exploder_composer.cpp \
+       server/variable.cpp \
+       tools/dummy_video.cpp \
+       config.cpp \
+       filesystem.cpp \
+       game_config.cpp \
+       sdl_utils.cpp \
+       log.cpp \
+       serialization/preprocessor.cpp \
+       serialization/string_utils.cpp \
+       zipios++/xcoll.cpp \
+       tools/exploder_composer.hpp \
+       tools/exploder_cutter.hpp \
+       tools/exploder_utils.hpp \
+       serialization/preprocessor.hpp \
+       serialization/string_utils.hpp \
+       zipios++/xcoll.hpp \
+       gettext.cpp
+
+cutter_SOURCES = \
+       tools/cutter.cpp \
+       tools/exploder_utils.cpp \
+       tools/exploder_cutter.cpp \
+       server/variable.cpp \
+       tools/dummy_video.cpp \
+       config.cpp \
+       filesystem.cpp \
+       game_config.cpp \
+       sdl_utils.cpp \
+       log.cpp \
+       serialization/preprocessor.cpp \
+       serialization/string_utils.cpp \
+       zipios++/xcoll.cpp \
+       tools/exploder_composer.hpp \
+       tools/exploder_cutter.hpp \
+       tools/exploder_utils.hpp \
+       serialization/preprocessor.hpp \
+       serialization/string_utils.hpp \
+       zipios++/xcoll.hpp \
+       gettext.cpp
+
+
+exploder_LDADD = @SDL_IMAGE_LIBS@ @SDL_LIBS@ $(LIBZIPIOS)
+cutter_LDADD = @SDL_IMAGE_LIBS@ @SDL_LIBS@ $(LIBZIPIOS)
+
 AM_CXXFLAGS = -I sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@ 
-DWESNOTH_PATH=\"$(pkgdatadir)\" \
        -DLOCALEDIR=\"$(LOCALEDIR)\" 
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR)
 
@@ -369,9 +457,12 @@
 CXXLD = $(LDPREFIX) $(CXX)
 
 
-LIBS = $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS) $(SDL_NET_LIBS) \
+THELIBS = $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS) $(SDL_NET_LIBS) \
        $(SDL_TTF_LIBS) $(SDL_LIBS) $(LIBZIPIOS) $(FREETYPE_LIBS) $(LIBINTL)
 
+wesnoth_LDADD = $(THELIBS)
+wesnoth_editor_LDADD = $(THELIBS)
+
 if STATIC
 LDFLAGS += -all-static
 endif