#includes based off of srcdir rather than builddir.

diff --git a/configure.in b/configure.in
index 509a8b8b15c4cca0789dbdc2f983063df2bf530a..9181d6d8722c6df4b0de0c09d4ca8116f7cbb87a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ dnl $Id$
 AC_INIT(simgear/bucket/newbucket.cxx)
 
 dnl Initialize the automake stuff
 AC_INIT(simgear/bucket/newbucket.cxx)
 
 dnl Initialize the automake stuff

-AM_INIT_AUTOMAKE(SimGear, 0.0.13)
+AM_INIT_AUTOMAKE(SimGear, 0.0.14)

 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET


@@ -257,6 +257,7 @@ AC_OUTPUT( \
        simgear/magvar/Makefile \
        simgear/math/Makefile \
        simgear/misc/Makefile \
        simgear/magvar/Makefile \
        simgear/math/Makefile \
        simgear/misc/Makefile \

+       simgear/route/Makefile \

        simgear/screen/Makefile \
        simgear/serial/Makefile \
        simgear/sky/Makefile \
        simgear/screen/Makefile \
        simgear/serial/Makefile \
        simgear/sky/Makefile \

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 94e14148f7922ece547c8d36f6238c778f01cd40..1fc14cc79658944711dfbc18c33ca20b07464908 100644 (file)
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -33,6 +33,7 @@ SUBDIRS = \
        math \
        $(METAR_DIRS) \
        misc \
        math \
        $(METAR_DIRS) \
        misc \

+       route \

        screen \
        $(SERIAL_DIRS) \
        sky \
        screen \
        $(SERIAL_DIRS) \
        sky \

diff --git a/simgear/bucket/Makefile.am b/simgear/bucket/Makefile.am
index 7d64da0e6c4a9496a63ceb0102be684a30f925bb..cb5a899550350d269bbb9ade956cedde6dc7ad8b 100644 (file)
--- a/simgear/bucket/Makefile.am
+++ b/simgear/bucket/Makefile.am
@@ -11,7 +11,7 @@ libsgbucket_a_SOURCES = newbucket.cxx
 # testbucket_SOURCES = testbucket.cxx
 
 # testbucket_LDADD = \
 # testbucket_SOURCES = testbucket.cxx
 
 # testbucket_LDADD = \

-#      $(top_builddir)/bucket/libsgbucket.a \
-#      $(top_builddir)/misc/libsgmisc.a
+#      $(top_srcdir)/bucket/libsgbucket.a \
+#      $(top_srcdir)/misc/libsgmisc.a

 
 

-INCLUDES += -I$(top_builddir)
+INCLUDES += -I$(top_srcdir)

diff --git a/simgear/debug/Makefile.am b/simgear/debug/Makefile.am
index 98942835f9530fd9983df4f49a5dce95836ffb04..aa9f1a166ef49a9cfc0d87cfcdbce684429a7e2c 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
 
 
 libsgdebug_a_SOURCES = logstream.cxx
 

-INCLUDES += -I$(top_builddir)
+INCLUDES += -I$(top_srcdir)

diff --git a/simgear/ephemeris/Makefile.am b/simgear/ephemeris/Makefile.am
index fa901de191c9a17b4a2114f59d4e44e17bbf4d0a..4f6c4ed7b64ac3a803d6ef89988fdca07205b4cf 100644 (file)
--- a/simgear/ephemeris/Makefile.am
+++ b/simgear/ephemeris/Makefile.am
@@ -31,4 +31,4 @@ libsgephem_a_SOURCES = \
        uranus.cxx \
        venus.cxx
 
        uranus.cxx \
        venus.cxx
 

-INCLUDES += -I$(top_builddir)
+INCLUDES += -I$(top_srcdir)

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index 12bd629ba8bd8630bbfd14ef243e1f2613b940a4..9e17a42447a715c26dbf6ba3576e43c8be52fb40 100644 (file)
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -14,4 +14,4 @@ libsgio_a_SOURCES = \
        sg_serial.cxx \
        sg_socket.cxx 
 
        sg_serial.cxx \
        sg_socket.cxx 
 

-INCLUDES += -I$(top_builddir)
+INCLUDES += -I$(top_srcdir)

diff --git a/simgear/magvar/Makefile.am b/simgear/magvar/Makefile.am
index 4df1f5c7ce0f3350ac8fc30c12cb95eae0fb1cc4..b9c1f00f71042720e42b26e5e5ad54c8a553f62f 100644 (file)
--- a/simgear/magvar/Makefile.am
+++ b/simgear/magvar/Makefile.am
@@ -12,6 +12,6 @@ noinst_PROGRAMS = testmagvar
 
 testmagvar_SOURCES = testmagvar.cxx
 
 
 testmagvar_SOURCES = testmagvar.cxx
 

-testmagvar_LDADD = $(top_builddir)/simgear/magvar/libsgmagvar.a
+testmagvar_LDADD = $(top_srcdir)/simgear/magvar/libsgmagvar.a

 
 

-INCLUDES += -I$(top_builddir)
+INCLUDES += -I$(top_srcdir)

diff --git a/simgear/math/Makefile.am b/simgear/math/Makefile.am
index 4e016998f5feaf77b72d600e671b6f6cfd6deaca..275a965d5341d103b7e9c47aa26b53facdb844f0 100644 (file)
--- a/simgear/math/Makefile.am
+++ b/simgear/math/Makefile.am
@@ -3,7 +3,7 @@ includedir = @includedir@/math
 if HAVE_ZLIB
 ZLIB_INCL =
 else
 if HAVE_ZLIB
 ZLIB_INCL =
 else

-ZLIB_INCL = -I$(top_builddir)/src/zlib
+ZLIB_INCL = -I$(top_srcdir)/src/zlib

 endif
 
 lib_LIBRARIES = libsgmath.a
 endif
 
 lib_LIBRARIES = libsgmath.a


@@ -29,4 +29,4 @@ libsgmath_a_SOURCES = \
        polar3d.cxx \
        vector.cxx
 
        polar3d.cxx \
        vector.cxx
 

-INCLUDES += -I$(top_builddir) $(ZLIB_INCL)
+INCLUDES += -I$(top_srcdir) $(ZLIB_INCL)

diff --git a/simgear/metar/Makefile.am b/simgear/metar/Makefile.am
index cbe88c7907004638ac17ff6ff39876cdaa63f276..b9ed36ea9b4146d91a883aa9184d27ef8de927a2 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
 
        MetarStation.cpp MetarStation.h \
        Prtdmetr.cpp Stspack2.cpp Stspack3.cpp
 

-INCLUDES += -I$(top_builddir)
+INCLUDES += -I$(top_srcdir)

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index b11191802215a5b35e8570886d7009478e1e0067..002ffab8b70c7abf0b6cb38c3705de6f8a41801f 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -3,7 +3,7 @@ includedir = @includedir@/misc
 if HAVE_ZLIB
 ZLIB_INCL =
 else
 if HAVE_ZLIB
 ZLIB_INCL =
 else

-ZLIB_INCL = -I$(top_builddir)/src/zlib
+ZLIB_INCL = -I$(top_srcdir)/src/zlib

 endif
 
 lib_LIBRARIES = libsgmisc.a
 endif
 
 lib_LIBRARIES = libsgmisc.a


@@ -26,4 +26,4 @@ libsgmisc_a_SOURCES = \
        texcoord.cxx \
        zfstream.cxx
 
        texcoord.cxx \
        zfstream.cxx
 

-INCLUDES += -I$(top_builddir) $(ZLIB_INCL)
+INCLUDES += -I$(top_srcdir) $(ZLIB_INCL)

diff --git a/simgear/screen/Makefile.am b/simgear/screen/Makefile.am
index f645ccfd522b7abeef2d10eb08f24702efa3082c..60df6eb28d6782ba24eb6eb0c3137ca7e840c494 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
 
        screen-dump.cxx \
        win32-printer.h
 

-INCLUDES += -I$(top_builddir)
+INCLUDES += -I$(top_srcdir)

diff --git a/simgear/serial/Makefile.am b/simgear/serial/Makefile.am
index 05975bc2f8f0b9fee5c9bc1530be5a0d23f2a57a..8e339db60fb41b1addf2471c6d29d6fc052897cd 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 = \
 testserial_SOURCES = testserial.cxx
 
 testserial_LDADD = \

-       $(top_builddir)/simgear/serial/libsgserial.a \
-       $(top_builddir)/simgear/debug/libsgdebug.a
+       $(top_srcdir)/simgear/serial/libsgserial.a \
+       $(top_srcdir)/simgear/debug/libsgdebug.a

 
 

-INCLUDES += -I$(top_builddir)
+INCLUDES += -I$(top_srcdir)

diff --git a/simgear/sky/Makefile.am b/simgear/sky/Makefile.am
index fed48733082a8025e8c39da226d5b5d9e92c9387..7264dd2ee86b5a340774d28a6a4845535399bcac 100644 (file)
--- a/simgear/sky/Makefile.am
+++ b/simgear/sky/Makefile.am
@@ -20,4 +20,4 @@ libsgsky_a_SOURCES = \
        sphere.cxx \
        stars.cxx
 
        sphere.cxx \
        stars.cxx
 

-INCLUDES += -I$(top_builddir)
+INCLUDES += -I$(top_srcdir)

diff --git a/simgear/timing/Makefile.am b/simgear/timing/Makefile.am
index 6d96633beb78747c969e2f3f255d99bed728ba73..7e6f68f1cd649d4ce32f85fedd795000f99c67ed 100644 (file)
--- a/simgear/timing/Makefile.am
+++ b/simgear/timing/Makefile.am
@@ -20,4 +20,4 @@ libsgtiming_a_SOURCES = \
        # sunpos.cxx sunpos.hxx \
        # timestamp.hxx
 
        # sunpos.cxx sunpos.hxx \
        # timestamp.hxx
 

-INCLUDES += -I$(top_builddir)
+INCLUDES += -I$(top_srcdir)

diff --git a/simgear/xgl/Makefile.am b/simgear/xgl/Makefile.am
index 3b976153d468d9f922b4a3a38a997f9ca95fe7f4..5381436a184cb9a3c53779a47b8e0658b55ad5a9 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
 
 
 libsgxgl_a_SOURCES = xgl.c xglUtils.c
 

-INCLUDES += -I$(top_builddir)
+INCLUDES += -I$(top_srcdir)

diff --git a/simgear/xml/Makefile.am b/simgear/xml/Makefile.am
index 3b0f3db3c68c1f80d29a39e5f7d346b20ddf78d8..613ef5451a5525114147339c3ab162933d15d370 100644 (file)
--- a/simgear/xml/Makefile.am
+++ b/simgear/xml/Makefile.am
@@ -1,7 +1,7 @@
 if HAVE_ZLIB
 ZLIB_INCL =
 else
 if HAVE_ZLIB
 ZLIB_INCL =
 else

-XLIB_INCL = -I$(top_builddir)/src/zlib
+XLIB_INCL = -I$(top_srcdir)/src/zlib

 endif
 
 lib_LIBRARIES = libsgxml.a
 endif
 
 lib_LIBRARIES = libsgxml.a


@@ -22,4 +22,4 @@ libsgxml_a_SOURCES = \
        xmltok.h xmltok.c \
        xmltok_impl.h
 
        xmltok.h xmltok.c \
        xmltok_impl.h
 

-INCLUDES += -I$(top_builddir) $(ZLIB_INCL)
+INCLUDES += -I$(top_srcdir) $(ZLIB_INCL)