Simpler, more robust ver.cpp generation (also automated whitespace cleanup, lol)

src/Makefile.am

@@ -27,9 +27,9 @@ AM_CXXFLAGS += -finline-limit=300
 
 AM_CXXFLAGS += $(GL_CFLAGS)
 
-.PHONY: update_version
+.PHONY: ver.cpp
 
-update_version:
+ver.cpp:
 	if test -e ver.cpp; then \
 		build=`sed -rs 's/.*version_num = ([[:digit:]]+);/\1/;2q;d' ver.cpp`; \
 		build=`expr $$build + 1`; \
@@ -47,12 +47,6 @@ update_version:
 		echo "const char *const product_version = \"5.0-UNKNOWN\";" >> ver.cpp; \
 	fi
 
-ver.cpp: update_version
-# make doesn't recognize a file it updated during the current invocation
-# (in this case ver.cpp) as being updated. So remake and delete stepmania-ver.o
-# every time.
-.INTERMEDIATE: stepmania-ver.o
-
 PNG = \
 ../extern/libpng/include/png.c ../extern/libpng/include/.png.h \
 ../extern/libpng/include/pngconf.h ../extern/libpng/include/pngdebug.h \
@@ -356,10 +350,8 @@ if WINDOWS
  ArchHooks += arch/ArchHooks/ArchHooks_Win32.cpp arch/ArchHooks/ArchHooks_Win32.h \
 	arch/ArchHooks/ArchHooks_Win32Static.cpp
 
- ArchUtils += archutils/Win32/arch_setup.cpp archutils/Win32/arch_setup.h \
-	archutils/Win32/arch_time.cpp \
+ ArchUtils += archutils/Win32/arch_time.cpp \
 	archutils/Win32/AppInstance.cpp archutils/Win32/AppInstance.h \
-	archutils/Win32/CommandLine.cpp archutils/Win32/CommandLine.h \
 	archutils/Win32/Crash.cpp archutils/Win32/Crash.h \
 	archutils/Win32/CrashHandlerChild.cpp \
 	archutils/Win32/CrashHandlerInternal.h \