Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename top_srcdir/top_builddir to abs_top_srcdir/abs_top_builddir, to make this more obvious. 

Their use is currently flawed, since it will not work in directories with spaces in them... (


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5319 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2008-06-24 20:19:54 +00:00
parent ee0be13767
commit 73b35ab8d6
27 changed files with 87 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.raw
View File

@ -3,16 +3,18 @@ SUBDIRS=build_tools po win32 lib src data pkg
# Figure out top source dir: The Makefile.raw will be in it, and it is relative to this directory
build_path:=$(patsubst %/Makefile.raw,%,$(lastword $(MAKEFILE_LIST)))
ifneq ($(strip $(build_path)),Makefile.raw)
export top_srcdir:=$(CURDIR)/$(build_path)
export abs_top_srcdir:=$(CURDIR)/$(build_path)
else
export top_srcdir:=$(CURDIR)
export abs_top_srcdir:=$(CURDIR)
endif
# Top build dir is this directory
export top_builddir:=$(CURDIR)
export abs_top_builddir:=$(CURDIR)
include $(top_srcdir)/makerules/configure.mk
include $(top_srcdir)/makerules/submake.mk
# FIXME: Using abs_top_* is affected by whitespace problems
include $(abs_top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/submake.mk
src: build_tools win32 lib
pkg: data src po

4
build_tools/Makefile.raw
View File

@ -1,5 +1,5 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SUBDIRS=autorevision
include $(top_srcdir)/makerules/submake.mk
include $(abs_top_srcdir)/makerules/submake.mk

8
build_tools/autorevision/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
# Hacks to build for compiling system, not for target
CC:=g++
@ -13,17 +13,17 @@ SRC=autorevision.cpp
EXE=autorevision
include $(top_srcdir)/makerules/exe.mk
include $(abs_top_srcdir)/makerules/exe.mk
.PHONY: all all-local clean clean-local
all: all-local
all-local: $(EXE)$(EXEEXT)
$(builddir)$(DIRSEP)$(EXE)$(EXEEXT) +cstr -v $(top_srcdir) $(top_builddir)/src/autorevision.h
$(builddir)$(DIRSEP)$(EXE)$(EXEEXT) +cstr -v $(abs_top_srcdir) $(abs_top_builddir)/src/autorevision.h
clean-local:
-$(RM_F) $(top_builddir)/src/autorevision.h
-$(RM_F) $(abs_top_builddir)/src/autorevision.h
clean: clean-local
$(RM_F) $(DEPS) $(EXE)$(EXEEXT)

4
data/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SUBDIRS=mods
@ -13,7 +13,7 @@ PATCHARCHIVE=mp.wz
CLEANFILES=$(BASEARCHIVE) $(PATCHARCHIVE)
include $(top_srcdir)/makerules/submake.mk
include $(abs_top_srcdir)/makerules/submake.mk
.PHONY: all clean $(BASEARCHIVE) $(PATCHARCHIVE) $(SUBDIRS)

4
data/mods/Makefile.raw
View File

@ -1,5 +1,5 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SUBDIRS=global
include $(top_srcdir)/makerules/submake.mk
include $(abs_top_srcdir)/makerules/submake.mk

2
data/mods/global/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
AIVOLUTIONLIST=multiplay commands.txt
GRIMLIST=components structs texpages wrf COPYING

4
lib/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SUBDIRS=framework \
exceptionhandler \
@ -12,4 +12,4 @@ SUBDIRS=framework \
sqlite3 \
widget
include $(top_srcdir)/makerules/submake.mk
include $(abs_top_srcdir)/makerules/submake.mk

4
lib/exceptionhandler/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SRC=dumpinfo.cpp \
exceptionhandler.c \
@ -6,4 +6,4 @@ SRC=dumpinfo.cpp \
LIB=exceptionhandler
include $(top_srcdir)/makerules/lib.mk
include $(abs_top_srcdir)/makerules/lib.mk

4
lib/framework/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SRC=configfile.c \
cursors.c \
@ -26,4 +26,4 @@ LIB=framework
CLEANFILES=strres_parser.tab.h resource_parser.tab.h
include $(top_srcdir)/makerules/lib.mk
include $(abs_top_srcdir)/makerules/lib.mk

4
lib/gamelib/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SRC=anim.c \
animobj.c \
@ -11,4 +11,4 @@ LIB=gamelib
CLEANFILES=audp_parser.tab.h
include $(top_srcdir)/makerules/lib.mk
include $(abs_top_srcdir)/makerules/lib.mk

4
lib/ivis_common/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SRC=bitimage.c \
imd.c \
@ -9,4 +9,4 @@ SRC=bitimage.c \
LIB=ivis_common
include $(top_srcdir)/makerules/lib.mk
include $(abs_top_srcdir)/makerules/lib.mk

4
lib/ivis_opengl/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SRC=GLee.c \
ivi.c \
@ -16,4 +16,4 @@ SRC=GLee.c \
LIB=ivis_opengl
include $(top_srcdir)/makerules/lib.mk
include $(abs_top_srcdir)/makerules/lib.mk

4
lib/netplay/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SRC=netjoin_stub.c \
netlog.c \
@ -7,4 +7,4 @@ SRC=netjoin_stub.c \
LIB=netplay
include $(top_srcdir)/makerules/lib.mk
include $(abs_top_srcdir)/makerules/lib.mk

4
lib/script/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SRC=codeprint.c \
event.c \
@ -15,5 +15,5 @@ LIB=script
CLEANFILES=chat_parser.tab.h script_parser.tab.h
include $(top_srcdir)/makerules/lib.mk
include $(abs_top_srcdir)/makerules/lib.mk

4
lib/sequence/Makefile.raw
View File

@ -1,7 +1,7 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SRC=sequence.c
LIB=sequence
include $(top_srcdir)/makerules/lib.mk
include $(abs_top_srcdir)/makerules/lib.mk

4
lib/sound/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SRC=audio.c \
audio_id.c \
@ -11,4 +11,4 @@ SRC=audio.c \
LIB=sound
include $(top_srcdir)/makerules/lib.mk
include $(abs_top_srcdir)/makerules/lib.mk

4
lib/sqlite3/Makefile.raw
View File

@ -1,7 +1,7 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SRC=physfs_vfs.c sqlite3.c
LIB=sqlite3
include $(top_srcdir)/makerules/lib.mk
include $(abs_top_srcdir)/makerules/lib.mk

4
lib/widget/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SRC=bar.c \
button.c \
@ -12,4 +12,4 @@ SRC=bar.c \
LIB=widget
include $(top_srcdir)/makerules/lib.mk
include $(abs_top_srcdir)/makerules/lib.mk

34
makerules/configure.mk
View File

@ -1,4 +1,4 @@
include $(top_builddir)/config.mk
include $(abs_top_builddir)/config.mk
# Check for unset config
@ -8,62 +8,62 @@ ifeq ($(MAKELEVEL),0)
$(info Checking config...)
ifeq ($(strip $(PACKAGE)),)
$(error You must set PACKAGE in $(top_srcdir)/makerules/config.mk)
$(error You must set PACKAGE in $(abs_top_srcdir)/makerules/config.mk)
else
$(info PACKAGE := $(PACKAGE))
endif
ifeq ($(strip $(PACKAGE_NAME)),)
$(error You must set PACKAGE_NAME in $(top_srcdir)/makerules/config.mk)
$(error You must set PACKAGE_NAME in $(abs_top_srcdir)/makerules/config.mk)
else
$(info PACKAGE_NAME := $(PACKAGE_NAME))
endif
ifeq ($(strip $(PACKAGE_VERSION)),)
$(error You must set PACKAGE_VERSION in $(top_srcdir)/makerules/config.mk)
$(error You must set PACKAGE_VERSION in $(abs_top_srcdir)/makerules/config.mk)
else
$(info PACKAGE_VERSION := $(PACKAGE_VERSION))
endif
ifeq ($(strip $(PACKAGE_BUGREPORT)),)
$(error You must set PACKAGE_BUGREPORT in $(top_srcdir)/makerules/config.mk)
$(error You must set PACKAGE_BUGREPORT in $(abs_top_srcdir)/makerules/config.mk)
else
$(info PACKAGE_BUGREPORT := $(PACKAGE_BUGREPORT))
endif
ifeq ($(strip $(PLATFORM)),)
$(error You must set PLATFORM in $(top_srcdir)/makerules/config.mk)
$(error You must set PLATFORM in $(abs_top_srcdir)/makerules/config.mk)
else
$(info PLATFORM := $(PLATFORM))
endif
ifeq ($(strip $(MODE)),)
$(error You must set MODE in $(top_srcdir)/makerules/config.mk)
$(error You must set MODE in $(abs_top_srcdir)/makerules/config.mk)
else
$(info MODE := $(MODE))
endif
ifeq ($(strip $(DEVDIR)),)
$(error You must set DEVDIR in $(top_srcdir)/makerules/config.mk)
$(error You must set DEVDIR in $(abs_top_srcdir)/makerules/config.mk)
else
$(info DEVDIR := $(DEVDIR))
endif
ifeq ($(strip $(BISON)),)
$(error You must set BISON in $(top_srcdir)/makerules/config.mk)
$(error You must set BISON in $(abs_top_srcdir)/makerules/config.mk)
else
$(info BISON := $(BISON))
endif
ifeq ($(strip $(FLEX)),)
$(error You must set FLEX in $(top_srcdir)/makerules/config.mk)
$(error You must set FLEX in $(abs_top_srcdir)/makerules/config.mk)
else
$(info FLEX := $(FLEX))
endif
ifneq ($(strip $(INSTALLER)),)
ifeq ($(strip $(MAKENSIS)),)
$(error You must set MAKENSIS in $(top_srcdir)/makerules/config.mk)
$(error You must set MAKENSIS in $(abs_top_srcdir)/makerules/config.mk)
else
$(info MAKENSIS is := $(MAKENSIS))
endif
@ -76,11 +76,11 @@ endif
# Find ourselves
sub_path:=$(patsubst $(top_builddir)/%,%,$(CURDIR))
ifneq ($(strip $(sub_path)),$(top_builddir))
srcdir:=$(top_srcdir)/$(sub_path)
sub_path:=$(patsubst $(abs_top_builddir)/%,%,$(CURDIR))
ifneq ($(strip $(sub_path)),$(abs_top_builddir))
srcdir:=$(abs_top_srcdir)/$(sub_path)
else
srcdir:=$(top_srcdir)
srcdir:=$(abs_top_srcdir)
endif
builddir:=$(CURDIR)
@ -88,7 +88,7 @@ builddir:=$(CURDIR)
# Setup paths and static values
CPPFLAGS+=-DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -DYY_STATIC -I$(builddir) -I$(srcdir) -I$(top_srcdir) -I$(DEVDIR)/include/SDL -I$(DEVDIR)/include/libpng12 -I$(DEVDIR)/include/bfd -I$(DEVDIR)/include
CPPFLAGS+=-DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -DYY_STATIC -I$(builddir) -I$(srcdir) -I$(abs_top_srcdir) -I$(DEVDIR)/include/SDL -I$(DEVDIR)/include/libpng12 -I$(DEVDIR)/include/bfd -I$(DEVDIR)/include
CFLAGS+=-std=gnu99
CXXFLAGS+=
LDFLAGS+=-L$(DEVDIR)/lib
@ -178,4 +178,4 @@ endif
LDFLAGS+=-liconv -lz -lfreetype -lfontconfig -lexpat
include $(top_srcdir)/makerules/common.mk
include $(abs_top_srcdir)/makerules/common.mk

2
makerules/exe.mk
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/common.mk
include $(abs_top_srcdir)/makerules/common.mk
DEPS=$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(patsubst %.rc,%.o,$(SRC)))) $(LIBS)

