From 689a942f193c1c15b4ddb4009958b7782cde44e7 Mon Sep 17 00:00:00 2001 From: curt Date: Wed, 16 Feb 2000 22:00:51 +0000 Subject: [PATCH] One more pass at reorgs. --- mksymlinks.sh | 37 +++++++++++++++++++++++----------- simgear/bucket/Makefile.am | 2 ++ simgear/bucket/newbucket.cxx | 2 +- simgear/debug/Makefile.am | 2 ++ simgear/debug/logstream.hxx | 2 +- simgear/math/Makefile.am | 2 ++ simgear/math/fg_geodesy.cxx | 2 +- simgear/math/fg_geodesy.hxx | 4 ++-- simgear/math/fg_types.hxx | 2 +- simgear/math/interpolater.cxx | 4 ++-- simgear/math/mat3.h | 2 +- simgear/math/polar3d.hxx | 2 +- simgear/math/vector.hxx | 2 +- simgear/metar/Makefile.am | 2 +- simgear/misc/Makefile.am | 2 +- simgear/misc/fgstream.hxx | 2 +- simgear/misc/texcoord.hxx | 4 ++-- simgear/screen/GLBitmaps.cxx | 2 +- simgear/screen/Makefile.am | 2 ++ simgear/screen/screen-dump.cxx | 2 +- simgear/serial/Makefile.am | 2 ++ simgear/serial/serial.cxx | 2 +- simgear/serial/testserial.cxx | 2 +- simgear/xgl/Makefile.am | 2 ++ 24 files changed, 57 insertions(+), 32 deletions(-) diff --git a/mksymlinks.sh b/mksymlinks.sh index 06b89421..e654cf19 100755 --- 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 890ee967..d2cc1883 100644 --- 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 071ee3a9..ac6e04c2 100644 --- a/simgear/bucket/newbucket.cxx +++ b/simgear/bucket/newbucket.cxx @@ -30,7 +30,7 @@ #include -#include +#include #include "newbucket.hxx" diff --git a/simgear/debug/Makefile.am b/simgear/debug/Makefile.am index b3a53898..255f0252 100644 --- 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 bc1a4fbf..d8cfb066 100644 --- a/simgear/debug/logstream.hxx +++ b/simgear/debug/logstream.hxx @@ -38,7 +38,7 @@ # include #endif -#include +#include #ifndef FG_HAVE_NATIVE_SGI_COMPILERS FG_USING_STD(streambuf); diff --git a/simgear/math/Makefile.am b/simgear/math/Makefile.am index 493262e3..5bac7d07 100644 --- 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 02377635..867d8170 100644 --- a/simgear/math/fg_geodesy.cxx +++ b/simgear/math/fg_geodesy.cxx @@ -17,8 +17,8 @@ # include #endif -#include #include +#include #include "point3d.hxx" #include "fg_geodesy.hxx" diff --git a/simgear/math/fg_geodesy.hxx b/simgear/math/fg_geodesy.hxx index 9d2bc209..cff20210 100644 --- a/simgear/math/fg_geodesy.hxx +++ b/simgear/math/fg_geodesy.hxx @@ -17,8 +17,8 @@ #endif -#include -#include +#include +#include // 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 419c2eba..ca87aa1d 100644 --- a/simgear/math/fg_types.hxx +++ b/simgear/math/fg_types.hxx @@ -35,7 +35,7 @@ #include STL_STRING #include -#include +#include FG_USING_STD(vector); FG_USING_STD(string); diff --git a/simgear/math/interpolater.cxx b/simgear/math/interpolater.cxx index fb6fdfef..732f248c 100644 --- a/simgear/math/interpolater.cxx +++ b/simgear/math/interpolater.cxx @@ -31,9 +31,9 @@ #include STL_STRING -#include #include -#include +#include +#include #include "interpolater.hxx" diff --git a/simgear/math/mat3.h b/simgear/math/mat3.h index 63f741f7..385933af 100644 --- a/simgear/math/mat3.h +++ b/simgear/math/mat3.h @@ -19,7 +19,7 @@ #include #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/simgear/math/polar3d.hxx b/simgear/math/polar3d.hxx index 8e42fdb0..ee0dd2c3 100644 --- a/simgear/math/polar3d.hxx +++ b/simgear/math/polar3d.hxx @@ -31,7 +31,7 @@ #include -#include +#include // Find the Altitude above the Ellipsoid (WGS84) given the Earth diff --git a/simgear/math/vector.hxx b/simgear/math/vector.hxx index 006b1924..e4692c15 100644 --- a/simgear/math/vector.hxx +++ b/simgear/math/vector.hxx @@ -37,7 +37,7 @@ #include -#include +#include // Map a vector onto the plane specified by normal diff --git a/simgear/metar/Makefile.am b/simgear/metar/Makefile.am index 5916aa93..cbe88c79 100644 --- 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 dcf388ef..26112ff7 100644 --- 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 ee4c61ba..4762266c 100644 --- a/simgear/misc/fgstream.hxx +++ b/simgear/misc/fgstream.hxx @@ -45,7 +45,7 @@ #include STL_STRING -#include +#include FG_USING_STD(string); diff --git a/simgear/misc/texcoord.hxx b/simgear/misc/texcoord.hxx index 1be573ba..36c7c803 100644 --- a/simgear/misc/texcoord.hxx +++ b/simgear/misc/texcoord.hxx @@ -30,8 +30,8 @@ #endif -#include -#include +#include +#include // traverse the specified fan/strip/list of vertices and attempt to diff --git a/simgear/screen/GLBitmaps.cxx b/simgear/screen/GLBitmaps.cxx index 225f5cb9..eef3e7ad 100755 --- a/simgear/screen/GLBitmaps.cxx +++ b/simgear/screen/GLBitmaps.cxx @@ -11,7 +11,7 @@ #include #include -#include +#include #include "GLBitmaps.h" diff --git a/simgear/screen/Makefile.am b/simgear/screen/Makefile.am index 84c9832e..4593565d 100644 --- 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 4be50960..3ee403cc 100644 --- a/simgear/screen/screen-dump.cxx +++ b/simgear/screen/screen-dump.cxx @@ -32,7 +32,7 @@ #include #include -#include +#include #include "screen-dump.hxx" diff --git a/simgear/serial/Makefile.am b/simgear/serial/Makefile.am index 7ef69a90..c92c1fc4 100644 --- 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 7bac809c..72e4cdef 100644 --- a/simgear/serial/serial.cxx +++ b/simgear/serial/serial.cxx @@ -43,7 +43,7 @@ # include #endif -#include +#include #include "serial.hxx" diff --git a/simgear/serial/testserial.cxx b/simgear/serial/testserial.cxx index 0ad05f09..d1e9db96 100644 --- a/simgear/serial/testserial.cxx +++ b/simgear/serial/testserial.cxx @@ -1,6 +1,6 @@ #include -#include +#include #include "serial.hxx" diff --git a/simgear/xgl/Makefile.am b/simgear/xgl/Makefile.am index 13d95f70..3b976153 100644 --- 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 -- 2.39.5