[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth ./Makefile.am ./configure.ac doc/man/Ma...
|
From: |
Guillaume Melquiond |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth ./Makefile.am ./configure.ac doc/man/Ma... |
|
Date: |
Thu, 03 Mar 2005 17:19:58 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Guillaume Melquiond <address@hidden> 05/03/03 22:19:58
Modified files:
. : Makefile.am configure.ac
doc/man : Makefile.am
src : Makefile.am
Log message:
Add a --disable-game option. Beautify ./configure --help. Don't install
all the manpages. Don't install data/ if not needed.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/Makefile.am.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.118&tr2=1.119&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/doc/man/Makefile.am.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.72&tr2=1.73&r1=text&r2=text
Patches:
Index: wesnoth/Makefile.am
diff -u wesnoth/Makefile.am:1.23 wesnoth/Makefile.am:1.24
--- wesnoth/Makefile.am:1.23 Sun Jan 23 15:57:04 2005
+++ wesnoth/Makefile.am Thu Mar 3 22:19:57 2005
@@ -24,6 +24,7 @@
install-data-local:
@$(NORMAL_INSTALL)
+if INSTALLDATA
test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
( $(finddata) ) | while read p; do \
@@ -45,12 +46,14 @@
convert -size $$dstsize -resize $$dstsize "$$d$$p"
"$(DESTDIR)$(pkgdatadir)/$$f"; \
done
endif
+endif
zip-install: install
$(top_srcdir)/utils/splittree "$(DESTDIR)$(pkgdatadir)" --zip
uninstall-local:
@$(NORMAL_UNINSTALL)
+if INSTALLDATA
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
( $(finddata) ) | while read p; do \
case $$p in \
@@ -60,6 +63,8 @@
echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
done
+endif
+
dist-hook:
srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
( $(finddata); $(findnoinst) ) | (cd $(top_srcdir) && tar cf - -T -) |
(cd $(distdir) && tar xf -)
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.118 wesnoth/configure.ac:1.119
--- wesnoth/configure.ac:1.118 Sun Feb 27 12:06:55 2005
+++ wesnoth/configure.ac Thu Mar 3 22:19:57 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.118 $])
+AC_REVISION([$Revision: 1.119 $])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([foreign 1.5])
@@ -24,23 +24,23 @@
#######################################################################
AC_ARG_ENABLE([debug],
- [ --enable-debug enable debug in wesnoth],
+ AS_HELP_STRING([--enable-debug], [enable debug in wesnoth]),
[if test "x${enableval}" = "xyes" ; then
CXXFLAGS="$CXXFLAGS -DDEBUG -O0 -ggdb3"
fi])
AC_ARG_ENABLE([static],
- [ --enable-static enable static building of wesnoth],
+ AS_HELP_STRING([--enable-static], [enable static building of
wesnoth]),
[static=$enableval],
[static=no])
AC_ARG_ENABLE([lite],
- [ --enable-lite enable lite version of wesnoth
(without music or large images)],
+ AS_HELP_STRING([--enable-lite], [enable lite version of wesnoth
(without music or large images)]),
[lite=$enableval],
[lite=no])
AC_ARG_ENABLE([tinygui],
- [ --enable-tinygui enable GUI reductions for resolutions
down to 320x240 (PDAs)],
+ AS_HELP_STRING([--enable-tinygui], [enable GUI reductions for
resolutions down to 320x240 (PDAs)]),
[tinygui=$enableval],
[tinygui=no])
@@ -51,9 +51,8 @@
AM_CONDITIONAL([TINYGUI], [test "x$tinygui" = "xyes"])
DATADIR=$PACKAGE
-AC_ARG_ENABLE([datadir-name],,[AC_MSG_ERROR([Please use --with-datadir-name
instead of obsolete --enable-datadir-name])])
AC_ARG_WITH([datadir-name],
- [ --with-datadir-name[[=dir]] change name of data directory.
[[wesnoth]]],
+ AS_HELP_STRING([--with-datadir-name@<:@=DIR@:>@], [change name of
data directory @<:@wesnoth@:>@]),
[case "${withval}" in
yes)
DATADIR="wesnoth"
@@ -69,7 +68,7 @@
#LOCALEDIR="$datadir/locale"
LOCALEDIR=translations
AC_ARG_WITH([localedir],
- [ --with-localedir=dir install locale data under dir
[[translations]]],
+ AS_HELP_STRING([--with-localedir@<:@=DIR@:>@], [install locale
data under dir @<:@translations@:>@]),
[case "${withval}" in
yes)
LOCALEDIR="translations"
@@ -92,7 +91,7 @@
# icondir and desktopdir may differ from datadir (suggested by Gentoo)
AC_ARG_WITH([icondir],
- [ --with-icondir=dir change icon directory under gnome],
+ AS_HELP_STRING([--with-icondir@<:@=DIR@:>@], [change icon
directory under gnome]),
[case "${withval}" in
yes)
ICONDIR="$(datadir)/icons"
@@ -106,7 +105,7 @@
AC_SUBST([ICONDIR])
AC_ARG_WITH([desktopdir],
- [ --with-desktopdir=dir change desktop directory under
gnome 2],
+ AS_HELP_STRING([--with-desktopdir@<:@=DIR@:>@], [change desktop
directory under gnome 2]),
[case "${withval}" in
yes)
DESKTOPDIR="$(datadir)/applications"
@@ -120,54 +119,58 @@
AC_SUBST([DESKTOPDIR])
+AC_ARG_ENABLE([game],
+ AS_HELP_STRING([--disable-game], [disable compilation of game]),
+ [game=$enableval],
+ [game=yes])
+
AC_ARG_ENABLE([server],
- [ --enable-server enable compilation of server],
+ AS_HELP_STRING([--enable-server], [enable compilation of
server]),
[server=$enableval],
[server=no])
AC_ARG_ENABLE([campaign_server],
- [ --enable-campaign-server enable compilation of campaign
server],
+ AS_HELP_STRING([--enable-campaign-server], [enable compilation
of campaign server]),
[campaignserver=$enableval],
[campaignserver=no])
AC_ARG_ENABLE([editor],
- [ --enable-editor enable compilation of map editor],
+ AS_HELP_STRING([--enable-editor], [enable compilation of map
editor]),
[editor=$enableval],
[editor=no])
AC_ARG_ENABLE([tools],
- [ --enable-tools enable compilation of tools for
translators and artists],
+ AS_HELP_STRING([--enable-tools], [enable compilation of tools
for translators and artists]),
[tools=$enableval],
[tools=no])
-AC_ARG_ENABLE([kde],,[AC_MSG_ERROR([Please use --with-kde instead of obsolete
--enable-kde])])
AC_ARG_WITH([kde],
- [ --with-kde enable installation of icon and KDE
menu entry],
+ AS_HELP_STRING([--with-kde], [enable installation of icon and KDE
menu entry]),
[kde=$withval],
[kde=no])
-AC_ARG_ENABLE([gnome],,[AC_MSG_ERROR([Please use --with-gnome instead of
obsolete --enable-gnome])])
AC_ARG_WITH([gnome],
- [ --with-gnome enable installation of icon and GNOME
menu entry],
+ AS_HELP_STRING([--with-gnome], [enable installation of icon and
GNOME menu entry]),
[gnome=$withval],
[gnome=no])
AC_ARG_ENABLE([gnome1],
- [ --disable-gnome1 disable installation of icon and menu
entry in GNOME1],
+ AS_HELP_STRING([--disable-gnome1], [disable installation of icon
and menu entry in GNOME1]),
[gnome1=$enableval],
[gnome1=yes])
AC_ARG_ENABLE([gnome2],
- [ --disable-gnome2 disable installation of icon and
menu entry in GNOME2],
+ AS_HELP_STRING([--disable-gnome2], [disable installation of icon
and menu entry in GNOME2]),
[gnome2=$enableval],
[gnome2=yes])
AC_ARG_ENABLE([wzip],
- [ --enable-wzip enable compilation of wesnoth_zip
program],
+ AS_HELP_STRING([--enable-wzip], [enable compilation of
wesnoth_zip program]),
[wzip=$enableval],
[wzip=no])
AM_CONDITIONAL([STATIC], [test x$static = xyes])
+AM_CONDITIONAL([GAME], [test x$game = xyes])
AM_CONDITIONAL([SERVER], [test x$server = xyes])
AM_CONDITIONAL([CAMPAIGNSERVER], [test x$campaignserver = xyes])
AM_CONDITIONAL([EDITOR], [test x$editor = xyes])
@@ -175,6 +178,7 @@
AM_CONDITIONAL([GCC], [test x$GXX = xyes])
AM_CONDITIONAL([WZIP], [test x$wzip = xyes])
AM_CONDITIONAL([INCLUDEDINTL], [test x$nls_cv_use_gnu_gettext = xyes])
+AM_CONDITIONAL([INSTALLDATA], [test x$game = xyes || x$editor = xyes])
#######################################################################
# Checks for programs. #
@@ -235,9 +239,9 @@
# Check for SDL version. Taken from sdl.m4
AC_ARG_ENABLE([sdltest],
- [ --disable-sdltest do not try to compile and run a test
SDL program],
+ AS_HELP_STRING([--disable-sdltest], [do not try to compile and
run a test SDL program]),
,
- enable_sdltest=yes)
+ [enable_sdltest=yes])
min_sdl_version=1.2.7
AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
@@ -459,12 +463,15 @@
dnl Get the cflags and libraries from the freetype-config script
dnl
-AC_ARG_WITH(freetype-prefix,[ --with-freetype-prefix=PFX Prefix where
FREETYPE is
-installed (optional)],
- freetype_prefix="$withval", freetype_prefix="")
-AC_ARG_WITH(freetype-exec-prefix,[ --with-freetype-exec-prefix=PFX Exec
prefix
-where FREETYPE is installed (optional)],
- freetype_exec_prefix="$withval", freetype_exec_prefix="")
+AC_ARG_WITH([freetype-prefix],
+ AS_HELP_STRING([--with-freetype-prefix=PFX], [Prefix where
FREETYPE is installed (optional)]),
+ [freetype_prefix="$withval"],
+ [freetype_prefix=""])
+
+AC_ARG_WITH([freetype-exec-prefix],
+ AS_HELP_STRING([--with-freetype-exec-prefix=PFX], [Exec prefix
where FREETYPE is installed (optional)]),
+ [freetype_exec_prefix="$withval"],
+ [freetype_exec_prefix=""])
if test x$freetype_exec_prefix != x ; then
freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix"
Index: wesnoth/doc/man/Makefile.am
diff -u wesnoth/doc/man/Makefile.am:1.3 wesnoth/doc/man/Makefile.am:1.4
--- wesnoth/doc/man/Makefile.am:1.3 Tue Jan 25 14:22:41 2005
+++ wesnoth/doc/man/Makefile.am Thu Mar 3 22:19:58 2005
@@ -1,5 +1,17 @@
MAN_LANG = de
-dist_man6_MANS = wesnoth.6 wesnothd.6 wesnoth_editor.6
+dist_man6_MANS =
+
+if GAME
+dist_man6_MANS += wesnoth.6
+endif
+
+if SERVER
+dist_man6_MANS += wesnothd.6
+endif
+
+if EDITOR
+dist_man6_MANS += wesnoth_editor.6
+endif
install-data-hook:
for i in $(MAN_LANG); do \
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.72 wesnoth/src/Makefile.am:1.73
--- wesnoth/src/Makefile.am:1.72 Mon Feb 21 09:05:51 2005
+++ wesnoth/src/Makefile.am Thu Mar 3 22:19:58 2005
@@ -4,7 +4,11 @@
SUBDIRS += server
endif
-bin_PROGRAMS = wesnoth
+bin_PROGRAMS =
+
+if GAME
+bin_PROGRAMS += wesnoth
+endif
if CAMPAIGNSERVER
bin_PROGRAMS += campaignd
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth ./Makefile.am ./configure.ac doc/man/Ma...,
Guillaume Melquiond <=