Removal of the last source subdirectory.

But does somebody really use wesnoth_zip? And what is it supposed to do?

configure.ac

@@ -725,7 +725,6 @@ AC_CONFIG_FILES([Makefile
 		 intl/Makefile 
 		 icons/Makefile
 		 src/Makefile
-		 src/zip/Makefile
 		 doc/Makefile
 		 doc/man/Makefile])
 

src/.gitignore

@@ -7,5 +7,6 @@ cutter
 exploder
 wesnothd
 campaignd
+wesnoth_zip
 Makefile
 Makefile.in

src/Makefile.am

@@ -1,5 +1,4 @@
 AUTOMAKE_OPTIONS = subdir-objects
-SUBDIRS = .
 
 bin_PROGRAMS =
 
@@ -24,7 +23,7 @@ bin_PROGRAMS += wesnoth_editor
 endif
 
 if WZIP
-SUBDIRS += zip
+bin_PROGRAMS += wesnoth_zip
 endif
 
 pkgdatadir=$(datadir)/@DATADIR@
@@ -489,10 +488,33 @@ cutter_SOURCES = \
 	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)
 

src/zip/.gitignore

@@ -1,3 +1,2 @@
-Makefile
 .deps
-Makefile.in
+.dirstamp

src/zip/Makefile.am

@@ -1,26 +0,0 @@
-bin_PROGRAMS = wesnoth_zip
-
-#############################################################################
-#    Wesnoth Zip                                                            #
-#############################################################################
-
-wesnoth_zip_SOURCES = 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
-
-AM_CXXFLAGS = @SDL_CFLAGS@ -DLOCALEDIR=\"$(LOCALEDIR)\" -I../intl \
-    -I$(top_srcdir)/intl
-AM_LDFLAGS = @SDL_LIBS@ @SDL_NET_LIBS@