8
makerules/lib.mk
View File

@ -1,11 +1,11 @@
include $(top_srcdir)/makerules/common.mk
include $(abs_top_srcdir)/makerules/common.mk
.PHONY: all clean
all: $(top_builddir)/lib/lib$(LIB).a
all: $(abs_top_builddir)/lib/lib$(LIB).a
$(top_builddir)/lib/lib$(LIB).a: $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SRC)))
$(abs_top_builddir)/lib/lib$(LIB).a: $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SRC)))
$(AR) rcv $@ $^
clean:
$(RM_F) $(top_builddir)/lib/lib$(LIB).a *.o $(CLEANFILES)
$(RM_F) $(abs_top_builddir)/lib/lib$(LIB).a *.o $(CLEANFILES)

4
pkg/Makefile.raw
View File

@ -1,5 +1,5 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SUBDIRS=nsis
include $(top_srcdir)/makerules/submake.mk
include $(abs_top_srcdir)/makerules/submake.mk

4
pkg/nsis/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SETUPFILE=$(PACKAGE)-$(PACKAGE_VERSION).exe
@ -7,7 +7,7 @@ ifdef INSTALLER
all: $(SETUPFILE)
endif
$(SETUPFILE): $(srcdir)/warzone2100.nsi $(top_builddir)/src/warzone2100.exe $(top_builddir)/data/base.wz $(top_builddir)/data/mp.wz $(top_builddir)/data/mods/global/grim.wz
$(SETUPFILE): $(srcdir)/warzone2100.nsi $(abs_top_builddir)/src/warzone2100.exe $(abs_top_builddir)/data/base.wz $(abs_top_builddir)/data/mp.wz $(abs_top_builddir)/data/mods/global/grim.wz
$(MAKENSIS) -DPACKAGE="$(PACKAGE)" -DPACKAGE_NAME="$(PACKAGE_NAME)" -DPACKAGE_VERSION="$(PACKAGE_VERSION)" -DPACKAGE_BUGREPORT="$(PACKAGE_BUGREPORT)" -DVERSIONNUM="$(INSTALLER_VERSION)" -DEXTDIR="$(DEVDIR)\bin" -DLOCALEDIR=$(LOCALEDIR) $<
clean:

