One more pass at reorgs.

diff --git a/mksymlinks.sh b/mksymlinks.sh
index 06b894210962035b3a54eb3b6679a84bf3d02ba3..e654cf19c61142d6227cb06b98a93f9d89a76b42 100755 (executable)
--- a/mksymlinks.sh
+++ b/mksymlinks.sh
@@ -6,21 +6,34 @@ echo "running $0 to rebuild simgear include links"
 # toast the old directory
 rm -rf src/simgear
 mkdir src/simgear
+mkdir src/simgear/bucket
+mkdir src/simgear/debug
+mkdir src/simgear/math
+mkdir src/simgear/misc
+mkdir src/simgear/screen
+mkdir src/simgear/serial
+mkdir src/simgear/xgl
+mkdir src/simgear/zlib
 
 # build new links
 ln -s ../include/compiler.h src/simgear/compiler.h
 ln -s ../include/constants.h src/simgear/constants.h
-ln -s ../debug/debug_types.h src/simgear/debug_types.h
-ln -s ../math/fg_memory.h src/simgear/fg_memory.h
 ln -s ../include/fg_traits.hxx src/simgear/fg_traits.hxx
-ln -s ../math/fg_types.hxx src/simgear/fg_types.hxx
 ln -s ../include/fg_zlib.h src/simgear/fg_zlib.h
-ln -s ../misc/fgpath.hxx src/simgear/fgpath.hxx
-ln -s ../misc/fgstream.hxx src/simgear/fgstream.hxx
-ln -s ../debug/logstream.hxx src/simgear/logstream.hxx
-ln -s ../math/mat3.h src/simgear/mat3.h
-ln -s ../bucket/newbucket.hxx src/simgear/newbucket.hxx
-ln -s ../math/point3d.hxx src/simgear/point3d.hxx
-ln -s ../math/polar3d.hxx src/simgear/polar3d.hxx
-ln -s ../xgl/xgl.h src/simgear/xgl.h
-ln -s ../misc/zfstream.hxx src/simgear/zfstream.hxx
+
+ln -s ../../bucket/newbucket.hxx src/simgear/bucket/newbucket.hxx
+
+ln -s ../../debug/debug_types.h src/simgear/debug/debug_types.h
+ln -s ../../debug/logstream.hxx src/simgear/debug/logstream.hxx
+
+ln -s ../../math/fg_memory.h src/simgear/math/fg_memory.h
+ln -s ../../math/fg_types.hxx src/simgear/math/fg_types.hxx
+ln -s ../../math/mat3.h src/simgear/math/mat3.h
+ln -s ../../math/point3d.hxx src/simgear/math/point3d.hxx
+ln -s ../../math/polar3d.hxx src/simgear/math/polar3d.hxx
+
+ln -s ../../misc/fgpath.hxx src/simgear/misc/fgpath.hxx
+ln -s ../../misc/fgstream.hxx src/simgear/misc/fgstream.hxx
+ln -s ../../misc/zfstream.hxx src/simgear/misc/zfstream.hxx
+
+ln -s ../../xgl/xgl.h src/simgear/xgl/xgl.h

diff --git a/simgear/bucket/Makefile.am b/simgear/bucket/Makefile.am
index 890ee96712575761b2024bb89b1eafe5ed14e897..d2cc18836b81c5a13c5b37c620f74172599bc2eb 100644 (file)
--- a/simgear/bucket/Makefile.am
+++ b/simgear/bucket/Makefile.am
@@ -1,3 +1,5 @@
+includedir = @includedir@/bucket
+
 lib_LIBRARIES = libsgbucket.a
 
 include_HEADERS = newbucket.hxx

diff --git a/simgear/bucket/newbucket.cxx b/simgear/bucket/newbucket.cxx
index 071ee3a97d2695546b3a62951b51fd4c599678b3..ac6e04c2d97d3910cc8e087c4c773290f9d27bcf 100644 (file)
--- a/simgear/bucket/newbucket.cxx
+++ b/simgear/bucket/newbucket.cxx
@@ -30,7 +30,7 @@
 
 #include <math.h>
 
