[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth ./configure.ac src/Makefile.am src/zip/...
From: |
Guillaume Melquiond |
Subject: |
[Wesnoth-cvs-commits] wesnoth ./configure.ac src/Makefile.am src/zip/... |
Date: |
Sat, 28 May 2005 08:32:04 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Guillaume Melquiond <address@hidden> 05/05/28 12:32:04
Modified files:
. : configure.ac
src : Makefile.am
Removed files:
src/zip : .cvsignore zip.cpp
Log message:
Remove wesnoth-zip: it has been broken for many monthes now, and nobody
cared enough to fix it. What was it even supposed to be?
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.148&tr2=1.149&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.95&tr2=1.96&r1=text&r2=text
Patches:
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.148 wesnoth/configure.ac:1.149
--- wesnoth/configure.ac:1.148 Sun May 22 23:37:43 2005
+++ wesnoth/configure.ac Sat May 28 12:32:03 2005
@@ -37,7 +37,7 @@
EOF
])
-AC_REVISION([$Revision: 1.148 $])
+AC_REVISION([$Revision: 1.149 $])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_SRCDIR([src/actions.cpp])
@@ -211,11 +211,6 @@
AS_HELP_STRING([--disable-gnome2], [disable installation of icon
and menu entry in GNOME2]),
[gnome2=$enableval],
[gnome2=yes])
-
-AC_ARG_ENABLE([wzip],
- AS_HELP_STRING([--enable-wzip], [enable compilation of
wesnoth_zip program]),
- [wzip=$enableval],
- [wzip=no])
AC_ARG_ENABLE([dummy-locales],
AS_HELP_STRING([--enable-dummy-locales], [enable installation of
Wesnoth own private locales]),
@@ -235,7 +230,6 @@
AM_CONDITIONAL([EDITOR], [test x$editor = xyes])
AM_CONDITIONAL([TOOLS], [test x$tools = xyes])
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])
AM_CONDITIONAL([DUMMYLOCALES], [test x$dummylocales = xyes])
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.95 wesnoth/src/Makefile.am:1.96
--- wesnoth/src/Makefile.am:1.95 Sat May 21 23:00:48 2005
+++ wesnoth/src/Makefile.am Sat May 28 12:32:03 2005
@@ -22,10 +22,6 @@
bin_PROGRAMS += wesnoth_editor
endif
-if WZIP
-bin_PROGRAMS += wesnoth_zip
-endif
-
pkgdatadir=$(datadir)/@DATADIR@
#############################################################################
@@ -544,30 +540,6 @@
exploder_LDADD = @SDL_IMAGE_LIBS@ @SDL_LIBS@ $(LIBZIPIOS) $(LIBINTL)
$(PNG_LIBS)
cutter_LDADD = @SDL_IMAGE_LIBS@ @SDL_LIBS@ $(LIBZIPIOS) $(LIBINTL) $(PNG_LIBS)
-#############################################################################
-# Wesnoth Zip #
-#############################################################################
-
-wesnoth_zip_SOURCES = \
- zip/zip.cpp \
- config.cpp \
- filesystem.cpp \
- game_config.cpp \
- gettext.cpp \
- log.cpp \
- network.cpp \
- tstring.cpp \
- config.hpp \
- gettext.hpp \
- filesystem.hpp \
- game_config.hpp \
- log.hpp \
- network.hpp \
- tstring.hpp \
- wesconfig.h
-
-wesnoth_zip_LDADD = @SDL_LIBS@ @SDL_NET_LIBS@
-
AM_CXXFLAGS = -I $(srcdir)/sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@
-DWESNOTH_PATH=\"$(pkgdatadir)\" \
-DLOCALEDIR=\"$(LOCALEDIR)\"
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR) -DFIFODIR=\"$(fifodir)\"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth ./configure.ac src/Makefile.am src/zip/...,
Guillaume Melquiond <=