From 10fc1ea5370d037c3f345ed7e9dc0adb2a1afa35 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Tue, 10 Feb 2004 15:22:29 +0000
Subject: [PATCH] A bit more Makefile massaging.

---
 FlightGear.dsp                    | 391 +++++++++++++++++++++++++++---
 configure.ac                      |   2 +
 scripts/Makefile.am               |   2 +-
 scripts/perl/Makefile.am          |   2 +-
 scripts/perl/examples/Makefile.am |   9 +
 5 files changed, 366 insertions(+), 40 deletions(-)
 create mode 100644 scripts/perl/examples/Makefile.am

diff --git a/FlightGear.dsp b/FlightGear.dsp
index 25840f4f9..0ca7f8a67 100644
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -647,6 +647,36 @@ SOURCE=.\src\ATC\AILocalTraffic.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\ATC\AIGAVFRTraffic.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\AIGAVFRTraffic.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\ATC\transmission.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -741,7 +771,7 @@ SOURCE=.\src\Autopilot\auto_gui.hxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Autopilot\newauto.cxx
+SOURCE=.\src\Autopilot\route_mgr.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -756,7 +786,37 @@ SOURCE=.\src\Autopilot\newauto.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Autopilot\newauto.hxx
+SOURCE=.\src\Autopilot\route_mgr.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Autopilot"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Autopilot"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Autopilot\xmlauto.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Autopilot"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Autopilot"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Autopilot\xmlauto.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -6876,6 +6936,36 @@ SOURCE=.\src\FDM\YASim\Wing.hpp
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\YASim\Turbulence.cpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_YASim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_YASim"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\YASim\Turbulence.hpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_YASim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_YASim"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Lib_Flight"
@@ -7364,6 +7454,66 @@ SOURCE=.\src\GUI\trackball.h
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\GUI\puList.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_GUI"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_GUI"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\GUI\puList.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_GUI"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_GUI"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\GUI\AirportList.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_GUI"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_GUI"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\GUI\AirportList.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_GUI"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_GUI"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Lib_Input"
@@ -8359,6 +8509,160 @@ SOURCE=.\src\Model\panelnode.hxx
 
 !ENDIF 
 
+# End Source File
+# End Group
+# Begin Group "Lib_AIModel"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\AIModel\AIManager.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\AIModel\AIManager.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\AIModel\AIBase.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\AIModel\AIBase.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\AIModel\AIAircraft.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\AIModel\AIAircraft.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\AIModel\AIShip.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\AIModel\AIShip.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\AIModel\AIBallistic.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\AIModel\AIBallistic.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Lib_MultiPlayer"
@@ -8824,6 +9128,36 @@ SOURCE=.\src\Network\joyclient.hxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\Network\jsclient.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Network"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Network"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Network\jsclient.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Network"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Network"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\Network\native.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -9226,40 +9560,6 @@ SOURCE=.\src\Network\generic.cxx
 
 !ENDIF 
 
-# End Source File
-# End Group
-# Begin Group "Lib_Objects"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\Objects\ssgEntityArray.hxx
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_Objects"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_Objects"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\Objects\ssgEntityArray.cxx
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_Objects"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_Objects"
-
-!ENDIF 
-
 # End Source File
 # End Group
 # Begin Group "Lib_Replay"
@@ -9485,7 +9785,7 @@ SOURCE=.\src\Scenery\tilemgr.hxx
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\Scripting\scriptmgr.cxx
+SOURCE=.\src\Scripting\NasalSys.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -9500,7 +9800,22 @@ SOURCE=.\src\Scripting\scriptmgr.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Scripting\scriptmgr.hxx
+SOURCE=.\src\Scripting\NasalSys.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Scripting"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Scripting"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Scripting\nasal-props.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
diff --git a/configure.ac b/configure.ac
index a7e4d2d57..65f897252 100644
--- a/configure.ac
+++ b/configure.ac
@@ -481,6 +481,8 @@ AC_CONFIG_FILES([ \
 	man/pstest.1 \
         scripts/Makefile \
         scripts/debug/Makefile \
+        scripts/perl/Makefile \
+        scripts/perl/examples/Makefile \
         scripts/python/Makefile \
 	src/Makefile \
 	src/Include/Makefile \
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 51495c4cd..458762cf0 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1 +1 @@
-SUBDIRS = debug python example
+SUBDIRS = debug perl python
diff --git a/scripts/perl/Makefile.am b/scripts/perl/Makefile.am
index bb2ed19c7..aee2d7baa 100644
--- a/scripts/perl/Makefile.am
+++ b/scripts/perl/Makefile.am
@@ -1 +1 @@
-SUBDIRS = dafif examples scenery web
+SUBDIRS = examples
diff --git a/scripts/perl/examples/Makefile.am b/scripts/perl/examples/Makefile.am
new file mode 100644
index 000000000..883cfcde9
--- /dev/null
+++ b/scripts/perl/examples/Makefile.am
@@ -0,0 +1,9 @@
+EXTRA_DIST = \
+	aircraft.pl \
+	autopilot.pl \
+	environment.pl \
+	flyplan.pl \
+	logging.pl \
+	position.pl \
+	reset.pl \
+	telnet.pl