Use libtool when available to build static binary...
(on current Debian Sarge at least it needs manual fix to libSDL_image.la, and manually rerunning final link command with -gpm added, bugs submitted). Moved config options at top of configure.ac so that they can be used later. Simplified LIBS setting in Makefile.am.
This commit is contained in:
parent
7daa6c4d6b
commit
112830d8ad
11 changed files with 692 additions and 649 deletions
20
Makefile.in
20
Makefile.in
|
@ -1,4 +1,4 @@
|
|||
# Makefile.in generated by automake 1.8.3 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.8.5 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
|
@ -161,6 +161,7 @@ KDE_FALSE = @KDE_FALSE@
|
|||
KDE_ICON = @KDE_ICON@
|
||||
KDE_TRUE = @KDE_TRUE@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LDPREFIX = @LDPREFIX@
|
||||
LIBICONV = @LIBICONV@
|
||||
LIBINTL = @LIBINTL@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
|
@ -170,6 +171,7 @@ LIBS = @LIBS@
|
|||
LTLIBICONV = @LTLIBICONV@
|
||||
LTLIBINTL = @LTLIBINTL@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LTOOL = @LTOOL@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
|
@ -476,14 +478,16 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|
|||
$(TAGS_FILES) $(LISP)
|
||||
tags=; \
|
||||
here=`pwd`; \
|
||||
if (etags --etags-include --version) >/dev/null 2>&1; then \
|
||||
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
|
||||
include_option=--etags-include; \
|
||||
empty_fix=.; \
|
||||
else \
|
||||
include_option=--include; \
|
||||
empty_fix=; \
|
||||
fi; \
|
||||
list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
if test "$$subdir" = .; then :; else \
|
||||
test -f $$subdir/TAGS && \
|
||||
test ! -f $$subdir/TAGS || \
|
||||
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
|
||||
fi; \
|
||||
done; \
|
||||
|
@ -493,9 +497,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|
|||
done | \
|
||||
$(AWK) ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
test -z "$(ETAGS_ARGS)$$tags$$unique" \
|
||||
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||
$$tags $$unique
|
||||
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
||||
test -n "$$unique" || unique=$$empty_fix; \
|
||||
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||
$$tags $$unique; \
|
||||
fi
|
||||
ctags: CTAGS
|
||||
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|
||||
$(TAGS_FILES) $(LISP)
|
||||
|
@ -604,7 +610,7 @@ distcheck: dist
|
|||
*.tar.Z*) \
|
||||
uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
|
||||
*.shar.gz*) \
|
||||
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
|
||||
GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
|
||||
*.zip*) \
|
||||
unzip $(distdir).zip ;;\
|
||||
esac
|
||||
|
|
15
aclocal.m4
vendored
15
aclocal.m4
vendored
|
@ -1,4 +1,4 @@
|
|||
# generated automatically by aclocal 1.8.3 -*- Autoconf -*-
|
||||
# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
|
||||
# Free Software Foundation, Inc.
|
||||
|
@ -40,7 +40,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
|
|||
# Call AM_AUTOMAKE_VERSION so it can be traced.
|
||||
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
|
||||
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
||||
[AM_AUTOMAKE_VERSION([1.8.3])])
|
||||
[AM_AUTOMAKE_VERSION([1.8.5])])
|
||||
|
||||
# AM_AUX_DIR_EXPAND
|
||||
|
||||
|
@ -266,9 +266,14 @@ AC_CACHE_CHECK([dependency style of $depcc],
|
|||
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
|
||||
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
||||
# icc doesn't choke on unknown options, it will just issue warnings
|
||||
# (even with -Werror). So we grep stderr for any message
|
||||
# that says an option was ignored.
|
||||
if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
|
||||
# or remarks (even with -Werror). So we grep stderr for any message
|
||||
# that says an option was ignored or not supported.
|
||||
# When given -MP, icc 7.0 and 7.1 complain thusly:
|
||||
# icc: Command line warning: ignoring option '-M'; no argument required
|
||||
# The diagnosis changed in icc 8.0:
|
||||
# icc: Command line remark: option '-MP' not supported
|
||||
if (grep 'ignoring option' conftest.err ||
|
||||
grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
|
||||
am_cv_$1_dependencies_compiler_type=$depmode
|
||||
break
|
||||
fi
|
||||
|
|
194
configure.ac
194
configure.ac
|
@ -20,6 +20,83 @@ AC_CONFIG_HEADER([config.h])
|
|||
AM_MAINTAINER_MODE
|
||||
AM_GNU_GETTEXT
|
||||
|
||||
#######################################################################
|
||||
# Configuration options #
|
||||
#######################################################################
|
||||
|
||||
AC_ARG_ENABLE([debug],
|
||||
[ --enable-debug Enable debug in wesnoth],
|
||||
[if test "x${enableval}" = "xyes" ; then
|
||||
CXXFLAGS="$CXXFLAGS -DDEBUG -ggdb3"
|
||||
fi])
|
||||
|
||||
AC_ARG_ENABLE([static],
|
||||
[ --enable-static Enable static building of wesnoth],
|
||||
[static=$enableval],
|
||||
[static=no])
|
||||
|
||||
AC_ARG_ENABLE([lite],
|
||||
[ --enable-lite Enable lite version of wesnoth (without music)],
|
||||
[lite=$enableval],
|
||||
[lite=no])
|
||||
|
||||
DATADIR=$PACKAGE
|
||||
AC_ARG_ENABLE([datadir-name],
|
||||
[ --datadir-name[[=dir]] Change name of data directory. Default with this option: wesnoth-data],
|
||||
[case "${enableval}" in
|
||||
yes)
|
||||
DATADIR="wesnoth-data"
|
||||
;;
|
||||
no)
|
||||
;;
|
||||
*)
|
||||
DATADIR="${enableval}"
|
||||
;;
|
||||
esac])
|
||||
|
||||
AC_SUBST([DATADIR])
|
||||
|
||||
AC_ARG_ENABLE([server],
|
||||
[ --enable-server Enable compilation of server],
|
||||
[server=$enableval],
|
||||
[server=no])
|
||||
|
||||
AC_ARG_ENABLE([editor],
|
||||
[ --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],
|
||||
[tools=$enableval],
|
||||
[tools=no])
|
||||
|
||||
AC_ARG_ENABLE([kde],
|
||||
[ --enable-kde Enable installation of icon and KDE menu entry],
|
||||
[kde=$enableval],
|
||||
[kde=no])
|
||||
|
||||
AC_ARG_ENABLE([gnome],
|
||||
[ --enable-gnome Enable installation of icon and GNOME menu entry],
|
||||
[gnome=$enableval],
|
||||
[gnome=no])
|
||||
|
||||
AC_ARG_ENABLE([wzip],
|
||||
[ --enable-wzip Enable compilation of wesnoth_zip program],
|
||||
[wzip=$enableval],
|
||||
[wzip=no])
|
||||
|
||||
AM_CONDITIONAL([STATIC], [test x$static = xyes])
|
||||
AM_CONDITIONAL([SERVER], [test x$server = xyes])
|
||||
AM_CONDITIONAL([EDITOR], [test x$editor = xyes])
|
||||
AM_CONDITIONAL([TOOLS], [test x$tools = xyes])
|
||||
AM_CONDITIONAL([KDE], [test x$kde = xyes && test x$kdefound = xyes])
|
||||
AM_CONDITIONAL([GNOME1], [test x$gnome = xyes && test x$gnome1found = xyes])
|
||||
AM_CONDITIONAL([GNOME2], [test x$gnome = xyes && test x$gnome1found = xno])
|
||||
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])
|
||||
|
||||
#######################################################################
|
||||
# Checks for programs. #
|
||||
#######################################################################
|
||||
|
@ -222,7 +299,22 @@ AC_SUBST([KDE_ICON])
|
|||
# Checks for libraries. #
|
||||
#######################################################################
|
||||
|
||||
SDL_LIBS=`$SDL_CONFIG --libs`
|
||||
# Use a modified version of ac_link so that libtool gets called
|
||||
AC_PATH_PROG([LTOOL], [libtool], [])
|
||||
if test "$static" = "yes" -a -n "$LTOOL"
|
||||
then
|
||||
LDPREFIX="$LTOOL --mode=link"
|
||||
else
|
||||
LDPREFIX=""
|
||||
fi
|
||||
AC_SUBST([LDPREFIX])
|
||||
|
||||
#
|
||||
|
||||
if test -n "$LDPREFIX" -a -r /usr/lib/libSDL.la
|
||||
then SDL_LIBS=/usr/lib/libSDL.la
|
||||
else SDL_LIBS=`$SDL_CONFIG --libs`
|
||||
fi
|
||||
OLD_LIBS=$LIBS
|
||||
LIBS="$LIBS $SDL_LIBS"
|
||||
|
||||
|
@ -230,27 +322,40 @@ LIBS="$LIBS $SDL_LIBS"
|
|||
# it doesn't find it in FreeBSD
|
||||
# AC_CHECK_LIB([SDL], [SDL_Init])
|
||||
|
||||
ac_link="$LDPREFIX $ac_link"
|
||||
AC_CHECK_LIB([SDL_image],
|
||||
[IMG_Load],
|
||||
[SDL_IMAGE_LIBS=-lSDL_image],
|
||||
[if test -n "$LDPREFIX" -a -r /usr/lib/libSDL_image.la
|
||||
then SDL_IMAGE_LIBS=/usr/lib/libSDL_image.la
|
||||
else SDL_IMAGE_LIBS=-lSDL_image
|
||||
fi],
|
||||
[AC_MSG_ERROR([*** SDL_image lib not found! Get SDL_image from
|
||||
http://www.libsdl.org/projects/SDL_image/index.html])])
|
||||
|
||||
AC_CHECK_LIB([SDL_mixer],
|
||||
[Mix_OpenAudio],
|
||||
[SDL_MIXER_LIBS=-lSDL_mixer],
|
||||
[if test -n "$LDPREFIX" -a -r /usr/lib/libSDL_mixer.la
|
||||
then SDL_MIXER_LIBS=/usr/lib/libSDL_mixer.la
|
||||
else SDL_MIXER_LIBS=-lSDL_mixer
|
||||
fi],
|
||||
[AC_MSG_ERROR([*** SDL_mixer lib not found! Get SDL_mixer from
|
||||
http://www.libsdl.org/projects/SDL_mixer/index.html])])
|
||||
|
||||
AC_CHECK_LIB([SDL_net],
|
||||
[SDLNet_Init],
|
||||
[SDL_NET_LIBS=-lSDL_net],
|
||||
[if test -n "$LDPREFIX" -a -r /usr/lib/libSDL_net.la
|
||||
then SDL_NET_LIBS=/usr/lib/libSDL_net.la
|
||||
else SDL_NET_LIBS=-lSDL_net
|
||||
fi],
|
||||
[AC_MSG_ERROR([*** SDL_net lib not found! Get SDL_net from
|
||||
http://www.libsdl.org/projects/SDL_net/index.html])])
|
||||
|
||||
AC_CHECK_LIB([SDL_ttf],
|
||||
[TTF_OpenFont],
|
||||
[SDL_TTF_LIBS=-lSDL_ttf],
|
||||
[if test -n "$LDPREFIX" -a -r /usr/lib/libSDL_ttf.la
|
||||
then SDL_TTF_LIBS=/usr/lib/libSDL_ttf.la
|
||||
else SDL_TTF_LIBS=-lSDL_ttf
|
||||
fi],
|
||||
[AC_MSG_ERROR([*** SDL_ttf lib not found! Get SDL_ttf from
|
||||
http://www.libsdl.org/projects/SDL_ttf/index.html])])
|
||||
|
||||
|
@ -330,83 +435,6 @@ AC_FUNC_STRFTIME
|
|||
AC_CHECK_FUNCS([floor socket strtoul])
|
||||
|
||||
|
||||
#######################################################################
|
||||
# Configuration options #
|
||||
#######################################################################
|
||||
|
||||
AC_ARG_ENABLE([debug],
|
||||
[ --enable-debug Enable debug in wesnoth],
|
||||
[if test "x${enableval}" = "xyes" ; then
|
||||
CXXFLAGS="$CXXFLAGS -DDEBUG -ggdb3"
|
||||
fi])
|
||||
|
||||
AC_ARG_ENABLE([static],
|
||||
[ --enable-static Enable static building of wesnoth],
|
||||
[static=$enableval],
|
||||
[static=no])
|
||||
|
||||
AC_ARG_ENABLE([lite],
|
||||
[ --enable-lite Enable lite version of wesnoth (without music)],
|
||||
[lite=$enableval],
|
||||
[lite=no])
|
||||
|
||||
DATADIR=$PACKAGE
|
||||
AC_ARG_ENABLE([datadir-name],
|
||||
[ --datadir-name[[=dir]] Change name of data directory. Default with this option: wesnoth-data],
|
||||
[case "${enableval}" in
|
||||
yes)
|
||||
DATADIR="wesnoth-data"
|
||||
;;
|
||||
no)
|
||||
;;
|
||||
*)
|
||||
DATADIR="${enableval}"
|
||||
;;
|
||||
esac])
|
||||
|
||||
AC_SUBST([DATADIR])
|
||||
|
||||
AC_ARG_ENABLE([server],
|
||||
[ --enable-server Enable compilation of server],
|
||||
[server=$enableval],
|
||||
[server=no])
|
||||
|
||||
AC_ARG_ENABLE([editor],
|
||||
[ --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],
|
||||
[tools=$enableval],
|
||||
[tools=no])
|
||||
|
||||
AC_ARG_ENABLE([kde],
|
||||
[ --enable-kde Enable installation of icon and KDE menu entry],
|
||||
[kde=$enableval],
|
||||
[kde=no])
|
||||
|
||||
AC_ARG_ENABLE([gnome],
|
||||
[ --enable-gnome Enable installation of icon and GNOME menu entry],
|
||||
[gnome=$enableval],
|
||||
[gnome=no])
|
||||
|
||||
AC_ARG_ENABLE([wzip],
|
||||
[ --enable-wzip Enable compilation of wesnoth_zip program],
|
||||
[wzip=$enableval],
|
||||
[wzip=no])
|
||||
|
||||
AM_CONDITIONAL([STATIC], [test x$static = xyes])
|
||||
AM_CONDITIONAL([SERVER], [test x$server = xyes])
|
||||
AM_CONDITIONAL([EDITOR], [test x$editor = xyes])
|
||||
AM_CONDITIONAL([TOOLS], [test x$tools = xyes])
|
||||
AM_CONDITIONAL([KDE], [test x$kde = xyes && test x$kdefound = xyes])
|
||||
AM_CONDITIONAL([GNOME1], [test x$gnome = xyes && test x$gnome1found = xyes])
|
||||
AM_CONDITIONAL([GNOME2], [test x$gnome = xyes && test x$gnome1found = xno])
|
||||
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])
|
||||
|
||||
#######################################################################
|
||||
# Check for PNG support in SDL_image #
|
||||
#######################################################################
|
||||
|
@ -422,6 +450,7 @@ CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
|
|||
CFLAGS="$CFLAGS $SDL_CFLAGS"
|
||||
LIBS="$LIBS $SDL_LIBS $SDL_IMAGE_LIBS"
|
||||
|
||||
ac_link="$LDPREFIX $ac_link"
|
||||
AC_RUN_IFELSE([AC_LANG_SOURCE([
|
||||
#include <SDL_image.h>
|
||||
#include <stdlib.h>
|
||||
|
@ -464,6 +493,7 @@ if test "x$lite" = "xno"; then
|
|||
CFLAGS="$CFLAGS $SDL_CFLAGS"
|
||||
LIBS="$LIBS $SDL_LIBS $SDL_MIXER_LIBS"
|
||||
|
||||
ac_link="$LDPREFIX $ac_link"
|
||||
AC_RUN_IFELSE([AC_LANG_SOURCE([
|
||||
#include <SDL_mixer.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Makefile.in generated by automake 1.8.3 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.8.5 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
|
@ -143,6 +143,7 @@ KDE_FALSE = @KDE_FALSE@
|
|||
KDE_ICON = @KDE_ICON@
|
||||
KDE_TRUE = @KDE_TRUE@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LDPREFIX = @LDPREFIX@
|
||||
LIBICONV = @LIBICONV@
|
||||
LIBINTL = @LIBINTL@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
|
@ -152,6 +153,7 @@ LIBS = @LIBS@
|
|||
LTLIBICONV = @LTLIBICONV@
|
||||
LTLIBINTL = @LTLIBINTL@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LTOOL = @LTOOL@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Makefile.in generated by automake 1.8.3 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.8.5 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
|
@ -126,6 +126,7 @@ KDE_FALSE = @KDE_FALSE@
|
|||
KDE_ICON = @KDE_ICON@
|
||||
KDE_TRUE = @KDE_TRUE@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LDPREFIX = @LDPREFIX@
|
||||
LIBICONV = @LIBICONV@
|
||||
LIBINTL = @LIBINTL@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
|
@ -135,6 +136,7 @@ LIBS = @LIBS@
|
|||
LTLIBICONV = @LTLIBICONV@
|
||||
LTLIBINTL = @LTLIBINTL@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LTOOL = @LTOOL@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
|
|
|
@ -310,12 +310,19 @@ if GCC
|
|||
CXXFLAGS += -fno-omit-frame-pointer
|
||||
endif
|
||||
|
||||
LIBS = @SDL_LIBS@ @SDL_IMAGE_LIBS@ @SDL_MIXER_LIBS@ @SDL_NET_LIBS@ \
|
||||
@SDL_TTF_LIBS@ @LIBINTL@
|
||||
CXXLD = $(LDPREFIX) $(CXX)
|
||||
|
||||
|
||||
LIBS = $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS) $(SDL_NET_LIBS) \
|
||||
$(SDL_TTF_LIBS) $(SDL_LIBS) $(LIBINTL)
|
||||
|
||||
if STATIC
|
||||
LIBS += -static -L/usr/lib -Wl,-rpath,/usr/lib -L/usr/X11R6/lib -lSDL_image \
|
||||
-lSDL_mixer -lSDL_net -lSDL_ttf -lSDL -lpthread -ldl -laudio -lXt -lX11 -lXext \
|
||||
-lSDL_image -lSDL_mixer -lSDL_net -lSDL_ttf -lstdc++ -lm -lSM -lICE -ljpeg \
|
||||
-lpng -lz -lvorbisfile -lvorbis -logg -lsmpeg -lfreetype
|
||||
LDFLAGS += -all-static
|
||||
endif
|
||||
|
||||
#if STATIC
|
||||
#LIBS += -static -L/usr/lib -Wl,-rpath,/usr/lib -L/usr/X11R6/lib -lSDL_image \
|
||||
#-lSDL_mixer -lSDL_net -lSDL_ttf -lSDL -lpthread -ldl -laudio -lXt -lX11 -lXext \
|
||||
#-lSDL_image -lSDL_mixer -lSDL_net -lSDL_ttf -lstdc++ -lm -lSM -lICE -ljpeg \
|
||||
#-lpng -lz -lvorbisfile -lvorbis -logg -lsmpeg -lfreetype
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Makefile.in generated by automake 1.8.3 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.8.5 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
|
@ -43,11 +43,7 @@ bin_PROGRAMS = wesnoth$(EXEEXT) $(am__EXEEXT_1)
|
|||
@WZIP_TRUE@am__append_4 = zip
|
||||
@X11_TRUE@am__append_5 = -D_X11 @X_CFLAGS@
|
||||
@GCC_TRUE@am__append_6 = -fno-omit-frame-pointer
|
||||
@STATIC_TRUE@am__append_7 = -static -L/usr/lib -Wl,-rpath,/usr/lib -L/usr/X11R6/lib -lSDL_image \
|
||||
@STATIC_TRUE@-lSDL_mixer -lSDL_net -lSDL_ttf -lSDL -lpthread -ldl -laudio -lXt -lX11 -lXext \
|
||||
@STATIC_TRUE@-lSDL_image -lSDL_mixer -lSDL_net -lSDL_ttf -lstdc++ -lm -lSM -lICE -ljpeg \
|
||||
@STATIC_TRUE@-lpng -lz -lvorbisfile -lvorbis -logg -lsmpeg -lfreetype
|
||||
|
||||
@STATIC_TRUE@am__append_7 = -all-static
|
||||
subdir = src
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
|
@ -173,7 +169,6 @@ am__depfiles_maybe = depfiles
|
|||
@AMDEP_TRUE@ ./$(DEPDIR)/widget.Po
|
||||
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
|
||||
CXXLD = $(CXX)
|
||||
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
|
||||
-o $@
|
||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
|
@ -258,18 +253,20 @@ KDE_DESKTOP = @KDE_DESKTOP@
|
|||
KDE_FALSE = @KDE_FALSE@
|
||||
KDE_ICON = @KDE_ICON@
|
||||
KDE_TRUE = @KDE_TRUE@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LDFLAGS = @LDFLAGS@ $(am__append_7)
|
||||
LDPREFIX = @LDPREFIX@
|
||||
LIBICONV = @LIBICONV@
|
||||
LIBINTL = @LIBINTL@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBPNG_FALSE = @LIBPNG_FALSE@
|
||||
LIBPNG_TRUE = @LIBPNG_TRUE@
|
||||
LIBS = @SDL_LIBS@ @SDL_IMAGE_LIBS@ @SDL_MIXER_LIBS@ @SDL_NET_LIBS@ \
|
||||
@SDL_TTF_LIBS@ @LIBINTL@\
|
||||
$(am__append_7)
|
||||
LIBS = $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS) $(SDL_NET_LIBS) \
|
||||
$(SDL_TTF_LIBS) $(SDL_LIBS) $(LIBINTL)
|
||||
|
||||
LTLIBICONV = @LTLIBICONV@
|
||||
LTLIBINTL = @LTLIBINTL@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LTOOL = @LTOOL@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
|
@ -644,6 +641,7 @@ wesnoth_editor_SOURCES = editor/editor.cpp \
|
|||
AM_CXXFLAGS = @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\" \
|
||||
-I../intl -I$(top_srcdir)/intl
|
||||
|
||||
CXXLD = $(LDPREFIX) $(CXX)
|
||||
all: all-recursive
|
||||
|
||||
.SUFFIXES:
|
||||
|
@ -1133,14 +1131,16 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|||
$(TAGS_FILES) $(LISP)
|
||||
tags=; \
|
||||
here=`pwd`; \
|
||||
if (etags --etags-include --version) >/dev/null 2>&1; then \
|
||||
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
|
||||
include_option=--etags-include; \
|
||||
empty_fix=.; \
|
||||
else \
|
||||
include_option=--include; \
|
||||
empty_fix=; \
|
||||
fi; \
|
||||
list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
if test "$$subdir" = .; then :; else \
|
||||
test -f $$subdir/TAGS && \
|
||||
test ! -f $$subdir/TAGS || \
|
||||
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
|
||||
fi; \
|
||||
done; \
|
||||
|
@ -1150,9 +1150,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|||
done | \
|
||||
$(AWK) ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
test -z "$(ETAGS_ARGS)$$tags$$unique" \
|
||||
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||
$$tags $$unique
|
||||
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
||||
test -n "$$unique" || unique=$$empty_fix; \
|
||||
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||
$$tags $$unique; \
|
||||
fi
|
||||
ctags: CTAGS
|
||||
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
$(TAGS_FILES) $(LISP)
|
||||
|
@ -1313,6 +1315,13 @@ uninstall-info: uninstall-info-recursive
|
|||
tags tags-recursive uninstall uninstall-am \
|
||||
uninstall-binPROGRAMS uninstall-info-am
|
||||
|
||||
|
||||
#if STATIC
|
||||
#LIBS += -static -L/usr/lib -Wl,-rpath,/usr/lib -L/usr/X11R6/lib -lSDL_image \
|
||||
#-lSDL_mixer -lSDL_net -lSDL_ttf -lSDL -lpthread -ldl -laudio -lXt -lX11 -lXext \
|
||||
#-lSDL_image -lSDL_mixer -lSDL_net -lSDL_ttf -lstdc++ -lm -lSM -lICE -ljpeg \
|
||||
#-lpng -lz -lvorbisfile -lvorbis -logg -lsmpeg -lfreetype
|
||||
#endif
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Makefile.in generated by automake 1.8.3 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.8.5 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
|
@ -160,6 +160,7 @@ KDE_FALSE = @KDE_FALSE@
|
|||
KDE_ICON = @KDE_ICON@
|
||||
KDE_TRUE = @KDE_TRUE@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LDPREFIX = @LDPREFIX@
|
||||
LIBICONV = @LIBICONV@
|
||||
LIBINTL = @LIBINTL@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
|
@ -169,6 +170,7 @@ LIBS = @LIBS@
|
|||
LTLIBICONV = @LTLIBICONV@
|
||||
LTLIBINTL = @LTLIBINTL@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LTOOL = @LTOOL@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
|
@ -483,9 +485,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|||
done | \
|
||||
$(AWK) ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
test -z "$(ETAGS_ARGS)$$tags$$unique" \
|
||||
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||
$$tags $$unique
|
||||
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
||||
test -n "$$unique" || unique=$$empty_fix; \
|
||||
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||
$$tags $$unique; \
|
||||
fi
|
||||
ctags: CTAGS
|
||||
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
$(TAGS_FILES) $(LISP)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Makefile.in generated by automake 1.8.3 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.8.5 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
|
@ -200,6 +200,7 @@ KDE_FALSE = @KDE_FALSE@
|
|||
KDE_ICON = @KDE_ICON@
|
||||
KDE_TRUE = @KDE_TRUE@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LDPREFIX = @LDPREFIX@
|
||||
LIBICONV = @LIBICONV@
|
||||
LIBINTL = @LIBINTL@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
|
@ -209,6 +210,7 @@ LIBS = @LIBS@
|
|||
LTLIBICONV = @LTLIBICONV@
|
||||
LTLIBINTL = @LTLIBINTL@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LTOOL = @LTOOL@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
|
@ -594,9 +596,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|||
done | \
|
||||
$(AWK) ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
test -z "$(ETAGS_ARGS)$$tags$$unique" \
|
||||
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||
$$tags $$unique
|
||||
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
||||
test -n "$$unique" || unique=$$empty_fix; \
|
||||
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||
$$tags $$unique; \
|
||||
fi
|
||||
ctags: CTAGS
|
||||
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
$(TAGS_FILES) $(LISP)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Makefile.in generated by automake 1.8.3 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.8.5 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
|
@ -157,6 +157,7 @@ KDE_FALSE = @KDE_FALSE@
|
|||
KDE_ICON = @KDE_ICON@
|
||||
KDE_TRUE = @KDE_TRUE@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LDPREFIX = @LDPREFIX@
|
||||
LIBICONV = @LIBICONV@
|
||||
LIBINTL = @LIBINTL@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
|
@ -166,6 +167,7 @@ LIBS = @LIBS@
|
|||
LTLIBICONV = @LTLIBICONV@
|
||||
LTLIBINTL = @LTLIBINTL@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LTOOL = @LTOOL@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
|
@ -484,9 +486,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|||
done | \
|
||||
$(AWK) ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
test -z "$(ETAGS_ARGS)$$tags$$unique" \
|
||||
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||
$$tags $$unique
|
||||
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
||||
test -n "$$unique" || unique=$$empty_fix; \
|
||||
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||
$$tags $$unique; \
|
||||
fi
|
||||
ctags: CTAGS
|
||||
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
$(TAGS_FILES) $(LISP)
|
||||
|
|
Loading…
Add table
Reference in a new issue