4
po/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
include $(srcdir)/Makevars
@ -17,7 +17,7 @@ mo-files: $(MO_FILES)
update-po: clean all
$(DOMAIN).pot: $(srcdir)/POTFILES.in
$(XGETTEXT) $(XGETTEXT_OPTIONS) --default-domain=$(DOMAIN) --copyright-holder=$(COPYRIGHT_HOLDER) --msgid-bugs-address=$(MSGID_BUGS_ADDRESS) --directory=$(top_builddir) --add-comments=TRANSLATORS: --files-from=$<
$(XGETTEXT) $(XGETTEXT_OPTIONS) --default-domain=$(DOMAIN) --copyright-holder=$(COPYRIGHT_HOLDER) --msgid-bugs-address=$(MSGID_BUGS_ADDRESS) --directory=$(abs_top_builddir) --add-comments=TRANSLATORS: --files-from=$<
mv $(DOMAIN).po $@
$(srcdir)/%.po: $(srcdir)/$(DOMAIN).pot

28
src/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
SRC=ai.c \
aiexperience.c \
@ -106,24 +106,24 @@ SRC=ai.c \
version.c \
warzoneconfig.c
LIBS=$(top_builddir)/lib/libgamelib.a \
$(top_builddir)/lib/libivis_common.a \
$(top_builddir)/lib/libivis_opengl.a \
$(top_builddir)/lib/libnetplay.a \
$(top_builddir)/lib/libscript.a \
$(top_builddir)/lib/libsequence.a \
$(top_builddir)/lib/libsound.a \
$(top_builddir)/lib/libwidget.a \
$(top_builddir)/lib/libframework.a \
$(top_builddir)/lib/libexceptionhandler.a \
$(top_builddir)/lib/libsqlite3.a
LIBS=$(abs_top_builddir)/lib/libgamelib.a \
$(abs_top_builddir)/lib/libivis_common.a \
$(abs_top_builddir)/lib/libivis_opengl.a \
$(abs_top_builddir)/lib/libnetplay.a \
$(abs_top_builddir)/lib/libscript.a \
$(abs_top_builddir)/lib/libsequence.a \
$(abs_top_builddir)/lib/libsound.a \
$(abs_top_builddir)/lib/libwidget.a \
$(abs_top_builddir)/lib/libframework.a \
$(abs_top_builddir)/lib/libexceptionhandler.a \
$(abs_top_builddir)/lib/libsqlite3.a
ifeq ($(strip $(PLATFORM)),windows)
LIBS += $(top_builddir)/win32/warzone2100.o
LIBS += $(abs_top_builddir)/win32/warzone2100.o
endif
EXE=warzone2100
CLEANFILES=scriptvals_parser.tab.h
include $(top_srcdir)/makerules/exe.mk
include $(abs_top_srcdir)/makerules/exe.mk

4
tools/lobbyserver_cpp/src/Makefile.raw
View File

@ -14,13 +14,13 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
OBJS=main.o lobby/read_write_mutex.o networking/tcp_server.o lobby/lobby.o lobby/game.o lobby/raii_counter.o lobby/lobby_iterator.o lobby/lobby_gamelock.o requesthandler.o networking/nattester.o
BOOST_DIR=C:/boost_1_33_1
BOOST_ASIO_DIR=C:/boost_asio_0_3_7
WARZONE_LIBDIR=$(top_builddir)/lib
WARZONE_LIBDIR=$(abs_top_builddir)/lib
ifeq ($(RELEASE),)
BOOST_THREADS=$(BOOST_DIR)/bin/boost/libs/thread/build/libboost_thread.lib/mingw/debug/threading-multi/libboost_thread-mgw-mt-d-1_33_1.lib

2
win32/Makefile.raw
View File

@ -1,4 +1,4 @@
include $(top_srcdir)/makerules/configure.mk
include $(abs_top_srcdir)/makerules/configure.mk
ifeq ($(strip $(PLATFORM)),windows)
all: warzone2100.o