-#include <simgear/fgpath.hxx>
+#include <simgear/misc/fgpath.hxx>
 
 #include "newbucket.hxx"
 

diff --git a/simgear/debug/Makefile.am b/simgear/debug/Makefile.am
index b3a538980527bca6aca0d49ff7cd9b455f3e3b7a..255f0252bfb9f4171efad7782ddcc54cf6821374 100644 (file)
--- a/simgear/debug/Makefile.am
+++ b/simgear/debug/Makefile.am
@@ -1,3 +1,5 @@
+includedir = @includedir@/debug
+
 EXTRA_DIST = logtest.cxx
 
 lib_LIBRARIES = libsgdebug.a

diff --git a/simgear/debug/logstream.hxx b/simgear/debug/logstream.hxx
index bc1a4fbf77f360c5adc74cb5906b1037a3e35708..d8cfb066a64eee4602db87418a1d5f7ccc5e7a8b 100644 (file)
--- a/simgear/debug/logstream.hxx
+++ b/simgear/debug/logstream.hxx
@@ -38,7 +38,7 @@
 # include <simgear/fg_traits.hxx>
 #endif
 
-#include <simgear/debug_types.h>
+#include <simgear/debug/debug_types.h>
 
 #ifndef FG_HAVE_NATIVE_SGI_COMPILERS
 FG_USING_STD(streambuf);

diff --git a/simgear/math/Makefile.am b/simgear/math/Makefile.am
index 493262e319d3e18506edf4085561df4c32608431..5bac7d07f346cecdf0aa6c3131a20fd42dbc8298 100644 (file)
--- a/simgear/math/Makefile.am
+++ b/simgear/math/Makefile.am
@@ -1,3 +1,5 @@
+includedir = @includedir@/math
+
 lib_LIBRARIES = libsgmath.a
 
 include_HEADERS = \

diff --git a/simgear/math/fg_geodesy.cxx b/simgear/math/fg_geodesy.cxx
index 023776355e2fa6db91a42939db45219723b2b6cb..867d8170e8798931838933b140bf787fe9db0442 100644 (file)
--- a/simgear/math/fg_geodesy.cxx
+++ b/simgear/math/fg_geodesy.cxx
@@ -17,8 +17,8 @@
 # include <errno.h>
 #endif
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
+#include <simgear/debug/logstream.hxx>
 
 #include "point3d.hxx"
 #include "fg_geodesy.hxx"

diff --git a/simgear/math/fg_geodesy.hxx b/simgear/math/fg_geodesy.hxx
index 9d2bc209ff266c5cb2ed2cb3ef11e6d326f78317..cff20210595489be71b40b554eb03d2250f5d2a7 100644 (file)
--- a/simgear/math/fg_geodesy.hxx
+++ b/simgear/math/fg_geodesy.hxx
@@ -17,8 +17,8 @@
 #endif                                   
 
 
-#include <simgear/point3d.hxx>
-#include <simgear/polar3d.hxx>
+#include <simgear/math/point3d.hxx>
+#include <simgear/math/polar3d.hxx>
 
 
 // fgGeocToGeod(lat_geoc, radius, *lat_geod, *alt, *sea_level_r)

diff --git a/simgear/math/fg_types.hxx b/simgear/math/fg_types.hxx
index 419c2eba81a9c3e7afd9bd3d422381c3ccd0613c..ca87aa1d4e21d2fa7d26c99ff2cb41c7c0f68645 100644 (file)
--- a/simgear/math/fg_types.hxx
+++ b/simgear/math/fg_types.hxx
@@ -35,7 +35,7 @@
 #include STL_STRING
 #include <vector>
 
-#include <simgear/point3d.hxx>
+#include <simgear/math/point3d.hxx>
 
 FG_USING_STD(vector);
 FG_USING_STD(string);

