Don't use version numbers in autogen.sh, and add two new modules to

Makefile.am

2 files changed, 11 insertions, 7 deletions

diff --git a/autogen.sh b/autogen.sh
index 21ae79e8..8f047c99 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,9 +4,9 @@ echo "Generating build information using aclocal, autoheader, automake and autoc
 echo
 
 # Regerate configuration files
-aclocal-1.7
+aclocal
 autoheader
-automake-1.7 --gnu --add-missing --copy
+automake --gnu --add-missing --copy
 autoconf
 
 echo
diff --git a/src/Makefile.am b/src/Makefile.am
index 3c7628fc..303188aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,8 +51,8 @@ tmw_SOURCES = graphic/spriteset.cpp \
 	      gui/progressbar.h \
 	      gui/radiobutton.cpp \
 	      gui/radiobutton.h \
-		  gui/requesttrade.cpp \
-		  gui/requesttrade.h \
+	      gui/requesttrade.cpp \
+	      gui/requesttrade.h \
 	      gui/scrollarea.cpp \
 	      gui/scrollarea.h \
 	      gui/sell.cpp \
@@ -73,9 +73,9 @@ tmw_SOURCES = graphic/spriteset.cpp \
 	      gui/textbox.h \
 	      gui/textfield.cpp \
 	      gui/textfield.h \
-          gui/trade.cpp \
-          gui/trade.h \
-		  gui/window.cpp \
+	      gui/trade.cpp \
+	      gui/trade.h \
+	      gui/window.cpp \
 	      gui/window.h \
 	      gui/windowcontainer.cpp \
 	      gui/windowcontainer.h \
@@ -88,10 +88,14 @@ tmw_SOURCES = graphic/spriteset.cpp \
 	      resources/image.h \
 	      resources/mapreader.cpp \
 	      resources/mapreader.h \
+	      resources/music.h \
+	      resources/music.cpp \
 	      resources/resource.cpp \
 	      resources/resource.h \
 	      resources/resourcemanager.cpp \
 	      resources/resourcemanager.h \
+	      resources/soundeffect.h \
+	      resources/soundeffect.cpp \
 	      base64.cpp \
 	      base64.h \
 	      being.cpp \