diff --git a/aircraft/737/Makefile.am b/aircraft/737/Makefile.am
index 61f7c77c1a9dcec27e61e7bfbd707b18a4c08c90..e055d2c506e193ca8466c66d42089947374ffbda 100644
--- a/aircraft/737/Makefile.am
+++ b/aircraft/737/Makefile.am
@@ -1,8 +1,8 @@
aircraft_737dir = ${pkgdatadir}/aircraft/737
aircraft_737_DATA = \
- 737.xml \
INSTALL \
- reset00.xml \
cruise_steady_turn_init.xml \
- cruise_init.xml
+ cruise_init.xml \
+ reset00.xml \
+ 737.xml
EXTRA_DIST=$(aircraft_737_DATA)
diff --git a/aircraft/B17/Makefile.am b/aircraft/B17/Makefile.am
index 80c1dc946585bc9029182076d9880fcd53663917..6ef5f98cf5083c945f3fd24eee5aed8fe237ec70 100644
--- a/aircraft/B17/Makefile.am
+++ b/aircraft/B17/Makefile.am
@@ -1,6 +1,6 @@
aircraft_B17dir = ${pkgdatadir}/aircraft/B17
aircraft_B17_DATA = \
INSTALL \
- reset00.xml \
- B17.xml
+ B17.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_B17_DATA)
diff --git a/aircraft/B747/Makefile.am b/aircraft/B747/Makefile.am
index 5ec12ae45442f688a61ab9b3d3cce2d0f8cf6a80..191dc475cbb2ce3f6af2e746cdf8e7744252f955 100644
--- a/aircraft/B747/Makefile.am
+++ b/aircraft/B747/Makefile.am
@@ -1,6 +1,6 @@
aircraft_B747dir = ${pkgdatadir}/aircraft/B747
aircraft_B747_DATA = \
+ B747.xml \
INSTALL \
- reset00.xml \
- B747.xml
+ reset00.xml
EXTRA_DIST=$(aircraft_B747_DATA)
diff --git a/aircraft/C130/Makefile.am b/aircraft/C130/Makefile.am
index cc49a3620b47e0c2eb522f04f6682975bde55097..95449e293c543cfeb49356c77b55850fc57fb109 100644
--- a/aircraft/C130/Makefile.am
+++ b/aircraft/C130/Makefile.am
@@ -1,6 +1,6 @@
aircraft_C130dir = ${pkgdatadir}/aircraft/C130
aircraft_C130_DATA = \
INSTALL \
- reset00.xml \
- C130.xml
+ C130.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_C130_DATA)
diff --git a/aircraft/DHC6/Makefile.am b/aircraft/DHC6/Makefile.am
index 93fba793b3c0ce1e31d6d22039f5615952bc60f2..a8d934086b18ebbf34bb0c013bfb4a60d77fe665 100644
--- a/aircraft/DHC6/Makefile.am
+++ b/aircraft/DHC6/Makefile.am
@@ -1,5 +1,5 @@
aircraft_DHC6dir = ${pkgdatadir}/aircraft/DHC6
aircraft_DHC6_DATA = \
- INSTALL \
- DHC6.xml
+ DHC6.xml \
+ INSTALL
EXTRA_DIST=$(aircraft_DHC6_DATA)
diff --git a/aircraft/F4N/Makefile.am b/aircraft/F4N/Makefile.am
index f044efab0f4a567dfe7c77f11e4aed0b8071bdec..9730134b6da37b0dfe5adfad9c4def674906a976 100644
--- a/aircraft/F4N/Makefile.am
+++ b/aircraft/F4N/Makefile.am
@@ -2,8 +2,8 @@ SUBDIRS = \
Engines
aircraft_F4Ndir = ${pkgdatadir}/aircraft/F4N
aircraft_F4N_DATA = \
- INSTALL \
- reset00.xml \
F4N.xml \
- F4N-jsbsim.xml
+ INSTALL \
+ F4N-jsbsim.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_F4N_DATA)
diff --git a/aircraft/J246/Systems/Makefile.am b/aircraft/J246/Systems/Makefile.am
index 975d1a7578fdbe09d3100ea3789d2c22a354b2d5..1a8d48829df0f577cb7ff364d3270af92bfcd7c3 100644
--- a/aircraft/J246/Systems/Makefile.am
+++ b/aircraft/J246/Systems/Makefile.am
@@ -1,7 +1,7 @@
aircraft_J246_Systemsdir = ${pkgdatadir}/aircraft/J246/Systems
aircraft_J246_Systems_DATA = \
+ J246SecondStageEffectors.xml \
J246ControlSystem.xml \
J246GuidanceExecutive.xml \
- J246SecondStageEffectors.xml \
J246FirstStageEffectors.xml
EXTRA_DIST=$(aircraft_J246_Systems_DATA)
diff --git a/aircraft/L17/Makefile.am b/aircraft/L17/Makefile.am
index 8a46de4986944639a5bcc60e86a9f85e192a7f67..618edce4e218a674fd035199f2e4854d7c8d4e28 100644
--- a/aircraft/L17/Makefile.am
+++ b/aircraft/L17/Makefile.am
@@ -1,5 +1,5 @@
aircraft_L17dir = ${pkgdatadir}/aircraft/L17
aircraft_L17_DATA = \
- INSTALL \
- L17.xml
+ L17.xml \
+ INSTALL
EXTRA_DIST=$(aircraft_L17_DATA)
diff --git a/aircraft/Makefile.am b/aircraft/Makefile.am
index 9b7f17f1cd72b94874f95b30b7397e658eef1e24..4a2fa5486bcf24f570e7b651ed78e2a51276082d 100644
--- a/aircraft/Makefile.am
+++ b/aircraft/Makefile.am
@@ -1,56 +1,57 @@
SUBDIRS = \
- SGS \
- MD11 \
- B17 \
- c172x \
+ c310 \
f104 \
- C130 \
- Shuttle \
- T38 \
- LM \
- f16 \
- B747 \
- minisgs \
+ J246 \
+ fokker100 \
sgs126 \
- DHC6 \
- ZLT-NT \
blank \
- pc7 \
- OV10 \
- x24b \
- fokker100 \
- dr1 \
- 737 \
- f22 \
- t6texan2 \
- pogo-jsbsim \
- p51d \
- paraglider \
- J246 \
- F4N \
- c310 \
- c182 \
- ball \
XB-70 \
- c172r \
- A320 \
+ Shuttle \
+ c172x \
L410 \
- fokker50 \
+ c172p \
mk82 \
- Submarine_Scout \
- T37 \
+ MD11 \
+ minisgs \
+ f15 \
+ Boeing314 \
+ c172r \
sgs233 \
+ x24b \
+ p51d \
+ F4N \
+ T37 \
+ pogo-jsbsim \
+ ZLT-NT \
+ pc7 \
+ ah1s \
+ Submarine_Scout \
+ 737 \
Concorde \
- L17 \
+ T38 \
+ A320 \
Short_S23 \
- A4 \
- c172p \
- f15 \
- pa28 \
- ah1s \
+ fokker50 \
+ B17 \
+ t6texan2 \
+ C130 \
+ paraglider \
X15 \
+ DHC6 \
+ L17 \
+ OV10 \
+ f22 \
+ easystar \
+ ball \
+ LM \
+ A4 \
F80C \
- Boeing314
+ B747 \
+ pa28 \
+ dr1 \
+ SGS \
+ c182 \
+ f16
aircraftdir = ${pkgdatadir}/aircraft
aircraft_DATA = \
aircraft_template.xml
diff --git a/aircraft/OV10/Makefile.am b/aircraft/OV10/Makefile.am
index 3d9f1b73928c6ebcd3f0db23630c218ab61ef25f..45a413faffca4aa00df2b680a66f29205797e58b 100644
--- a/aircraft/OV10/Makefile.am
+++ b/aircraft/OV10/Makefile.am
@@ -1,5 +1,5 @@
aircraft_OV10dir = ${pkgdatadir}/aircraft/OV10
aircraft_OV10_DATA = \
- reset00.xml \
- OV10.xml
+ OV10.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_OV10_DATA)
diff --git a/aircraft/SGS/Makefile.am b/aircraft/SGS/Makefile.am
index 614720f1b8f417baf0ae8a9f58e3813c9a40013d..76486dbd9d7b1945b06c43ee891f1ba0e541bac2 100644
--- a/aircraft/SGS/Makefile.am
+++ b/aircraft/SGS/Makefile.am
@@ -1,6 +1,6 @@
aircraft_SGSdir = ${pkgdatadir}/aircraft/SGS
aircraft_SGS_DATA = \
INSTALL \
- reset00.xml \
- SGS.xml
+ SGS.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_SGS_DATA)
diff --git a/aircraft/Short_S23/Makefile.am b/aircraft/Short_S23/Makefile.am
index 1a860dd3c6228ebf6dfde3af16feb11c5146ad59..84a896f451e5975c0504e91bfe3ecb493f69353e 100644
--- a/aircraft/Short_S23/Makefile.am
+++ b/aircraft/Short_S23/Makefile.am
@@ -2,8 +2,8 @@ SUBDIRS = \
Systems
aircraft_Short_S23dir = ${pkgdatadir}/aircraft/Short_S23
aircraft_Short_S23_DATA = \
- INSTALL \
- reset00.xml \
Short_S23.xml \
- output.xml
+ INSTALL \
+ output.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_Short_S23_DATA)
diff --git a/aircraft/Short_S23/Systems/Makefile.am b/aircraft/Short_S23/Systems/Makefile.am
index 097565a169e28f467f7dce447a736cfc1b3c2f78..98f5d9fe20063e96a4d49103057b6b1b160c5395 100644
--- a/aircraft/Short_S23/Systems/Makefile.am
+++ b/aircraft/Short_S23/Systems/Makefile.am
@@ -1,8 +1,8 @@
aircraft_Short_S23_Systemsdir = ${pkgdatadir}/aircraft/Short_S23/Systems
aircraft_Short_S23_Systems_DATA = \
- hydrodynamics.xml \
- fuel-system.xml \
take-off-ap.xml \
+ fuel-system.xml \
+ hydrodynamics.xml \
engines.xml \
datcom_aero.xml
EXTRA_DIST=$(aircraft_Short_S23_Systems_DATA)
diff --git a/aircraft/Shuttle/Makefile.am b/aircraft/Shuttle/Makefile.am
index 965c9fce6adb3d18e0ac327c6a7a806e1e00ccad..da7a537b99074462e2598d7848462a2b2d48ac15 100644
--- a/aircraft/Shuttle/Makefile.am
+++ b/aircraft/Shuttle/Makefile.am
@@ -1,5 +1,5 @@
aircraft_Shuttledir = ${pkgdatadir}/aircraft/Shuttle
aircraft_Shuttle_DATA = \
- reset00.xml \
- Shuttle.xml
+ Shuttle.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_Shuttle_DATA)
diff --git a/aircraft/Submarine_Scout/Makefile.am b/aircraft/Submarine_Scout/Makefile.am
index febabf5c6c30079ec425fab4b1f18321dcf0a1d2..9459e1afc2fe59b370e9a32f1c81079d607fa5ac 100644
--- a/aircraft/Submarine_Scout/Makefile.am
+++ b/aircraft/Submarine_Scout/Makefile.am
@@ -2,9 +2,9 @@ SUBDIRS = \
Systems
aircraft_Submarine_Scoutdir = ${pkgdatadir}/aircraft/Submarine_Scout
aircraft_Submarine_Scout_DATA = \
- INSTALL \
- reset00.xml \
takeoff.xml \
+ Submarine_Scout.xml \
+ INSTALL \
reset01.xml \
- Submarine_Scout.xml
+ reset00.xml
EXTRA_DIST=$(aircraft_Submarine_Scout_DATA)
diff --git a/aircraft/T37/Makefile.am b/aircraft/T37/Makefile.am
index cc2e7b1d27173291355fb8f59b20f1356f4cc932..e5a33d574b70ec86f82559b663976318b97cace3 100644
--- a/aircraft/T37/Makefile.am
+++ b/aircraft/T37/Makefile.am
@@ -1,5 +1,5 @@
aircraft_T37dir = ${pkgdatadir}/aircraft/T37
aircraft_T37_DATA = \
- reset00.xml \
- T37.xml
+ T37.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_T37_DATA)
diff --git a/aircraft/T38/Makefile.am b/aircraft/T38/Makefile.am
index bce2640deb3791b08e1ed970b8d9907b601a4a89..f43efca74b4c1f632b885385f6e8dfc925c22f18 100644
--- a/aircraft/T38/Makefile.am
+++ b/aircraft/T38/Makefile.am
@@ -1,5 +1,5 @@
aircraft_T38dir = ${pkgdatadir}/aircraft/T38
aircraft_T38_DATA = \
- reset00.xml \
- T38.xml
+ T38.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_T38_DATA)
diff --git a/aircraft/X15/Makefile.am b/aircraft/X15/Makefile.am
index b4cfaf090f22bf4933b26125b1df7aef1b3bcb87..a164f4e7285d66344819bccf872674b1c2b2b8f1 100644
--- a/aircraft/X15/Makefile.am
+++ b/aircraft/X15/Makefile.am
@@ -1,6 +1,6 @@
aircraft_X15dir = ${pkgdatadir}/aircraft/X15
aircraft_X15_DATA = \
- reset00.xml \
X15.xml \
- reset01.xml
+ reset01.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_X15_DATA)
diff --git a/aircraft/XB-70/Makefile.am b/aircraft/XB-70/Makefile.am
index cef7181d828f13a538aa4a4e65b64accbc9174a7..86645ecbfbaada97bcad0c24eab04b50573b7db8 100644
--- a/aircraft/XB-70/Makefile.am
+++ b/aircraft/XB-70/Makefile.am
@@ -1,6 +1,6 @@
aircraft_XB_70dir = ${pkgdatadir}/aircraft/XB_70
aircraft_XB_70_DATA = \
+ XB-70.xml \
INSTALL \
- reset00.xml \
- XB-70.xml
+ reset00.xml
EXTRA_DIST=$(aircraft_XB_70_DATA)
diff --git a/aircraft/ZLT-NT/Makefile.am b/aircraft/ZLT-NT/Makefile.am
index 6a9e34db168895bc6ff3baf7a4dbe5903d1333c6..479aa38c88e413f8d72e0b3a9f2b399179345743 100644
--- a/aircraft/ZLT-NT/Makefile.am
+++ b/aircraft/ZLT-NT/Makefile.am
@@ -3,6 +3,6 @@ SUBDIRS = \
aircraft_ZLT_NTdir = ${pkgdatadir}/aircraft/ZLT_NT
aircraft_ZLT_NT_DATA = \
INSTALL \
- reset00.xml \
- ZLT-NT.xml
+ ZLT-NT.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_ZLT_NT_DATA)
diff --git a/aircraft/ZLT-NT/Systems/Makefile.am b/aircraft/ZLT-NT/Systems/Makefile.am
index b148ec4ad384d20b9b8ced9d22bc40f65e90e7b4..59a6e456e9ee23e6864a25ff514dca140c6b93c2 100644
--- a/aircraft/ZLT-NT/Systems/Makefile.am
+++ b/aircraft/ZLT-NT/Systems/Makefile.am
@@ -1,7 +1,7 @@
aircraft_ZLT_NT_Systemsdir = ${pkgdatadir}/aircraft/ZLT_NT/Systems
aircraft_ZLT_NT_Systems_DATA = \
- engine-control.xml \
air-and-gas-control.xml \
- datcom_aero.xml \
- gerris_aero.xml
+ engine-control.xml \
+ gerris_aero.xml \
+ datcom_aero.xml
EXTRA_DIST=$(aircraft_ZLT_NT_Systems_DATA)
diff --git a/aircraft/ah1s/Makefile.am b/aircraft/ah1s/Makefile.am
index 32c7f8f97f2fd2311cd1d476007afb5b0737df7a..b3c5c9e537590dbc57bbec959a5df474f1792c32 100644
--- a/aircraft/ah1s/Makefile.am
+++ b/aircraft/ah1s/Makefile.am
@@ -1,5 +1,5 @@
aircraft_ah1sdir = ${pkgdatadir}/aircraft/ah1s
aircraft_ah1s_DATA = \
- reset00.xml \
- ah1s.xml
+ ah1s.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_ah1s_DATA)
diff --git a/aircraft/ball/Makefile.am b/aircraft/ball/Makefile.am
index c88112280e2852a03c9ecd5cf0939c53061b8bed..211a50f5569543bc8ab92d9e167684f206d12522 100644
--- a/aircraft/ball/Makefile.am
+++ b/aircraft/ball/Makefile.am
@@ -1,8 +1,8 @@
aircraft_balldir = ${pkgdatadir}/aircraft/ball
aircraft_ball_DATA = \
- INSTALL \
ball.xml \
- reset00.xml \
+ reset00_v2.xml \
+ INSTALL \
reset01.xml \
- reset00_v2.xml
+ reset00.xml
EXTRA_DIST=$(aircraft_ball_DATA)
diff --git a/aircraft/blank/Makefile.am b/aircraft/blank/Makefile.am
index 839abd3c5c5bb94421bbac2680708c79592a126a..8bba9c73206ccea8eea1f7a1a28e9f0d301c9a6c 100644
--- a/aircraft/blank/Makefile.am
+++ b/aircraft/blank/Makefile.am
@@ -1,6 +1,6 @@
aircraft_blankdir = ${pkgdatadir}/aircraft/blank
aircraft_blank_DATA = \
INSTALL \
- reset00.xml \
- blank.xml
+ blank.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_blank_DATA)
diff --git a/aircraft/c172p/Makefile.am b/aircraft/c172p/Makefile.am
index 1d3f9dbff116af52da9f760425158c4a5c7a3494..9d04e71e9f501e5a954f376f8ebdac9ab8372b42 100644
--- a/aircraft/c172p/Makefile.am
+++ b/aircraft/c172p/Makefile.am
@@ -1,7 +1,7 @@
aircraft_c172pdir = ${pkgdatadir}/aircraft/c172p
aircraft_c172p_DATA = \
- c172p.xml \
- reset00.xml \
README.flightmodel.c172p \
- reset01.xml
+ c172p.xml \
+ reset01.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_c172p_DATA)
diff --git a/aircraft/c172r/Makefile.am b/aircraft/c172r/Makefile.am
index 4b47b1fe3ce85b8a0239b320f690092e452a1435..058935b993816aa0800a2fa273d3f0ce204c82ef 100644
--- a/aircraft/c172r/Makefile.am
+++ b/aircraft/c172r/Makefile.am
@@ -1,7 +1,7 @@
aircraft_c172rdir = ${pkgdatadir}/aircraft/c172r
aircraft_c172r_DATA = \
- reset00.xml \
+ c172r.xml \
reset01.xml \
README.c172r \
- c172r.xml
+ reset00.xml
EXTRA_DIST=$(aircraft_c172r_DATA)
diff --git a/aircraft/c172x/Makefile.am b/aircraft/c172x/Makefile.am
index 1b74b9d0988e6f395d11005333379acfc06fc0e9..7afa3aa950eb87aba443f361a88902f83e5dfa87 100644
--- a/aircraft/c172x/Makefile.am
+++ b/aircraft/c172x/Makefile.am
@@ -1,10 +1,10 @@
aircraft_c172xdir = ${pkgdatadir}/aircraft/c172x
aircraft_c172x_DATA = \
- c172x.xml \
INSTALL \
elevator_doublet_init.xml \
- reset00.xml \
+ c172ap.xml \
+ c172x.xml \
reset01.xml \
output.xml \
- c172ap.xml
+ reset00.xml
EXTRA_DIST=$(aircraft_c172x_DATA)
diff --git a/aircraft/c182/Makefile.am b/aircraft/c182/Makefile.am
index c1948026f1495e68ea2b0c878687764c0a09b676..f15899165121fd615f33879eed9715503abdb2d0 100644
--- a/aircraft/c182/Makefile.am
+++ b/aircraft/c182/Makefile.am
@@ -1,6 +1,6 @@
aircraft_c182dir = ${pkgdatadir}/aircraft/c182
aircraft_c182_DATA = \
- reset00.xml \
c182.xml \
- README.c182
+ README.c182 \
+ reset00.xml
EXTRA_DIST=$(aircraft_c182_DATA)
diff --git a/aircraft/c310/Makefile.am b/aircraft/c310/Makefile.am
index 1269b50123bd8452fea71cb8241146c48379ac27..1004d0dba6673b0b796933f25eca923fbcb5fb1f 100644
--- a/aircraft/c310/Makefile.am
+++ b/aircraft/c310/Makefile.am
@@ -1,8 +1,8 @@
aircraft_c310dir = ${pkgdatadir}/aircraft/c310
aircraft_c310_DATA = \
- reset00.xml \
c310ap.xml \
+ ellington.xml \
c310.xml \
README.c310 \
- ellington.xml
+ reset00.xml
EXTRA_DIST=$(aircraft_c310_DATA)
diff --git a/aircraft/easystar/Datcom/Makefile.am b/aircraft/easystar/Datcom/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..60ec9fd783b9d37653dd76879e875e92b7a53952
--- /dev/null
+++ b/aircraft/easystar/Datcom/Makefile.am
@@ -0,0 +1,4 @@
+aircraft_easystar_Datcomdir = ${pkgdatadir}/aircraft/easystar/Datcom
+aircraft_easystar_Datcom_DATA = \
+ easystar.dcm
+EXTRA_DIST=$(aircraft_easystar_Datcom_DATA)
diff --git a/aircraft/easystar/Engines/Makefile.am b/aircraft/easystar/Engines/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..617f92f3f9041b169e8a6796edd162b5f02ec4a7
--- /dev/null
+++ b/aircraft/easystar/Engines/Makefile.am
@@ -0,0 +1,5 @@
+aircraft_easystar_Enginesdir = ${pkgdatadir}/aircraft/easystar/Engines
+aircraft_easystar_Engines_DATA = \
+ apc6x4.xml \
+ HB2815-2000.xml
+EXTRA_DIST=$(aircraft_easystar_Engines_DATA)
diff --git a/aircraft/easystar/Makefile.am b/aircraft/easystar/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..98ba59ce5a22a2f6937fe129300d1ee3e211c74e
--- /dev/null
+++ b/aircraft/easystar/Makefile.am
@@ -0,0 +1,17 @@
+SUBDIRS = \
+ Engines \
+ scripts \
+ Datcom \
+ Models
+aircraft_easystardir = ${pkgdatadir}/aircraft/easystar
+aircraft_easystar_DATA = \
+ easystar-windtunnel.xml \
+ easystar.xml \
+ easystar-windtunnel-set.xml \
+ cruise_steady_turn_init.xml \
+ easystar-datcom-set.xml \
+ reset01.xml \
+ easystar-datcom.xml \
+ reset00.xml \
+ easystar-sound.xml
+EXTRA_DIST=$(aircraft_easystar_DATA)
diff --git a/aircraft/easystar/Models/Makefile.am b/aircraft/easystar/Models/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..718f7b5ba7978eab0c534b1455ac6d44fc295294
--- /dev/null
+++ b/aircraft/easystar/Models/Makefile.am
@@ -0,0 +1,6 @@
+aircraft_easystar_Modelsdir = ${pkgdatadir}/aircraft/easystar/Models
+aircraft_easystar_Models_DATA = \
+ easystar.ac \
+ easystar.blend \
+ easystar-model.xml
+EXTRA_DIST=$(aircraft_easystar_Models_DATA)
diff --git a/aircraft/easystar/scripts/Makefile.am b/aircraft/easystar/scripts/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..8d0b59b049d0c4aaa575012730773e146ec7da9d
--- /dev/null
+++ b/aircraft/easystar/scripts/Makefile.am
@@ -0,0 +1,4 @@
+aircraft_easystar_scriptsdir = ${pkgdatadir}/aircraft/easystar/scripts
+aircraft_easystar_scripts_DATA = \
+ trim.xml
+EXTRA_DIST=$(aircraft_easystar_scripts_DATA)
diff --git a/aircraft/f104/Makefile.am b/aircraft/f104/Makefile.am
index 31c0d6a4511642609498c709eaa447a101566d72..8e60054576b84d8403644b4017731158205f5523 100644
--- a/aircraft/f104/Makefile.am
+++ b/aircraft/f104/Makefile.am
@@ -1,5 +1,5 @@
aircraft_f104dir = ${pkgdatadir}/aircraft/f104
aircraft_f104_DATA = \
- INSTALL \
- f104.xml
+ f104.xml \
+ INSTALL
EXTRA_DIST=$(aircraft_f104_DATA)
diff --git a/aircraft/f15/Makefile.am b/aircraft/f15/Makefile.am
index fb714ca886260c0427bf7b68e6b070ba44fa8323..c37a4051583a4b001dbd378e3dc55f9a10b31466 100644
--- a/aircraft/f15/Makefile.am
+++ b/aircraft/f15/Makefile.am
@@ -1,5 +1,5 @@
aircraft_f15dir = ${pkgdatadir}/aircraft/f15
aircraft_f15_DATA = \
- f15.xml \
- INSTALL
+ INSTALL \
+ f15.xml
EXTRA_DIST=$(aircraft_f15_DATA)
diff --git a/aircraft/f16/Makefile.am b/aircraft/f16/Makefile.am
index 74171601fd5c5a5314db3b13950c7303dbb175c1..d0e881d46ead2b949a2bab1d5e31289a01adeae9 100644
--- a/aircraft/f16/Makefile.am
+++ b/aircraft/f16/Makefile.am
@@ -2,7 +2,8 @@ SUBDIRS = \
Systems
aircraft_f16dir = ${pkgdatadir}/aircraft/f16
aircraft_f16_DATA = \
+ README \
f16.xml \
- reset00.xml \
- README
+ cruise_steady_turn_init.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_f16_DATA)
diff --git a/aircraft/f22/Makefile.am b/aircraft/f22/Makefile.am
index 3bf4c6b8a8fd4374e70b515181ea31cd135e72cb..f77e7332ef507702ba491cde6883e130014d7dfa 100644
--- a/aircraft/f22/Makefile.am
+++ b/aircraft/f22/Makefile.am
@@ -1,6 +1,6 @@
aircraft_f22dir = ${pkgdatadir}/aircraft/f22
aircraft_f22_DATA = \
- f22.xml \
+ README \
yf22.xml \
- README
+ f22.xml
EXTRA_DIST=$(aircraft_f22_DATA)
diff --git a/aircraft/minisgs/Makefile.am b/aircraft/minisgs/Makefile.am
index 04464f5d24600a50f0c010c6159f7333e33a3419..bfbb1aec521bbeb467ac9b771c00bf4d92eee2b8 100644
--- a/aircraft/minisgs/Makefile.am
+++ b/aircraft/minisgs/Makefile.am
@@ -1,6 +1,6 @@
aircraft_minisgsdir = ${pkgdatadir}/aircraft/minisgs
aircraft_minisgs_DATA = \
INSTALL \
- reset00.xml \
- minisgs.xml
+ minisgs.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_minisgs_DATA)
diff --git a/aircraft/mk82/Makefile.am b/aircraft/mk82/Makefile.am
index 9189a68357960a17ebbd7824e88495fff1765d19..9bbfbff0aace6962a78918b0bb73d653de50523d 100644
--- a/aircraft/mk82/Makefile.am
+++ b/aircraft/mk82/Makefile.am
@@ -1,7 +1,7 @@
aircraft_mk82dir = ${pkgdatadir}/aircraft/mk82
aircraft_mk82_DATA = \
INSTALL \
- reset00.xml \
mk82.xml \
- reset01.xml
+ reset01.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_mk82_DATA)
diff --git a/aircraft/p51d/Engines/Makefile.am b/aircraft/p51d/Engines/Makefile.am
index e900d3d56e68f5f72dd3f02b9da224dcd6f9e356..89bed0fa7564942d838c649a8275a2e868058d1d 100644
--- a/aircraft/p51d/Engines/Makefile.am
+++ b/aircraft/p51d/Engines/Makefile.am
@@ -1,5 +1,5 @@
aircraft_p51d_Enginesdir = ${pkgdatadir}/aircraft/p51d/Engines
aircraft_p51d_Engines_DATA = \
- Packard-V-1650-7.xml \
- P51prop.xml
+ P51prop.xml \
+ Packard-V-1650-7.xml
EXTRA_DIST=$(aircraft_p51d_Engines_DATA)
diff --git a/aircraft/p51d/Makefile.am b/aircraft/p51d/Makefile.am
index 4a72f535b2138ba7a9bf3bf978f3712199d15c33..5560fe18246e35063e26ca2b78b84595ed16cf35 100644
--- a/aircraft/p51d/Makefile.am
+++ b/aircraft/p51d/Makefile.am
@@ -1,8 +1,8 @@
SUBDIRS = \
- Systems \
- Engines
+ Engines \
+ Systems
aircraft_p51ddir = ${pkgdatadir}/aircraft/p51d
aircraft_p51d_DATA = \
- INSTALL \
- p51d.xml
+ p51d.xml \
+ INSTALL
EXTRA_DIST=$(aircraft_p51d_DATA)
diff --git a/aircraft/p51d/Systems/Makefile.am b/aircraft/p51d/Systems/Makefile.am
index 85d6716ce7d1ff3284b27c3fbf28a35c582aca48..6eead8789b595e01e31e7e4659ccb7e19191252c 100644
--- a/aircraft/p51d/Systems/Makefile.am
+++ b/aircraft/p51d/Systems/Makefile.am
@@ -1,11 +1,11 @@
aircraft_p51d_Systemsdir = ${pkgdatadir}/aircraft/p51d/Systems
aircraft_p51d_Systems_DATA = \
- compressability.xml \
- mixture-control.xml \
propulsion.xml \
- electrical.xml \
- alpha-buffet.xml \
- crash-detect.xml \
+ compressability.xml \
autothrottle.xml \
- weapons-weight.xml
+ crash-detect.xml \
+ weapons-weight.xml \
+ electrical.xml \
+ mixture-control.xml \
+ alpha-buffet.xml
EXTRA_DIST=$(aircraft_p51d_Systems_DATA)
diff --git a/aircraft/pa28/Makefile.am b/aircraft/pa28/Makefile.am
index 15e85511e4b5a5b23ff9c3c0c63e5461845565a2..4aefa2ae01c4b2cf37972e9683f06442fa49f7a7 100644
--- a/aircraft/pa28/Makefile.am
+++ b/aircraft/pa28/Makefile.am
@@ -1,6 +1,6 @@
aircraft_pa28dir = ${pkgdatadir}/aircraft/pa28
aircraft_pa28_DATA = \
+ pa28.xml \
INSTALL \
- reset00.xml \
- pa28.xml
+ reset00.xml
EXTRA_DIST=$(aircraft_pa28_DATA)
diff --git a/aircraft/pogo-jsbsim/Makefile.am b/aircraft/pogo-jsbsim/Makefile.am
index 08c58e8d7be31533ca0a25e3dff818ecc9c396b5..7822bc20d93aa97a5926668c480ed565804a27bc 100644
--- a/aircraft/pogo-jsbsim/Makefile.am
+++ b/aircraft/pogo-jsbsim/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = \
Engines
aircraft_pogo_jsbsimdir = ${pkgdatadir}/aircraft/pogo_jsbsim
aircraft_pogo_jsbsim_DATA = \
- reset00.xml \
+ pogo-jsbsim.xml \
reset01.xml \
- pogo-jsbsim.xml
+ reset00.xml
EXTRA_DIST=$(aircraft_pogo_jsbsim_DATA)
diff --git a/aircraft/t6texan2/Makefile.am b/aircraft/t6texan2/Makefile.am
index 9e4d5d3a1b50126785f27fd808cd6eb6afaa76c3..63e1b1558b75435308bc88b82e218ef697bbf405 100644
--- a/aircraft/t6texan2/Makefile.am
+++ b/aircraft/t6texan2/Makefile.am
@@ -1,5 +1,5 @@
aircraft_t6texan2dir = ${pkgdatadir}/aircraft/t6texan2
aircraft_t6texan2_DATA = \
- t6texan2.xml \
- INSTALL
+ INSTALL \
+ t6texan2.xml
EXTRA_DIST=$(aircraft_t6texan2_DATA)
diff --git a/aircraft/x24b/Makefile.am b/aircraft/x24b/Makefile.am
index 78b17dc621258fc4178f4ae045a58cecce57d095..1d6141c121f6072c1f5f70bb13f426bfdddc94ef 100644
--- a/aircraft/x24b/Makefile.am
+++ b/aircraft/x24b/Makefile.am
@@ -1,5 +1,5 @@
aircraft_x24bdir = ${pkgdatadir}/aircraft/x24b
aircraft_x24b_DATA = \
- reset00.xml \
- x24b.xml
+ x24b.xml \
+ reset00.xml
EXTRA_DIST=$(aircraft_x24b_DATA)
diff --git a/configure.in b/configure.in
index 9b5f7853cfe3910bccba5a4813c747b322211821..0f7d11786721bb1334515465dc0f32abf7dadb45 100644
--- a/configure.in
+++ b/configure.in
@@ -134,107 +134,112 @@ AC_DEFINE(socklen_t,int)])])
AC_OUTPUT(
jsbsim.pc
- Makefile
- check_cases/Makefile
- check_cases/orbit/Makefile
- check_cases/orbit/logged_data/Makefile
- check_cases/orbit/systems/Makefile
- check_cases/orbit/engine/Makefile
- check_cases/orbit/data_output/Makefile
- check_cases/orbit/scripts/Makefile
- check_cases/orbit/aircraft/Makefile
- check_cases/orbit/aircraft/ball/Makefile
- check_cases/orbit/data_plot/Makefile
- check_cases/ground_tests/Makefile
- check_cases/ground_tests/logged_data/Makefile
- check_cases/ground_tests/systems/Makefile
- check_cases/ground_tests/engine/Makefile
- check_cases/ground_tests/data_output/Makefile
- check_cases/ground_tests/scripts/Makefile
- check_cases/ground_tests/aircraft/Makefile
- check_cases/ground_tests/aircraft/groundtest/Makefile
- check_cases/ground_tests/data_plot/Makefile
- systems/Makefile
- src/Makefile
- src/math/Makefile
- src/utilities/Makefile
- src/utilities/aeromatic/Makefile
- src/initialization/Makefile
+ src/math/Makefile
src/models/flight_control/Makefile
+ src/models/propulsion/Makefile
src/models/Makefile
src/models/atmosphere/Makefile
- src/models/propulsion/Makefile
- src/input_output/Makefile
- src/simgear/Makefile
- src/simgear/xml/Makefile
src/simgear/props/Makefile
src/simgear/magvar/Makefile
src/simgear/misc/Makefile
- gui/Makefile
- engine/Makefile
- data_output/Makefile
+ src/simgear/xml/Makefile
+ src/simgear/Makefile
+ src/initialization/Makefile
+ src/Makefile
+ src/input_output/Makefile
+ src/utilities/Makefile
+ src/utilities/aeromatic/Makefile
+ data_plot/Makefile
scripts/Makefile
- aircraft/SGS/Makefile
- aircraft/MD11/Makefile
- aircraft/Makefile
- aircraft/B17/Makefile
- aircraft/c172x/Makefile
+ gui/Makefile
+ aircraft/c310/Makefile
aircraft/f104/Makefile
- aircraft/C130/Makefile
- aircraft/Shuttle/Makefile
- aircraft/T38/Makefile
- aircraft/LM/Makefile
- aircraft/f16/Systems/Makefile
- aircraft/f16/Makefile
- aircraft/B747/Makefile
- aircraft/minisgs/Makefile
+ aircraft/J246/Systems/Makefile
+ aircraft/J246/Makefile
+ aircraft/fokker100/Systems/Makefile
+ aircraft/fokker100/Makefile
aircraft/sgs126/Makefile
- aircraft/DHC6/Makefile
- aircraft/ZLT-NT/Systems/Makefile
- aircraft/ZLT-NT/Makefile
aircraft/blank/Makefile
- aircraft/pc7/Makefile
- aircraft/OV10/Makefile
+ aircraft/XB-70/Makefile
+ aircraft/Shuttle/Makefile
+ aircraft/c172x/Makefile
+ aircraft/L410/Makefile
+ aircraft/c172p/Makefile
+ aircraft/mk82/Makefile
+ aircraft/MD11/Makefile
+ aircraft/minisgs/Makefile
+ aircraft/f15/Makefile
+ aircraft/Boeing314/Makefile
+ aircraft/c172r/Makefile
+ aircraft/sgs233/Makefile
aircraft/x24b/Makefile
- aircraft/fokker100/Systems/Makefile
- aircraft/fokker100/Makefile
- aircraft/dr1/Makefile
- aircraft/737/Makefile
- aircraft/f22/Makefile
- aircraft/t6texan2/Makefile
- aircraft/pogo-jsbsim/Makefile
- aircraft/pogo-jsbsim/Engines/Makefile
+ aircraft/p51d/Engines/Makefile
aircraft/p51d/Systems/Makefile
aircraft/p51d/Makefile
- aircraft/p51d/Engines/Makefile
- aircraft/paraglider/Makefile
- aircraft/J246/Systems/Makefile
- aircraft/J246/Makefile
- aircraft/F4N/Makefile
aircraft/F4N/Engines/Makefile
- aircraft/c310/Makefile
- aircraft/c182/Makefile
- aircraft/ball/Makefile
- aircraft/XB-70/Makefile
- aircraft/c172r/Makefile
- aircraft/A320/Makefile
- aircraft/L410/Makefile
- aircraft/fokker50/Makefile
- aircraft/mk82/Makefile
+ aircraft/F4N/Makefile
+ aircraft/T37/Makefile
+ aircraft/pogo-jsbsim/Engines/Makefile
+ aircraft/pogo-jsbsim/Makefile
+ aircraft/ZLT-NT/Systems/Makefile
+ aircraft/ZLT-NT/Makefile
+ aircraft/pc7/Makefile
+ aircraft/ah1s/Makefile
aircraft/Submarine_Scout/Systems/Makefile
aircraft/Submarine_Scout/Makefile
- aircraft/T37/Makefile
- aircraft/sgs233/Makefile
+ aircraft/737/Makefile
aircraft/Concorde/Makefile
- aircraft/L17/Makefile
+ aircraft/T38/Makefile
+ aircraft/A320/Makefile
aircraft/Short_S23/Systems/Makefile
aircraft/Short_S23/Makefile
- aircraft/A4/Makefile
- aircraft/c172p/Makefile
- aircraft/f15/Makefile
- aircraft/pa28/Makefile
- aircraft/ah1s/Makefile
+ aircraft/fokker50/Makefile
+ aircraft/B17/Makefile
+ aircraft/t6texan2/Makefile
+ aircraft/C130/Makefile
+ aircraft/paraglider/Makefile
aircraft/X15/Makefile
+ aircraft/DHC6/Makefile
+ aircraft/L17/Makefile
+ aircraft/OV10/Makefile
+ aircraft/Makefile
+ aircraft/f22/Makefile
+ aircraft/easystar/Engines/Makefile
+ aircraft/easystar/scripts/Makefile
+ aircraft/easystar/Datcom/Makefile
+ aircraft/easystar/Models/Makefile
+ aircraft/easystar/Makefile
+ aircraft/ball/Makefile
+ aircraft/LM/Makefile
+ aircraft/A4/Makefile
aircraft/F80C/Makefile
- aircraft/Boeing314/Makefile
- data_plot/Makefile )
+ aircraft/B747/Makefile
+ aircraft/pa28/Makefile
+ aircraft/dr1/Makefile
+ aircraft/SGS/Makefile
+ aircraft/c182/Makefile
+ aircraft/f16/Systems/Makefile
+ aircraft/f16/Makefile
+ data_output/Makefile
+ Makefile
+ check_cases/orbit/data_plot/Makefile
+ check_cases/orbit/logged_data/Makefile
+ check_cases/orbit/scripts/Makefile
+ check_cases/orbit/aircraft/Makefile
+ check_cases/orbit/aircraft/ball/Makefile
+ check_cases/orbit/data_output/Makefile
+ check_cases/orbit/Makefile
+ check_cases/orbit/engine/Makefile
+ check_cases/orbit/systems/Makefile
+ check_cases/Makefile
+ check_cases/ground_tests/data_plot/Makefile
+ check_cases/ground_tests/logged_data/Makefile
+ check_cases/ground_tests/scripts/Makefile
+ check_cases/ground_tests/aircraft/groundtest/Makefile
+ check_cases/ground_tests/aircraft/Makefile
+ check_cases/ground_tests/data_output/Makefile
+ check_cases/ground_tests/Makefile
+ check_cases/ground_tests/engine/Makefile
+ check_cases/ground_tests/systems/Makefile
+ engine/Makefile
+ systems/Makefile )
diff --git a/engine/Makefile.am b/engine/Makefile.am
index 8f6a3fc18fee7676e73a9d3cd2dec3dc3d1950ce..101a02de562251f9eb238be61b26ca3a0d3a9541 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -1,80 +1,80 @@
enginedir = ${pkgdatadir}/engine
engine_DATA = \
- prop30FP2B.xml \
+ SRB_nozzle.xml \
+ F100-PW-229.xml \
+ prop_PT6.xml \
+ JT9D-3.xml \
+ R-1820-97.xml \
XLR99.xml \
+ prop_75in2f.xml \
Oberursel-UrII.xml \
- MerlinV1650.xml \
- electric147kW.xml \
- SSME.xml \
- propDA-R352_6-123-F_2.xml \
- engIO470D.xml \
- t56.xml \
- prop_SSZ.xml \
+ HamiltonStd6243A-3.xml \
+ TRENT-900.xml \
+ SRB.xml \
+ prop_81in2v.xml \
+ LMdescent.xml \
+ P51prop.xml \
Dr1_propeller.xml \
- SSME_nozzle.xml \
+ eng_RRhawk.xml \
+ GE-CF6-80C2-B1F.xml \
+ AJ26-33_nozzle.xml \
+ electric147kW.xml \
+ RL10.xml \
PT6A-27.xml \
- propHS139v.xml \
- engtm601.xml \
- BR710.xml \
- F100-PW-229.xml \
- twin_pratt_and_whitney_t73.xml \
- SRB.xml \
- Zenoah_G-26A.xml \
- xlr99_nozzle.xml \
- PT6A-68.xml \
direct.xml \
- propC8v.xml \
- vrtule2.xml \
- Olympus593Mrk610.xml \
- AJ26-33A.xml \
- LMdescent.xml \
- engIO540AB1A5.xml \
+ propHO-V373-D.xml \
+ PT6A-68.xml \
+ s64_rotor.xml \
+ Tay-651.xml \
+ ah1s_rotor.xml \
+ SSME.xml \
+ RB211-524.xml \
avco_lycoming_t53.xml \
+ engtm601.xml \
+ engIO470D.xml \
+ SSME_nozzle.xml \
prop_Clark_Y7570.xml \
- JT9D-3.xml \
- PW125B.xml \
- engRRMerlinXII.xml \
- eng_RRhawk.xml \
- CF6-80C2.xml \
+ Olympus593Mrk610.xml \
+ BR710.xml \
J85-GE-5.xml \
- CFM56.xml \
- propC6v.xml \
+ LM_descent_nozzle.xml \
+ xlr99_nozzle.xml \
+ propDA-R352_6-123-F_2.xml \
+ CFM56_5.xml \
+ propHS139v.xml \
prop_deHavilland5000.xml \
- engIO360C.xml \
- ah1s_rotor.xml \
- Tay-651.xml \
- prop_PT6.xml \
- R-1820-97.xml \
- RB211-524.xml \
- J79-GE-11A.xml \
- BR-725.xml \
- RollsRoyce.xml \
- J52.xml \
- propHO-V373-D.xml \
+ F119-PW-1.xml \
test_turbine.xml \
+ t56_prop.xml \
+ RL10_nozzle.xml \
+ J52.xml \
+ BR-725.xml \
+ propC8v.xml \
+ J79-GE-11A.xml \
+ engIO540AB1A5.xml \
+ prop_SSZ.xml \
+ twin_pratt_and_whitney_t73.xml \
T76.xml \
- eng_PegasusXc.xml \
- LM_descent_nozzle.xml \
+ PW125B.xml \
prop_generic2f.xml \
- GE-CF6-80C2-B1F.xml \
- propC10v.xml \
- SRB_nozzle.xml \
- F119-PW-1.xml \
- HamiltonStd6243A-3.xml \
- t56_prop.xml \
- AJ26-33_nozzle.xml \
- P51prop.xml \
electric_1mw.xml \
- prop_81in2v.xml \
- RL10_nozzle.xml \
- engRRMerlin61.xml \
J33-A-35.xml \
+ CF6-80C2.xml \
J69-T25.xml \
- TRENT-900.xml \
- RL10.xml \
+ vrtule2.xml \
+ engIO360C.xml \
+ t56.xml \
+ propC10v.xml \
+ MerlinV1650.xml \
+ RollsRoyce.xml \
Tay-620.xml \
+ propC6v.xml \
eng_io320.xml \
- CFM56_5.xml \
- prop_75in2f.xml \
- s64_rotor.xml
+ eng_PegasusXc.xml \
+ Zenoah_G-26A.xml \
+ CFM56.xml \
+ prop30FP2B.xml \
+ engRRMerlin61.xml \
+ engRRMerlinXII.xml \
+ AJ26-33A.xml
EXTRA_DIST=$(engine_DATA)
diff --git a/systems/Makefile.am b/systems/Makefile.am
index 0567ec8b33aeeb558c4d34ebb566fb6832d99799..372a36dc919253f6fc45ad8bfd29e5de3c44aff8 100644
--- a/systems/Makefile.am
+++ b/systems/Makefile.am
@@ -1,24 +1,24 @@
systemsdir = ${pkgdatadir}/systems
systems_DATA = \
- hook.xml \
- gear.xml \
+ flaps.xml \
+ holdback.xml \
+ fg_glue.xml \
+ FCS-pitch.xml \
+ speedbrakes.xml \
+ refuel.xml \
BLC.xml \
- Autopilot.xml \
+ hook.xml \
jsb_glue.xml \
- FCS-roll.xml \
- afcs.xml \
+ Autopilot.xml \
+ airship_added_mass.xml \
tail_wheel_lock.xml \
- alpha_buffet.xml \
- FCS-yaw.xml \
+ rpm_governor.xml \
catapult.xml \
- FCS-pitch.xml \
- airship_added_mass.xml \
- flaps.xml \
- speedbrakes.xml \
- fg_glue.xml \
+ alpha_buffet.xml \
NWS.xml \
- rpm_governor.xml \
- refuel.xml \
GNCUtilities.xml \
- holdback.xml
+ gear.xml \
+ FCS-roll.xml \
+ FCS-yaw.xml \
+ afcs.xml
EXTRA_DIST=$(systems_DATA)