Restructuring subdirectories.

diff --git a/Makefile.am b/Makefile.am
index 6311c94653f5fd0e16685b0555553f93442b4648..e4842026e73788a0bb9cc44168c99040dc4909bb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,32 +1,6 @@
-if ENABLE_UNIX_SERIAL
-SERIAL_DIRS = serial
-else
-SERIAL_DIRS =
-endif
-
-if HAVE_ZLIB
-ZLIB_DIRS =
-else
-ZLIB_DIRS = zlib
-endif
-
-METAR_DIRS =
-# METAR_DIRS = metar
-
 EXTRA_DIST = mksymlinks.sh
 
 dist-hook:
-       tar cf - metar | (cd $(distdir); tar xvf -)
-
-SUBDIRS = \
-       include \
-       bucket \
-       debug \
-       math \
-       $(METAR_DIRS) \
-       misc \
-       screen \
-       $(SERIAL_DIRS) \
-       xgl \
-       $(ZLIB_DIRS)
+       tar cf - src/metar | (cd $(distdir); tar xvf -)
 
+SUBDIRS = src

diff --git a/configure b/configure
index dd519b56123b0d5fa6d587907c998dbe99fc01e2..9dd4ff9273fa8f6da0041c9d7876b9c0d15ebbe3 100755 (executable)
--- a/configure
+++ b/configure
@@ -456,7 +456,7 @@ echo > confdefs.h
 
 # A filename unique to this package, relative to the directory that
 # configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=bucket/newbucket.cxx
+ac_unique_file=src/bucket/newbucket.cxx
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
@@ -694,7 +694,7 @@ fi
 
 PACKAGE=SimGear
 
