enigma (1.10~~pre-alpha+r2236-1) system-zipios-and-no-s3m

Summary

 data/music/menu/Makefile.am |    3 +--
 data/music/menu/Makefile.in |    3 +--
 src/Makefile.am             |    5 +----
 src/Makefile.in             |    6 +-----
 4 files changed, 4 insertions(+), 13 deletions(-)

    
download this patch

Patch contents

--- enigma-1.10~~pre-alpha+r2210.orig/src/Makefile.am
+++ enigma-1.10~~pre-alpha+r2210/src/Makefile.am
@@ -13,8 +13,6 @@ CXXFLAGS = @CXXFLAGS@\
 	-DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
 	-DDOCDIR=\"$(docdir)\" \
 	-DLOCALEDIR=\"$(localedir_enigma)\" \
-	-I$(top_srcdir)/lib-src/zipios++  \
-	-I$(top_builddir)/lib-src/zipios++ \
 	-I$(top_srcdir)/lib-src/lua \
 	-I$(top_srcdir)/lib-src/enigma-core \
 	-I$(top_srcdir)/lib-src/enet/include \
@@ -442,8 +440,7 @@ enigma_LDADD = \
 	$(top_builddir)/lib-src/lua/liblua.a \
 	$(top_builddir)/lib-src/enet/libenet.a \
 	$(top_builddir)/lib-src/oxydlib/liboxyd.a \
-	$(top_builddir)/lib-src/zipios++/src/libzipios.a \
-	-lz \
+	-lzipios \
 	$(mingw_ldadd) \
 	@SDL_LIBS@
 
--- enigma-1.10~~pre-alpha+r2210.orig/src/Makefile.in
+++ enigma-1.10~~pre-alpha+r2210/src/Makefile.in
@@ -150,7 +150,6 @@ enigma_DEPENDENCIES = $(top_builddir)/li
 	$(top_builddir)/lib-src/lua/liblua.a \
 	$(top_builddir)/lib-src/enet/libenet.a \
 	$(top_builddir)/lib-src/oxydlib/liboxyd.a \
-	$(top_builddir)/lib-src/zipios++/src/libzipios.a \
 	$(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -192,8 +191,6 @@ CXXFLAGS = @CXXFLAGS@\
 	-DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
 	-DDOCDIR=\"$(docdir)\" \
 	-DLOCALEDIR=\"$(localedir_enigma)\" \
-	-I$(top_srcdir)/lib-src/zipios++  \
-	-I$(top_builddir)/lib-src/zipios++ \
 	-I$(top_srcdir)/lib-src/lua \
 	-I$(top_srcdir)/lib-src/enigma-core \
 	-I$(top_srcdir)/lib-src/enet/include \
@@ -735,8 +732,7 @@ enigma_LDADD = \
 	$(top_builddir)/lib-src/lua/liblua.a \
 	$(top_builddir)/lib-src/enet/libenet.a \
 	$(top_builddir)/lib-src/oxydlib/liboxyd.a \
-	$(top_builddir)/lib-src/zipios++/src/libzipios.a \
-	-lz \
+	-lzipios \
 	$(mingw_ldadd) \
 	@SDL_LIBS@
 
--- enigma-1.10~~pre-alpha+r2210.orig/data/music/menu/Makefile.am
+++ enigma-1.10~~pre-alpha+r2210/data/music/menu/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/music/menu
 pkgdata_DATA = esprit.ogg \
-               enigma_rag.ogg \
-               pentagonal_dreams.s3m
+               enigma_rag.ogg
 
 EXTRA_DIST = $(pkgdata_DATA)
--- enigma-1.10~~pre-alpha+r2210.orig/data/music/menu/Makefile.in
+++ enigma-1.10~~pre-alpha+r2210/data/music/menu/Makefile.in
@@ -227,8 +227,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 pkgdata_DATA = esprit.ogg \
-               enigma_rag.ogg \
-               pentagonal_dreams.s3m
+               enigma_rag.ogg
 
 EXTRA_DIST = $(pkgdata_DATA)
 all: all-am