From c148689adc30a829c3e7a8a1a1bb558acc07d026 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Thu, 12 Jun 2003 20:02:08 +0000
Subject: [PATCH] Fixes to match changes in SimGear-0.3.3

---
 src/Prep/ArrayFit/Makefile.am  | 6 +++++-
 src/Prep/UserDef/Makefile.am   | 3 ++-
 src/Prep/UserDef/tguserdef.cxx | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Prep/ArrayFit/Makefile.am b/src/Prep/ArrayFit/Makefile.am
index 0ac44170..12a2c87e 100644
--- a/src/Prep/ArrayFit/Makefile.am
+++ b/src/Prep/ArrayFit/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = arrayfit
+bin_PROGRAMS = arrayfit demo
 
 arrayfit_SOURCES = arrayfit.cxx
 
@@ -6,4 +6,8 @@ arrayfit_LDADD = \
 	$(top_builddir)/src/Lib/Array/libArray.a \
 	-lsgbucket -lsgmath -lsgmisc -lsgdebug -lsgxml -lz
 
+demo_SOURCES = demo.cxx
+
+demo_LDADD = -lz
+
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib
diff --git a/src/Prep/UserDef/Makefile.am b/src/Prep/UserDef/Makefile.am
index 468f4258..d914e1ad 100644
--- a/src/Prep/UserDef/Makefile.am
+++ b/src/Prep/UserDef/Makefile.am
@@ -7,6 +7,7 @@ tguserdef_LDADD = \
 	$(top_builddir)/src/Lib/Geometry/libGeometry.a \
 	$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
 	$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
-	-lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lsgdebug -lgenpolyclip -lz
+	-lsgbucket -lsgmisc -lsgmath -lsgprops -lsgio -lsgxml -lsgdebug \
+	-lgenpolyclip -lz
 
 INCLUDES = -I$(top_srcdir)/src/Lib
diff --git a/src/Prep/UserDef/tguserdef.cxx b/src/Prep/UserDef/tguserdef.cxx
index 070bc79a..68703f3f 100644
--- a/src/Prep/UserDef/tguserdef.cxx
+++ b/src/Prep/UserDef/tguserdef.cxx
@@ -5,8 +5,8 @@
 #include <simgear/compiler.h>
 #include <simgear/math/point3d.hxx>
 #include <simgear/misc/exception.hxx>
-#include <simgear/misc/props_io.hxx>
-#include <simgear/misc/props.hxx>
+#include <simgear/props/props_io.hxx>
+#include <simgear/props/props.hxx>
 
 #include <Geometry/util.hxx>
 #include <Polygon/index.hxx>