Changed directory structure a bit to facilitate building for windows.

diff --git a/Makefile.am b/Makefile.am
index a7590db72611acac1f015a2db5ec1712ff5193cc..97fc99ac9b1ed1fb894d75e9d3cc32797f7c5cf5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,4 +3,4 @@ EXTRA_DIST = mksymlinks.sh acsite.m4 acconfig.h
 dist-hook:
        tar cf - src/metar | (cd $(distdir); tar xvf -)
 
-SUBDIRS = src
+SUBDIRS = simgear

diff --git a/configure.in b/configure.in
index 80a230d635e48b842c66aa0703c34e0e8d9fa7bd..2079f694ba0c727400c23bcab0cdcca0f1393075 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl working configure script.
 dnl
 dnl $Id$
 
-AC_INIT(src/bucket/newbucket.cxx)
+AC_INIT(simgear/bucket/newbucket.cxx)
 
 dnl Initialize the automake stuff
 AM_INIT_AUTOMAKE(SimGear, 0.0.4)
@@ -223,24 +223,24 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS( ftime gettimeofday timegm memcpy bcopy mktime strstr rand \
        random setitimer getitimer signal GetLocalTime rint getrusage )
 
-AM_CONFIG_HEADER(src/include/config.h)
+AM_CONFIG_HEADER(simgear/include/config.h)
 
 AC_OUTPUT( \
        Makefile \
-       src/Makefile \
-       src/include/Makefile \
-       src/include/version.h \
-       src/bucket/Makefile \
-       src/debug/Makefile \
-       src/math/Makefile \
-       src/misc/Makefile \
-       src/screen/Makefile \
-       src/serial/Makefile \
-       src/xgl/Makefile \
-       src/zlib/Makefile \
+       simgear/Makefile \
+       simgear/include/Makefile \
+       simgear/include/version.h \
+       simgear/bucket/Makefile \
+       simgear/debug/Makefile \
+       simgear/math/Makefile \
+       simgear/misc/Makefile \
+       simgear/screen/Makefile \
+       simgear/serial/Makefile \
+       simgear/xgl/Makefile \
+       simgear/zlib/Makefile \
 )
 
-AC_OUTPUT_COMMANDS([./mksymlinks.sh])
+# AC_OUTPUT_COMMANDS([./mksymlinks.sh])
 
 echo ""
 echo "Configure Summary"

diff --git a/mksymlinks.sh b/mksymlinks.sh
index 8ff39f1cd9dca6be2394f294db70f8013f7fa598..311f8a9f0c6aec58f9a6f426cca742e61ee1caf5 100755 (executable)
--- a/mksymlinks.sh
+++ b/mksymlinks.sh
@@ -29,7 +29,6 @@ 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
 

diff --git a/simgear/bucket/Makefile.am b/simgear/bucket/Makefile.am
index d2cc18836b81c5a13c5b37c620f74172599bc2eb..8ebce7bf2433d3f6eca40d26e2043740106ebd16 100644 (file)
--- a/simgear/bucket/Makefile.am
+++ b/simgear/bucket/Makefile.am
@@ -14,4 +14,4 @@ libsgbucket_a_SOURCES = newbucket.cxx
 #      $(top_builddir)/bucket/libsgbucket.a \
 #      $(top_builddir)/misc/libsgmisc.a
 
-INCLUDES += -I$(top_builddir)/src
+# INCLUDES += -I$(top_builddir)/src

diff --git a/simgear/debug/Makefile.am b/simgear/debug/Makefile.am
index 255f0252bfb9f4171efad7782ddcc54cf6821374..fcf0bcd466139ad99428e0e73f37e560920ea42d 100644 (file)
--- a/simgear/debug/Makefile.am
+++ b/simgear/debug/Makefile.am
@@ -8,4 +8,4 @@ include_HEADERS = debug_types.h logstream.hxx
 
 libsgdebug_a_SOURCES = logstream.cxx
 
-INCLUDES += -I$(top_builddir)/src
+# INCLUDES += -I$(top_builddir)/src

