One more pass at reorgs.

2000-02-16 22:00:51 +00:00
parent cb9654f1f4
commit 689a942f19
24 changed files with 57 additions and 32 deletions
--- 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
--- 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
--- 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"

--- 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
--- 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);
--- a/simgear/math/Makefile.am
+++ b/simgear/math/Makefile.am
@@ -1,3 +1,5 @@
+includedir = @includedir@/math
+
 lib_LIBRARIES = libsgmath.a

 include_HEADERS = \
--- 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"
--- 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)
--- 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);
--- 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"

--- 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" {                            
--- 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
--- 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
--- 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

--- 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 =
--- 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);

--- 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
--- 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"

--- 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
--- 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"

--- a/simgear/serial/Makefile.am
+++ b/simgear/serial/Makefile.am
@@ -1,3 +1,5 @@
+includedir = @includedir@/serial
+
 noinst_PROGRAMS = testserial

 lib_LIBRARIES = libsgserial.a
--- 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"

--- 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"

--- 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