-VERSION=0.0.0
+VERSION=0.0.1
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -3949,16 +3949,17 @@ ac_given_INSTALL="$INSTALL"
 trap 'rm -fr `echo "\
        VERSION \
        Makefile \
-       include/Makefile \
-       bucket/Makefile \
-       debug/Makefile \
-       math/Makefile \
-       misc/Makefile \
-       screen/Makefile \
-       serial/Makefile \
-       xgl/Makefile \
-       zlib/Makefile \
- include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+       src/Makefile \
+       src/include/Makefile \
+       src/bucket/Makefile \
+       src/debug/Makefile \
+       src/math/Makefile \
+       src/misc/Makefile \
+       src/screen/Makefile \
+       src/serial/Makefile \
+       src/xgl/Makefile \
+       src/zlib/Makefile \
+ src/include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -4062,15 +4063,16 @@ cat >> $CONFIG_STATUS <<EOF
 CONFIG_FILES=\${CONFIG_FILES-"\
        VERSION \
        Makefile \
-       include/Makefile \
-       bucket/Makefile \
-       debug/Makefile \
-       math/Makefile \
-       misc/Makefile \
-       screen/Makefile \
-       serial/Makefile \
-       xgl/Makefile \
-       zlib/Makefile \
+       src/Makefile \
+       src/include/Makefile \
+       src/bucket/Makefile \
+       src/debug/Makefile \
+       src/math/Makefile \
+       src/misc/Makefile \
+       src/screen/Makefile \
+       src/serial/Makefile \
+       src/xgl/Makefile \
+       src/zlib/Makefile \
 "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
@@ -4152,7 +4154,7 @@ ac_eD='%g'
 if test "${CONFIG_HEADERS+set}" != set; then
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="include/config.h"
+  CONFIG_HEADERS="src/include/config.h"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 fi
@@ -4243,7 +4245,7 @@ cat >> $CONFIG_STATUS <<EOF
 
 EOF
 cat >> $CONFIG_STATUS <<\EOF
-test -z "$CONFIG_HEADERS" || echo timestamp > include/stamp-h
+test -z "$CONFIG_HEADERS" || echo timestamp > src/include/stamp-h
 
 exit 0
 EOF

diff --git a/configure.in b/configure.in
index 475cd4c3bee6420f04b050f638ec765b4d5c50e1..a764c4d0cac163785322dba4ec637327ad34a5ba 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,10 +3,10 @@ dnl working configure script.
 dnl
 dnl $Id$
 
-AC_INIT(bucket/newbucket.cxx)
+AC_INIT(src/bucket/newbucket.cxx)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(SimGear, 0.0.0)
+AM_INIT_AUTOMAKE(SimGear, 0.0.1)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -221,20 +221,21 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS( ftime gettimeofday timegm memcpy bcopy mktime strstr rand \
        random setitimer getitimer signal GetLocalTime rint getrusage )
 
-AM_CONFIG_HEADER(include/config.h)
+AM_CONFIG_HEADER(src/include/config.h)
 
 AC_OUTPUT( \
        VERSION \
        Makefile \
-       include/Makefile \
-       bucket/Makefile \
-       debug/Makefile \
-       math/Makefile \
-       misc/Makefile \
-       screen/Makefile \
-       serial/Makefile \
-       xgl/Makefile \
-       zlib/Makefile \
+       src/Makefile \
+       src/include/Makefile \
+       src/bucket/Makefile \
+       src/debug/Makefile \
+       src/math/Makefile \
+       src/misc/Makefile \
+       src/screen/Makefile \
+       src/serial/Makefile \
+       src/xgl/Makefile \
+       src/zlib/Makefile \
 )
 
 AC_OUTPUT_COMMANDS([./mksymlinks.sh])

diff --git a/mksymlinks.sh b/mksymlinks.sh
index f742e6824fb1aa2bb7c3fe77e454c530af64167d..06b894210962035b3a54eb3b6679a84bf3d02ba3 100755 (executable)
--- a/mksymlinks.sh
+++ b/mksymlinks.sh
@@ -4,22 +4,23 @@ echo ""
 echo "running $0 to rebuild simgear include links"
 
 # toast the old directory
-rm -rf simgear
-mkdir simgear
+rm -rf src/simgear
+mkdir src/simgear
 
 # build new links
-ln -s ../include/compiler.h simgear/compiler.h
-ln -s ../include/constants.h simgear/constants.h
-ln -s ../debug/debug_types.h simgear/debug_types.h
-ln -s ../math/fg_memory.h simgear/fg_memory.h
-ln -s ../include/fg_traits.hxx simgear/fg_traits.hxx
-ln -s ../math/fg_types.hxx simgear/fg_types.hxx
-ln -s ../include/fg_zlib.h simgear/fg_zlib.h
-ln -s ../misc/fgpath.hxx simgear/fgpath.hxx
-ln -s ../debug/logstream.hxx simgear/logstream.hxx
-ln -s ../math/mat3.h simgear/mat3.h
-ln -s ../bucket/newbucket.hxx simgear/newbucket.hxx
-ln -s ../math/point3d.hxx simgear/point3d.hxx
-ln -s ../math/polar3d.hxx simgear/polar3d.hxx
-ln -s ../xgl/xgl.h simgear/xgl.h
-ln -s ../misc/zfstream.hxx simgear/zfstream.hxx
+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

diff --git a/simgear/bucket/Makefile.am b/simgear/bucket/Makefile.am
index 494d25507eab54c9aa6ddd3a57f7a05be77810da..890ee96712575761b2024bb89b1eafe5ed14e897 100644 (file)
--- a/simgear/bucket/Makefile.am
+++ b/simgear/bucket/Makefile.am
@@ -12,4 +12,4 @@ libsgbucket_a_SOURCES = newbucket.cxx
 #      $(top_builddir)/bucket/libsgbucket.a \
 #      $(top_builddir)/misc/libsgmisc.a
 
-INCLUDES += -I$(top_builddir)
+INCLUDES += -I$(top_builddir)/src

diff --git a/simgear/debug/Makefile.am b/simgear/debug/Makefile.am
index 2fe60c3727dbc6d0cac7a45eb1598a130de86e3b..b3a538980527bca6aca0d49ff7cd9b455f3e3b7a 100644 (file)
--- a/simgear/debug/Makefile.am
+++ b/simgear/debug/Makefile.am
@@ -6,4 +6,4 @@ include_HEADERS = debug_types.h logstream.hxx
 
 libsgdebug_a_SOURCES = logstream.cxx
 
-INCLUDES += -I$(top_builddir)
+INCLUDES += -I$(top_builddir)/src

diff --git a/simgear/math/Makefile.am b/simgear/math/Makefile.am
index 046ffe79f69cb832f3b234cff2517d698c17cd03..493262e319d3e18506edf4085561df4c32608431 100644 (file)
--- a/simgear/math/Makefile.am
+++ b/simgear/math/Makefile.am
@@ -27,4 +27,4 @@ libsgmath_a_SOURCES = \
        polar3d.cxx \
        vector.cxx
 
-INCLUDES += -I$(top_builddir)
+INCLUDES += -I$(top_builddir)/src

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index 0691d537f84ba8d971e3df652f8dda51d0bc7715..dcf388efd2cc2ab4a794206a94178c08cb7f4c15 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -23,8 +23,4 @@ libsgmisc_a_SOURCES = \
        texcoord.cxx \
        zfstream.cxx
 
-INCLUDES += \
-       -I$(top_builddir) \
-       -I$(top_builddir)/bucket \
-       -I$(top_builddir)/math \
-       $(ZLIB_INCL)
+INCLUDES += -I$(top_builddir)/src

diff --git a/simgear/screen/Makefile.am b/simgear/screen/Makefile.am
index 01eab5f7abd075dd913f92f4f54aaeadce38db73..84c9832e38841175a15a78d20a5bb0e25e07cd01 100644 (file)
--- a/simgear/screen/Makefile.am
+++ b/simgear/screen/Makefile.am
@@ -7,4 +7,4 @@ libsgscreen_a_SOURCES = \
        screen-dump.cxx \
        win32-printer.h
 
-INCLUDES += -I$(top_builddir)
+INCLUDES += -I$(top_builddir)/src

diff --git a/simgear/serial/Makefile.am b/simgear/serial/Makefile.am
index 77c1feb8af6ced68b9b1b9b7e13f05798da272b0..7ef69a90d6425576545457d800c029930427343a 100644 (file)
--- a/simgear/serial/Makefile.am
+++ b/simgear/serial/Makefile.am
@@ -9,7 +9,7 @@ libsgserial_a_SOURCES = serial.cxx
 testserial_SOURCES = testserial.cxx
 
 testserial_LDADD = \
-       $(top_builddir)/serial/libsgserial.a \
-       $(top_builddir)/debug/libsgdebug.a
+       $(top_builddir)/src/serial/libsgserial.a \
+       $(top_builddir)/src/debug/libsgdebug.a
 
-INCLUDES += -I$(top_builddir)
+INCLUDES += -I$(top_builddir)/src