[Wesnoth-cvs-commits] wesnoth ./configure.ac src/.cvsignore src/Makef...

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/03/04 19:39:59

Modified files:
        .              : configure.ac 
        src            : .cvsignore Makefile.am 
        src/zip        : .cvsignore 
Removed files:
        src/zip        : Makefile.am 

Log message:
        Removal of the last source subdirectory. But does somebody really use 
wesnoth_zip? And what is it supposed to do?

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.120&tr2=1.121&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/.cvsignore.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/zip/.cvsignore.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.120 wesnoth/configure.ac:1.121
--- wesnoth/configure.ac:1.120  Thu Mar  3 23:04:00 2005
+++ wesnoth/configure.ac        Fri Mar  4 19:39:59 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.120 $])
+AC_REVISION([$Revision: 1.121 $])
 
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([foreign 1.5])
@@ -725,7 +725,6 @@
                 intl/Makefile 
                 icons/Makefile
                 src/Makefile
-                src/zip/Makefile
                 doc/Makefile
                 doc/man/Makefile])
 
Index: wesnoth/src/.cvsignore
diff -u wesnoth/src/.cvsignore:1.5 wesnoth/src/.cvsignore:1.6
--- wesnoth/src/.cvsignore:1.5  Thu Mar  3 23:23:08 2005
+++ wesnoth/src/.cvsignore      Fri Mar  4 19:39:59 2005
@@ -7,5 +7,6 @@
 exploder
 wesnothd
 campaignd
+wesnoth_zip
 Makefile
 Makefile.in
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.75 wesnoth/src/Makefile.am:1.76
--- wesnoth/src/Makefile.am:1.75        Thu Mar  3 23:04:00 2005
+++ wesnoth/src/Makefile.am     Fri Mar  4 19:39:59 2005
@@ -1,5 +1,4 @@
 AUTOMAKE_OPTIONS = subdir-objects
-SUBDIRS = .
 
 bin_PROGRAMS =
 
@@ -24,7 +23,7 @@
 endif
 
 if WZIP
-SUBDIRS += zip
+bin_PROGRAMS += wesnoth_zip
 endif
 
 pkgdatadir=$(datadir)/@DATADIR@
@@ -489,10 +488,33 @@
        zipios++/xcoll.hpp \
        gettext.cpp
 
-
 exploder_LDADD = @SDL_IMAGE_LIBS@ @SDL_LIBS@ $(LIBZIPIOS)
 cutter_LDADD = @SDL_IMAGE_LIBS@ @SDL_LIBS@ $(LIBZIPIOS)
 
+#############################################################################
+#    Wesnoth Zip                                                            #
+#############################################################################
+
+wesnoth_zip_SOURCES = \
+       zip/zip.cpp \
+       config.cpp \
+       filesystem.cpp \
+       game_config.cpp \
+       gettext.cpp \
+       log.cpp \
+       network.cpp \
+       game_events.hpp \
+       config.hpp \
+       gettext.hpp \
+       filesystem.hpp \
+       game_config.hpp \
+       log.hpp \
+       network.hpp \
+       server/variable.cpp \
+       wesconfig.h
+
+wesnoth_zip_LDADD = @SDL_LIBS@ @SDL_NET_LIBS@
+
 AM_CXXFLAGS = -I sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@ 
-DWESNOTH_PATH=\"$(pkgdatadir)\" \
        -DLOCALEDIR=\"$(LOCALEDIR)\" 
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR)
 
Index: wesnoth/src/zip/.cvsignore
diff -u wesnoth/src/zip/.cvsignore:1.2 wesnoth/src/zip/.cvsignore:1.3
--- wesnoth/src/zip/.cvsignore:1.2      Sun Oct 10 19:23:01 2004
+++ wesnoth/src/zip/.cvsignore  Fri Mar  4 19:39:59 2005
@@ -1,3 +1,2 @@
-Makefile
 .deps
-Makefile.in
+.dirstamp