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.
This commit is contained in:
Guillaume Melquiond
parent
e77411ae2a
commit
ff4c75fc0f
4 changed files with 96 additions and 102 deletions
|
|
@ -718,8 +718,6 @@ AC_CONFIG_FILES([Makefile
|
|||
icons/Makefile
|
||||
src/Makefile
|
||||
src/server/Makefile
|
||||
src/campaign_server/Makefile
|
||||
src/tools/Makefile
|
||||
src/zip/Makefile
|
||||
doc/Makefile
|
||||
doc/man/Makefile])
|
||||
|
|
|
|||
101
src/Makefile.am
101
src/Makefile.am
|
|
@ -4,16 +4,16 @@ if SERVER
|
|||
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 @@ wesnoth_editor_SOURCES = editor/editor.cpp \
|
|||
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 @@ endif
|
|||
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
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
bin_PROGRAMS = campaignd
|
||||
|
||||
#############################################################################
|
||||
# Campaign Server #
|
||||
#############################################################################
|
||||
|
||||
campaignd_SOURCES = 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
|
||||
|
||||
AM_CXXFLAGS = @SDL_CFLAGS@ -DLOCALEDIR=\"$(LOCALEDIR)\" -I$(srcdir)/..
|
||||
LDADD = @SDL_NET_LIBS@ @SDL_LIBS@ $(LIBZIPIOS)
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
#############################################################################
|
||||
# Castle building helpers #
|
||||
#############################################################################
|
||||
|
||||
if LIBPNG
|
||||
|
||||
bin_PROGRAMS = exploder cutter
|
||||
|
||||
AM_CXXFLAGS = @SDL_CFLAGS@ @PNG_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" -I../ \
|
||||
-DLOCALEDIR=\"$(LOCALEDIR)\" -I$(srcdir)/.. -I../sdl_ttf
|
||||
|
||||
exploder_SOURCES = exploder.cpp \
|
||||
exploder_utils.cpp \
|
||||
exploder_cutter.cpp \
|
||||
exploder_composer.cpp \
|
||||
../server/variable.cpp \
|
||||
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 \
|
||||
exploder_composer.hpp \
|
||||
exploder_cutter.hpp \
|
||||
exploder_utils.hpp \
|
||||
../serialization/preprocessor.hpp \
|
||||
../serialization/string_utils.hpp \
|
||||
../zipios++/xcoll.hpp \
|
||||
../gettext.cpp
|
||||
|
||||
cutter_SOURCES = cutter.cpp \
|
||||
exploder_utils.cpp \
|
||||
exploder_cutter.cpp \
|
||||
../server/variable.cpp \
|
||||
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 \
|
||||
exploder_composer.hpp \
|
||||
exploder_cutter.hpp \
|
||||
exploder_utils.hpp \
|
||||
../serialization/preprocessor.hpp \
|
||||
../serialization/string_utils.hpp \
|
||||
../zipios++/xcoll.hpp \
|
||||
../gettext.cpp
|
||||
|
||||
|
||||
exploder_LDADD = @SDL_IMAGE_LIBS@ @PNG_LIBS@ @SDL_LIBS@ $(LIBZIPIOS)
|
||||
cutter_LDADD = @SDL_IMAGE_LIBS@ @PNG_LIBS@ @SDL_LIBS@ $(LIBZIPIOS)
|
||||
|
||||
endif
|
||||
Loading…
Add table
Reference in a new issue