clean weird tabbing, remove old SDL stuff

stepmania/src/Makefile.am

@@ -15,26 +15,6 @@ AM_CXXFLAGS += -finline-limit=300
 
 AM_CXXFLAGS += $(X_CFLAGS)
 
-if NHAVE_SDL
-# We use our own copy of SDL if the one on the system isn't new enough.  (Most
-# systems have 1.2.5; we need 1.2.6.)  We still end up linking dynamically to
-# the shared system library through SDL_image, but that shouldn't cause problems.
-
-SDL-1.2.6/Makefile:
-	test -d SDL-1.2.6 || mkdir SDL-1.2.6
-	cd SDL-1.2.6 && sh ../$(srcdir)/SDL-1.2.6/configure
-		--disable-nasm --disable-arts --disable-esd --enable-static --disable-shared \
-		--disable-debug --disable-alsa --disable-oss --disable-video-directfb
-
-SDL-1.2.6/src/.libs/libSDL.a: SDL-1.2.6/Makefile
-	make -C SDL-1.2.6
-
-USE_SDL_LIBS = SDL-1.2.6/src/.libs/libSDL.a
-AM_CXXFLAGS += -ISDL-1.2.6/include
-else
-USE_SDL_LIBS = $(SDL_LIBS)
-endif
-
 $(srcdir)/libresample/libresample.a:
 	cd $(srcdir)/libresample && autoconf && sh ./configure && make
 
@@ -106,8 +86,7 @@ Sound += arch/Sound/RageSoundDriver_OSS.cpp arch/Sound/RageSoundDriver_OSS.h
 endif
 
 if HAVE_ALSA
-Sound += arch/Sound/ALSA9Dynamic.cpp arch/Sound/ALSA9Dynamic.h \
+Sound += arch/Sound/ALSA9Dynamic.cpp arch/Sound/ALSA9Dynamic.h arch/Sound/ALSA9Functions.h \
-		 ALSA9Functions.h \
 	 arch/Sound/ALSA9Helpers.cpp arch/Sound/ALSA9Helpers.h \
 	 arch/Sound/RageSoundDriver_ALSA9.cpp arch/Sound/RageSoundDriver_ALSA9.h \
 	 arch/Sound/RageSoundDriver_ALSA9_Software.cpp arch/Sound/RageSoundDriver_ALSA9_Software.h
@@ -151,30 +130,20 @@ ArchUtils += archutils/Unix/Backtrace.cpp archutils/Unix/Backtrace.h \
 		archutils/Unix/LinuxThreadHelpers.cpp archutils/Unix/LinuxThreadHelpers.h
 endif
 
-Arch = $(LoadingWindow) \
+Arch = $(LoadingWindow) $(Sound) $(ArchHooks) $(InputHandler) $(MovieTexture) \
-	   $(Sound) \
+	   $(Lights) $(MemoryCard) $(LowLevelWindow) $(ArchUtils) \
-	   $(ArchHooks) \
+	   arch/arch.cpp arch/arch.h arch/arch_default.h arch/arch_linux.h arch/arch_platform.h
-	   $(InputHandler) \
-	   $(MovieTexture) \
-	   $(Lights) \
-	   $(MemoryCard) \
-	   $(LowLevelWindow) \
-	   $(ArchUtils) \
-       arch/arch.cpp arch/arch.h \
-	   arch/arch_default.h \
-	   arch/arch_linux.h \
-	   arch/arch_platform.h
 
 RageSoundFileReaders = RageSoundReader_WAV.cpp RageSoundReader_WAV.h 
 
-if HAVE_MP3
-RageSoundFileReaders += RageSoundReader_MP3.cpp RageSoundReader_MP3.h
-endif
-
 if HAVE_VORBIS
 RageSoundFileReaders += RageSoundReader_Vorbisfile.cpp RageSoundReader_Vorbisfile.h
 endif
 
+if HAVE_MP3
+RageSoundFileReaders += RageSoundReader_MP3.cpp RageSoundReader_MP3.h
+endif
+
 ActorsInGameplayAndMenus = \
 BGAnimation.cpp BGAnimation.h BGAnimationLayer.cpp BGAnimationLayer.h Banner.cpp Banner.h \
 ConditionalBGA.cpp ConditionalBGA.h DifficultyIcon.cpp DifficultyIcon.h MeterDisplay.cpp MeterDisplay.h \
@@ -214,19 +183,14 @@ Helpers = SDL_SaveJPEG.cpp SDL_SaveJPEG.h \
 	  SDL_rotozoom.cpp SDL_rotozoom.h \
 	  SDL_utils.cpp SDL_utils.h
 
-PCRE = pcre/chartables.c \
+PCRE = pcre/chartables.c pcre/get.c pcre/internal.h pcre/maketables.c pcre/pcre.c pcre/pcre.h pcre/study.c
-	   pcre/get.c \
-	   pcre/internal.h \
-	   pcre/maketables.c \
-	   pcre/pcre.c pcre/pcre.h \
-	   pcre/study.c
 
 RageFile = \
 RageFile.cpp RageFile.h RageFileDriver.cpp RageFileDriver.h RageFileManager.cpp RageFileManager.h \
 RageFileDriverDirect.cpp RageFileDriverDirect.h RageFileDriverDirectHelpers.cpp RageFileDriverDirectHelpers.h \
 RageFileDriverZip.cpp RageFileDriverZip.h
 
-Rage = $(Helpers) $(PCRE) $(RageFile) $(RageSoundFileReaders)\
+Rage = $(Helpers) $(PCRE) $(RageFile) $(RageSoundFileReaders) \
 RageBitmapTexture.cpp RageBitmapTexture.h RageDisplay.cpp RageDisplay.h RageDisplay_OGL.cpp RageDisplay_OGL.h \
 RageDisplay_Null.cpp RageDisplay_Null.h RageException.cpp RageException.h RageInput.cpp RageInput.h \
 RageInputDevice.cpp RageInputDevice.h RageLog.cpp RageLog.h RageMath.cpp RageMath.h \
@@ -276,7 +240,7 @@ main_SOURCES = $(Screens) \
 main_LDADD = \
 		  $(AUDIO_LIBS) \
 		  $(LUA_LIBS) \
-		  $(USE_SDL_LIBS) \
+		  $(SDL_LIBS) \
 		  $(XLIBS) \
 		  -lSDL_image \
 		  $(srcdir)/libresample/libresample.a
@@ -328,7 +292,7 @@ test_audio_readers_SOURCES = \
 
 test_audio_readers_LDADD = \
 		$(AUDIO_LIBS) \
-		$(USE_SDL_LIBS) \
+		$(SDL_LIBS) \
 		$(srcdir)/libresample/libresample.a
 
 test_file_readers_SOURCES = \