From: Charles McGarvey <chazmcgarvey@brokenzipper.com>
Date: Sun, 13 Dec 2009 00:03:49 +0000 (-0700)
Subject: preliminary AM_SILENT_RULES support
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=6a5d12788f2778a26223de690d34b00ac16a6ec3;p=chaz%2Fyoink

preliminary AM_SILENT_RULES support
---

diff --git a/COPYING b/COPYING
index 53b5fd0..d0975dc 100644
--- a/COPYING
+++ b/COPYING
@@ -40,11 +40,6 @@ portions.  Neither do the terms and conditions associated with the
 following portions necessarily apply to the files released under the above
 license.  The texts of applicable licences can be found in doc/licenses/.
 
-  Portion: beatthecube.xm, nightfusion.xm
-   Source: http://8bitcollective.com/members/FearofDark/
-Copyright: (c) 2009 Stephen H. Johnston
-  License: CCPL-Attribution-ShareAlike-NonCommercial-2.5
-
   Portion: cml
    Source: http://www.cmldev.net/
 Copyright: (c) 2009 Jesse Anders
@@ -75,6 +70,11 @@ Copyright: (c) 2009 Xiph.Org Foundation
 Copyright: (c) 1995-2008 Lua.org, PUC-Rio
   License: MIT
 
+  Portion: nightfusion.xm
+   Source: http://8bitcollective.com/members/FearofDark/
+Copyright: (c) 2009 Stephen H. Johnston
+  License: CCPL-Attribution-ShareAlike-NonCommercial-2.5
+
   Portion: OpenAL32.dll
    Source: http://kcat.strangesoft.net/openal.html
 Copyright: (c) 2009 Chris Robinson
diff --git a/configure.ac b/configure.ac
index f03af5d..dc29d61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,9 +46,7 @@ case "${host}" in
 		then
 			AC_MSG_ERROR([windres could not be found])
 		fi
-		AC_SUBST(WINDRES)
 		AC_PATH_PROGS([MAKENSIS], [makensis])
-		AC_SUBST(MAKENSIS)
 	;;
 	*cygwin*)
 		CYGWIN=yes
@@ -58,12 +56,8 @@ case "${host}" in
 		MACOSX=yes
 		LIBS="$LIBS -Wl,-framework"
 	;;
-	*-linux-gnu*)
-		LINUX=yes
-	;;
 esac
 
-AM_CONDITIONAL([LINUX], test "$LINUX" = "yes")
 AM_CONDITIONAL([WIN32], test "$WIN32" = "yes")
 
 
@@ -152,13 +146,11 @@ if test x$gtk = xyes
 then
 	AC_DEFINE([USE_GTK], 1,
 			  [Define to 1 if you want to use GTK+ info/error dialogs.])
-else
-if test x$qt4 = xyes
+elif test x$qt4 = xyes
 then
 	AC_DEFINE([USE_QT4], 1,
 			  [Define to 1 if you want to use QT info/error dialogs.])
 fi
-fi
 
 AC_DEFINE_UNQUOTED([YOINK_LOGLEVEL], [$log_level],
 				   [Define to detail level of logging.])
@@ -252,7 +244,7 @@ website="http://www.mesa3d.org/"
 AC_CHECK_HEADERS([GL/gl.h GL/glu.h],,
 				 [missing=yes
 				  echo "***** Missing GL headers ($website) *****"])
-if test x$WIN32 == xyes
+if test x$WIN32 = xyes
 then
 # autoconf library search macro doesn't find opengl32 on windows because it uses
 # different name hashing, but it links fine; assume it's there
@@ -334,7 +326,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt],
 
 if test x$missing == xyes
 then
-	AC_MSG_ERROR([please install missing dependencies (see messages above)])
+	AC_MSG_WARN([You may be missing some dependencies--see messages above.])
 fi
 
 
@@ -362,7 +354,7 @@ AC_CONFIG_FILES([Makefile
 
 if test x$WIN32 = xyes
 then
-	AC_CONFIG_FILES([win32/Makefile win32/build-installer.sh])
+	AC_CONFIG_FILES([win32/Makefile win32/mkpackage.sh])
 fi
 
 
diff --git a/cscope.make b/cscope.make
index 990b01c..47c2811 100755
--- a/cscope.make
+++ b/cscope.make
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 current=`pwd`
 cd /
diff --git a/data/sounds/NightFusionIntro.ogg b/data/sounds/NightFusionIntro.ogg
index 785ad8a..6ab5084 100644
Binary files a/data/sounds/NightFusionIntro.ogg and b/data/sounds/NightFusionIntro.ogg differ
diff --git a/data/sounds/NightFusionLoop.ogg b/data/sounds/NightFusionLoop.ogg
index 46a5b55..a529716 100644
Binary files a/data/sounds/NightFusionLoop.ogg and b/data/sounds/NightFusionLoop.ogg differ
diff --git a/extra/beatthecube.xm b/extra/beatthecube.xm
deleted file mode 100644
index c0bae92..0000000
Binary files a/extra/beatthecube.xm and /dev/null differ
diff --git a/src/Moof/stlplus/containers.hpp b/src/Moof/stlplus/containers.hpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/containers_fixes.hpp b/src/Moof/stlplus/containers_fixes.hpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/digraph.hpp b/src/Moof/stlplus/digraph.hpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/digraph.tpp b/src/Moof/stlplus/digraph.tpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/exceptions.hpp b/src/Moof/stlplus/exceptions.hpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/foursome.hpp b/src/Moof/stlplus/foursome.hpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/foursome.tpp b/src/Moof/stlplus/foursome.tpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/hash.hpp b/src/Moof/stlplus/hash.hpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/hash.tpp b/src/Moof/stlplus/hash.tpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/matrix.hpp b/src/Moof/stlplus/matrix.hpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/matrix.tpp b/src/Moof/stlplus/matrix.tpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/ntree.hpp b/src/Moof/stlplus/ntree.hpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/ntree.tpp b/src/Moof/stlplus/ntree.tpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/safe_iterator.hpp b/src/Moof/stlplus/safe_iterator.hpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/safe_iterator.tpp b/src/Moof/stlplus/safe_iterator.tpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/smart_ptr.hpp b/src/Moof/stlplus/smart_ptr.hpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/smart_ptr.tpp b/src/Moof/stlplus/smart_ptr.tpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/triple.hpp b/src/Moof/stlplus/triple.hpp
old mode 100644
new mode 100755
diff --git a/src/Moof/stlplus/triple.tpp b/src/Moof/stlplus/triple.tpp
old mode 100644
new mode 100755
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 0cd01df..016518b 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -4,7 +4,7 @@ INSTALLER_NAME = yoinksetup-$(VERSION).exe
 .PHONY: installer
 installer:
 	@echo "Building win32 installer..."
-	@(sh build-installer.sh $(INSTALLER_NAME) 2> installer.log 1>&2 && \
+	@(sh mkpackage.sh $(INSTALLER_NAME) 2> installer.log 1>&2 && \
 	  rm installer.log && echo "Done.") || \
 	(echo "Installer compilation failed!"; \
 	 echo "Check installer.log for details."; exit 1)
diff --git a/win32/build-installer.sh.in b/win32/mkpackage.sh.in
similarity index 100%
rename from win32/build-installer.sh.in
rename to win32/mkpackage.sh.in