From 3fd6702613fec2fa8064d720645bf6bb8275d18e Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Thu, 16 Aug 2012 07:11:00 +0000
Subject: [PATCH] build: fix a few compilation and build errors.

---
 test/Makefile.am                    | 8 ++++----
 test/Physics/Src/EasyConstraint.cpp | 5 +++++
 test/math/Makefile.am               | 8 ++++----
 tutorial/Makefile.am                | 4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 517d0fae..81ca88a8 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -6,10 +6,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/src
 bench: benchsuite$(EXEEXT)
 	./benchsuite$(EXEEXT)
 
-all-local: $(noinst_PROGRAMS)
-	test x$(MAKE_FSELF) = xno || make_fself quad$(EXEEXT) quad.self
-	test x$(MAKE_FSELF) = xno || make_fself benchsuite$(EXEEXT) benchsuite.self
-	test x$(MAKE_FSELF) = xno || make_fself testsuite$(EXEEXT) testsuite.self
+all-local: $(PROGRAMS) $(noinst_PROGRAMS)
+	for x in $(^:%$(EXEEXT)=%); do \
+	  test x$(MAKE_FSELF) = xno || make_fself $${x}$(EXEEXT) $${x}.self; \
+	done
 
 CLEANFILES = $(noinst_PROGRAMS:%$(EXEEXT)=%.self) \
              $(noinst_PROGRAMS:%$(EXEEXT)=%.elf) \
diff --git a/test/Physics/Src/EasyConstraint.cpp b/test/Physics/Src/EasyConstraint.cpp
index a7ca6b87..f5620a91 100644
--- a/test/Physics/Src/EasyConstraint.cpp
+++ b/test/Physics/Src/EasyConstraint.cpp
@@ -1,3 +1,8 @@
+
+#if defined HAVE_CONFIG_H
+#   include "config.h"
+#endif
+
 #include "../Include/LolBtPhysicsIntegration.h"
 #include "../Include/LolPhysics.h"
 #include "../Include/EasyConstraint.h"
diff --git a/test/math/Makefile.am b/test/math/Makefile.am
index 6be1c731..b43192ee 100644
--- a/test/math/Makefile.am
+++ b/test/math/Makefile.am
@@ -1,10 +1,10 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
-all-local: $(noinst_PROGRAMS)
-	test x$(MAKE_FSELF) = xno || make_fself pi$(EXEEXT) pi.self
-	test x$(MAKE_FSELF) = xno || make_fself poly$(EXEEXT) poly.self
-	test x$(MAKE_FSELF) = xno || make_fself remez$(EXEEXT) remez.self
+all-local: $(PROGRAMS) $(noinst_PROGRAMS)
+	for x in $(^:%$(EXEEXT)=%); do \
+	  test x$(MAKE_FSELF) = xno || make_fself $${x}$(EXEEXT) $${x}.self; \
+	done
 
 EXTRA_DIST = NEWS.txt lolremez.sln remez.vcxproj remez.vcxproj.filters
 
diff --git a/tutorial/Makefile.am b/tutorial/Makefile.am
index 804a8b76..a842e022 100644
--- a/tutorial/Makefile.am
+++ b/tutorial/Makefile.am
@@ -1,8 +1,8 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
-all-local: $(noinst_PROGRAMS)
-	for x in $(noinst_PROGRAMS:%$(EXEEXT)=%); do \
+all-local: $(PROGRAMS) $(noinst_PROGRAMS)
+	for x in $(^:%$(EXEEXT)=%); do \
 	  test x$(MAKE_FSELF) = xno || make_fself $${x}$(EXEEXT) $${x}.self; \
 	done