diff --git a/simgear/math/interpolater.cxx b/simgear/math/interpolater.cxx
index fb6fdfef482130d8c2cb2d80a370f108ac30ff33..732f248cb7126e4c1a94e51e1f9b7408afdb42a5 100644 (file)
--- a/simgear/math/interpolater.cxx
+++ b/simgear/math/interpolater.cxx
@@ -31,9 +31,9 @@
 
 #include STL_STRING
 
-#include <simgear/logstream.hxx>
 #include <simgear/fg_zlib.h>
-#include <simgear/fgstream.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/misc/fgstream.hxx>
 
 #include "interpolater.hxx"
 

diff --git a/simgear/math/mat3.h b/simgear/math/mat3.h
index 63f741f7305a2d209c4d2e2f71cee73b428b4427..385933af4c17b26dff80385a66d399009395266d 100644 (file)
--- a/simgear/math/mat3.h
+++ b/simgear/math/mat3.h
@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #include <string.h>
-#include <simgear/fg_memory.h>
+#include <simgear/math/fg_memory.h>
 
 #ifdef __cplusplus                                                          
 extern "C" {                            

diff --git a/simgear/math/polar3d.hxx b/simgear/math/polar3d.hxx
index 8e42fdb03216b20249e58acfe9537fe6cb2fb82b..ee0dd2c38645d90dda51bcf0d6810c2b6e6960ef 100644 (file)
--- a/simgear/math/polar3d.hxx
+++ b/simgear/math/polar3d.hxx
@@ -31,7 +31,7 @@
 
 
 #include <simgear/constants.h>
-#include <simgear/point3d.hxx>
+#include <simgear/math/point3d.hxx>
 
 
 // Find the Altitude above the Ellipsoid (WGS84) given the Earth

diff --git a/simgear/math/vector.hxx b/simgear/math/vector.hxx
index 006b192428a327b11a2340932997923ff0a11477..e4692c1527c393c5f9af1d4f58a8ffb5b518b28e 100644 (file)
--- a/simgear/math/vector.hxx
+++ b/simgear/math/vector.hxx
@@ -37,7 +37,7 @@
 
 #include <plib/sg.h>
 
-#include <simgear/mat3.h>
+#include <simgear/math/mat3.h>
 
 
 // Map a vector onto the plane specified by normal

diff --git a/simgear/metar/Makefile.am b/simgear/metar/Makefile.am
index 5916aa93b5d50e2c69d1b1ec2faa7ac93c50d135..cbe88c7907004638ac17ff6ff39876cdaa63f276 100644 (file)
--- a/simgear/metar/Makefile.am
+++ b/simgear/metar/Makefile.am
@@ -1,4 +1,4 @@
-## Process this file with automake to produce Makefile.in
+includedir = @includedir@/metar
 
 lib_LIBRARIES = libsgmetar.a
 

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index dcf388efd2cc2ab4a794206a94178c08cb7f4c15..26112ff700f9bc21b1227aec579c616c026859f1 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -1,4 +1,4 @@
-## Process this file with automake to produce Makefile.in
+includedir = @includedir@/misc
 
 if HAVE_ZLIB
 ZLIB_INCL =

diff --git a/simgear/misc/fgstream.hxx b/simgear/misc/fgstream.hxx
index ee4c61ba0c5f5c7ef7b5b33c4f67159fbc3d6a76..4762266c8aec11966b43588f6a270e9005d3f836 100644 (file)
--- a/simgear/misc/fgstream.hxx
+++ b/simgear/misc/fgstream.hxx
@@ -45,7 +45,7 @@
 
 #include STL_STRING
 
-#include <simgear/zfstream.hxx>
+#include <simgear/misc/zfstream.hxx>
 
 FG_USING_STD(string);
 

diff --git a/simgear/misc/texcoord.hxx b/simgear/misc/texcoord.hxx
index 1be573baaf22e4987bbe6af58552f9d5dceb8977..36c7c803ab7d4758b053b7a3594e49775a6b1e20 100644 (file)
--- a/simgear/misc/texcoord.hxx
+++ b/simgear/misc/texcoord.hxx
@@ -30,8 +30,8 @@
 #endif                                   
 
 
-#include <simgear/newbucket.hxx>
-#include <simgear/fg_types.hxx>
+#include <simgear/bucket/newbucket.hxx>
+#include <simgear/math/fg_types.hxx>
 
 
 // traverse the specified fan/strip/list of vertices and attempt to

diff --git a/simgear/screen/GLBitmaps.cxx b/simgear/screen/GLBitmaps.cxx
index 225f5cb9e7ae93637ed98796664699c9ea9eef89..eef3e7ad023d091fe5730676f7d7586f052983c6 100755 (executable)
--- a/simgear/screen/GLBitmaps.cxx
+++ b/simgear/screen/GLBitmaps.cxx
@@ -11,7 +11,7 @@
 #include <limits.h>
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include "GLBitmaps.h"
 

diff --git a/simgear/screen/Makefile.am b/simgear/screen/Makefile.am
index 84c9832e38841175a15a78d20a5bb0e25e07cd01..4593565d332fbb0959fe5dd679de5cc3341fa72f 100644 (file)
--- a/simgear/screen/Makefile.am
+++ b/simgear/screen/Makefile.am
@@ -1,3 +1,5 @@
+includedir = @includedir@/screen
+
 lib_LIBRARIES = libsgscreen.a
 
 include_HEADERS = screen-dump.hxx

diff --git a/simgear/screen/screen-dump.cxx b/simgear/screen/screen-dump.cxx
index 4be5096068fdbb202c8b00064491ca8c77233dfd..3ee403cc7586fcb8cd73e8ecee86385b628fe0c1 100644 (file)
--- a/simgear/screen/screen-dump.cxx
+++ b/simgear/screen/screen-dump.cxx
@@ -32,7 +32,7 @@
 #include <limits.h>
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include "screen-dump.hxx"
 

diff --git a/simgear/serial/Makefile.am b/simgear/serial/Makefile.am
index 7ef69a90d6425576545457d800c029930427343a..c92c1fc4d9d3a207dd00630b0c8b188e7f6cb67d 100644 (file)
--- a/simgear/serial/Makefile.am
+++ b/simgear/serial/Makefile.am
@@ -1,3 +1,5 @@
+includedir = @includedir@/serial
+
 noinst_PROGRAMS = testserial
 
 lib_LIBRARIES = libsgserial.a

diff --git a/simgear/serial/serial.cxx b/simgear/serial/serial.cxx
index 7bac809c06aadcd8bc1fab5960d6ea22aeb4ce7f..72e4cdef970c056e9852419c0a7f870270a5d589 100644 (file)
--- a/simgear/serial/serial.cxx
+++ b/simgear/serial/serial.cxx
@@ -43,7 +43,7 @@
 #  include <unistd.h>
 #endif
 
-#include <simgear/logstream.hxx>
+#include <simgear/debug/logstream.hxx>
 
 #include "serial.hxx"
 

diff --git a/simgear/serial/testserial.cxx b/simgear/serial/testserial.cxx
index 0ad05f09b8f3cb41ba0d2cbf6e3621d9fda98db6..d1e9db96b53b474017d6f1c121cdbe70b8953d4b 100644 (file)
--- a/simgear/serial/testserial.cxx
+++ b/simgear/serial/testserial.cxx
@@ -1,6 +1,6 @@
 #include <string>
 
-#include <simgear/logstream.hxx>
+#include <simgear/debug/logstream.hxx>
 
 #include "serial.hxx"
 

diff --git a/simgear/xgl/Makefile.am b/simgear/xgl/Makefile.am
index 13d95f707da7ea8fdfb50d1fe6195da36237ba88..3b976153d468d9f922b4a3a38a997f9ca95fe7f4 100644 (file)
--- a/simgear/xgl/Makefile.am
+++ b/simgear/xgl/Makefile.am
@@ -1,3 +1,5 @@
+includedir = @includedir@/xgl
+
 lib_LIBRARIES = libsgxgl.a
 
 include_HEADERS = xgl.h