Author: esr
Date: Thu Apr 19 05:40:21 2007
New Revision: 16929
URL: http://svn.gna.org/viewcvs/wesnoth?rev=16929&view=rev
Log:
This is more of the SVNREV machinery. SVN version will now be
both available from game_config.cpp and properly updated from
each svn up or local mod operation.
Modified:
trunk/src/Makefile.am
Modified: trunk/src/Makefile.am
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/Makefile.am?rev=16929&r1=16928&r2=16929&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Thu Apr 19 05:40:21 2007
@@ -32,12 +32,6 @@
THELIBS = -L. -lwesnoth-core $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS)
$(SDL_NET_LIBS) \
$(SDL_TTF_LIBS) $(SDL_LIBS) $(PYTHON_LIBS) $(LIBZIPIOS)
$(FREETYPE_LIBS) $(LIBINTL)
-
-# Should be touched each time the SVN revision number goes up
-version-stamp: FORCE
- if [ x"$(SVNREV)" != x`cat version-stamp 2>/dev/null` ]; then echo -n
$(SVNREV) >version-stamp; fi
-
-FORCE:
#############################################################################
# Wesnoth #
@@ -478,6 +472,17 @@
serialization/tokenizer.cpp \
zipios++/xcoll.cpp
+# Until game_config.cpp is removed, this will be needed to ensure that the
+# SVNVER constant gets updated correctly. If and when that definition is
+# moved elsewhere, this dependency must follow it.
+game_config.o: revision-stamp
+
+# Should be touched each time the SVN revision number goes up
+revision-stamp: FORCE
+ if [ x"$(SVNREV)" != x`cat revision-stamp 2>/dev/null` ]; then echo -n
$(SVNREV) >revision-stamp; fi
+
+FORCE:
+
AM_CXXFLAGS = -I $(srcdir)/sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@
@PYTHON_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" \
-DLOCALEDIR=\"$(LOCALEDIR)\"
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR) -DFIFODIR=\"$(fifodir)\"
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
