0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drag wesnothd into src/ ...

Browse source 
and drop the object files into their subdirectories to avoid
superfluous compilations.
This commit is contained in:
Guillaume Melquiond 2005-03-03 23:04:00 +00:00
parent 4ce76d74ed
commit bbd5709614
3 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -187,6 +187,7 @@ AM_CONDITIONAL([INSTALLDATA], [test x$game = xyes || x$editor = xyes])
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 @@ AC_CONFIG_FILES([Makefile
intl/Makefile
icons/Makefile
src/Makefile
src/server/Makefile
src/zip/Makefile
doc/Makefile
doc/man/Makefile])

50
src/Makefile.am
View file

@ -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
@ -363,6 +364,47 @@ wesnoth_editor_SOURCES = editor/editor.cpp \
sdl_ttf/SDL_ttf.h \
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 #
#############################################################################

42
src/server/Makefile.am
View file

@ -1,42 +0,0 @@
bin_PROGRAMS = wesnothd
#############################################################################
# Wesnothd Server #
#############################################################################
wesnothd_SOURCES = game.cpp \
input_stream.cpp \
metrics.cpp \
player.cpp \
server.cpp \
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 \
game.hpp \
../game_events.hpp \
input_stream.hpp \
metrics.hpp \
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
AM_CXXFLAGS = @SDL_CFLAGS@ -DLOCALEDIR=\"$(LOCALEDIR)\" -I$(srcdir)/..
LDADD = @SDL_NET_LIBS@ @SDL_LIBS@ $(LIBZIPIOS)