diff --git a/simgear/math/Makefile.am b/simgear/math/Makefile.am
index 7af97079bb31a7c414d493dec27cd895f5755dbb..765e64e8e63b69bee892720a900c95edc135acb1 100644 (file)
--- a/simgear/math/Makefile.am
+++ b/simgear/math/Makefile.am
@@ -29,4 +29,5 @@ libsgmath_a_SOURCES = \
        polar3d.cxx \
        vector.cxx
 
-INCLUDES += -I$(top_builddir)/src $(ZLIB_INCL)
+# INCLUDES += -I$(top_builddir)/src $(ZLIB_INCL)
+INCLUDES += $(ZLIB_INCL)

diff --git a/simgear/metar/Makefile.am b/simgear/metar/Makefile.am
index cbe88c7907004638ac17ff6ff39876cdaa63f276..c0457eb1d61d04f4f30e3a0d4a221d9384c04dd9 100644 (file)
--- a/simgear/metar/Makefile.am
+++ b/simgear/metar/Makefile.am
@@ -9,4 +9,4 @@ libsgmetar_a_SOURCES = \
        MetarStation.cpp MetarStation.h \
        Prtdmetr.cpp Stspack2.cpp Stspack3.cpp
 
-INCLUDES += -I$(top_builddir)
+# INCLUDES += -I$(top_builddir)

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index 44d4a79637ff454da0577de17af67b3d24cd9d30..8c0d900ccc045305cf812cc89d0eaa007aef442a 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -23,4 +23,5 @@ libsgmisc_a_SOURCES = \
        texcoord.cxx \
        zfstream.cxx
 
-INCLUDES += -I$(top_builddir)/src $(ZLIB_INCL)
+# INCLUDES += -I$(top_builddir)/src $(ZLIB_INCL)
+INCLUDES += $(ZLIB_INCL)

diff --git a/simgear/screen/Makefile.am b/simgear/screen/Makefile.am
index 4593565d332fbb0959fe5dd679de5cc3341fa72f..9bd749b1e0c56555eb6134da9e99ed531df67c8e 100644 (file)
--- a/simgear/screen/Makefile.am
+++ b/simgear/screen/Makefile.am
@@ -9,4 +9,4 @@ libsgscreen_a_SOURCES = \
        screen-dump.cxx \
        win32-printer.h
 
-INCLUDES += -I$(top_builddir)/src
+# INCLUDES += -I$(top_builddir)/src

diff --git a/simgear/serial/Makefile.am b/simgear/serial/Makefile.am
index c92c1fc4d9d3a207dd00630b0c8b188e7f6cb67d..177dc6c43d2cc1bfcdd105f1dc63e2a537d40b55 100644 (file)
--- a/simgear/serial/Makefile.am
+++ b/simgear/serial/Makefile.am
@@ -11,7 +11,7 @@ libsgserial_a_SOURCES = serial.cxx
 testserial_SOURCES = testserial.cxx
 
 testserial_LDADD = \
-       $(top_builddir)/src/serial/libsgserial.a \
-       $(top_builddir)/src/debug/libsgdebug.a
+       $(top_builddir)/simgear/serial/libsgserial.a \
+       $(top_builddir)/simgear/debug/libsgdebug.a
 
-INCLUDES += -I$(top_builddir)/src
+# INCLUDES += -I$(top_builddir)/simgear

diff --git a/simgear/xgl/Makefile.am b/simgear/xgl/Makefile.am
index 3b976153d468d9f922b4a3a38a997f9ca95fe7f4..f0a2dda0b5233755fa5280b1f1379e85faaf7034 100644 (file)
--- a/simgear/xgl/Makefile.am
+++ b/simgear/xgl/Makefile.am
@@ -6,4 +6,4 @@ include_HEADERS = xgl.h
 
 libsgxgl_a_SOURCES = xgl.c xglUtils.c
 
-INCLUDES += -I$(top_builddir)
+# INCLUDES += -I$(top_builddir)