--- SimGear-0.3.11-pre1/simgear/Makefile.in.BAD	2007-06-27 10:52:51.000000000 -0500
+++ SimGear-0.3.11-pre1/simgear/Makefile.in	2007-06-27 10:53:43.000000000 -0500
@@ -200,8 +200,8 @@ SUBDIRS = \
 	debug \
 	structure \
 	xml \
-	props \
 	misc \
+	props \
 	bucket \
 	ephemeris \
 	serial \
--- SimGear-0.3.11-pre1/simgear/Makefile.am.BAD	2007-06-27 10:53:06.000000000 -0500
+++ SimGear-0.3.11-pre1/simgear/Makefile.am	2007-06-27 10:53:16.000000000 -0500
@@ -17,8 +17,8 @@ SUBDIRS = \
 	debug \
 	structure \
 	xml \
-	props \
 	misc \
+	props \
 	bucket \
 	ephemeris \
 	serial \
--- SimGear-0.3.11-pre1/simgear/misc/Makefile.in.BAD	2007-06-27 11:01:07.000000000 -0500
+++ SimGear-0.3.11-pre1/simgear/misc/Makefile.in	2007-06-27 11:03:30.000000000 -0500
@@ -57,7 +57,6 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libsgmisc_la_DEPENDENCIES =  \
 	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/props/libsgprops.la \
 	$(top_builddir)/simgear/debug/libsgdebug.la
 am_libsgmisc_la_OBJECTS = sg_path.lo sgstream.lo strutils.lo \
 	tabbed_values.lo texcoord.lo zfstream.lo interpolator.lo
@@ -239,7 +238,6 @@ libsgmisc_la_SOURCES = \
 libsgmisc_la_LDFLAGS = -release @VERSION@ -module -lz
 libsgmisc_la_LIBADD = \
 	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/props/libsgprops.la \
 	$(top_builddir)/simgear/debug/libsgdebug.la
 
 tabbed_value_test_SOURCES = tabbed_values_test.cxx
@@ -248,7 +246,6 @@ tabbed_value_test_LDFLAGS = \
 	$(top_builddir)/simgear/xml/libsgxml.la \
 	$(top_builddir)/simgear/debug/libsgdebug.la \
 	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/props/libsgprops.la \
 	-lz
 
 swap_test_SOURCES = swap_test.cpp
--- SimGear-0.3.11-pre1/simgear/misc/Makefile.am.BAD	2007-06-27 11:03:39.000000000 -0500
+++ SimGear-0.3.11-pre1/simgear/misc/Makefile.am	2007-06-27 11:03:46.000000000 -0500
@@ -26,7 +26,6 @@ libsgmisc_la_LDFLAGS = -release @VERSION
 
 libsgmisc_la_LIBADD = \
 	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/props/libsgprops.la \
 	$(top_builddir)/simgear/debug/libsgdebug.la
 
 noinst_PROGRAMS = swap_test
@@ -37,7 +36,6 @@ tabbed_value_test_LDFLAGS = \
 	$(top_builddir)/simgear/xml/libsgxml.la \
 	$(top_builddir)/simgear/debug/libsgdebug.la \
 	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/props/libsgprops.la \
 	-lz
 
 swap_test_SOURCES = swap_test.cpp
--- SimGear-0.3.11-pre1/simgear/props/Makefile.in.BAD	2007-06-27 11:06:01.000000000 -0500
+++ SimGear-0.3.11-pre1/simgear/props/Makefile.in	2007-06-27 11:06:43.000000000 -0500
@@ -57,7 +57,8 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libsgprops_la_DEPENDENCIES = $(top_builddir)/simgear/xml/libsgxml.la \
 	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la
 am_libsgprops_la_OBJECTS = condition.lo props.lo props_io.lo
 libsgprops_la_OBJECTS = $(am_libsgprops_la_OBJECTS)
 libsgprops_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -223,7 +224,8 @@ libsgprops_la_LDFLAGS = -release @VERSIO
 libsgprops_la_LIBADD = \
 	$(top_builddir)/simgear/xml/libsgxml.la \
 	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la
 
 props_test_SOURCES = props_test.cxx
 props_test_LDFLAGS = \
@@ -231,6 +233,7 @@ props_test_LDFLAGS = \
 	$(top_builddir)/simgear/xml/libsgxml.la \
 	$(top_builddir)/simgear/debug/libsgdebug.la \
 	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
 	-lz
 
 INCLUDES = -I$(top_srcdir)
--- SimGear-0.3.11-pre1/simgear/props/Makefile.am.BAD	2007-06-27 11:06:48.000000000 -0500
+++ SimGear-0.3.11-pre1/simgear/props/Makefile.am	2007-06-27 11:07:07.000000000 -0500
@@ -17,7 +17,8 @@ libsgprops_la_LDFLAGS = -release @VERSIO
 libsgprops_la_LIBADD = \
 	$(top_builddir)/simgear/xml/libsgxml.la \
 	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la
 
 noinst_PROGRAMS = props_test
 
@@ -27,6 +28,7 @@ props_test_LDFLAGS = \
 	$(top_builddir)/simgear/xml/libsgxml.la \
 	$(top_builddir)/simgear/debug/libsgdebug.la \
 	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
 	-lz
 
 INCLUDES = -I$(top_srcdir)