From f1c00cdd18303693f1ecd3387eccf4c7c7ac9c44 Mon Sep 17 00:00:00 2001 From: curt Date: Wed, 20 Sep 2000 21:14:42 +0000 Subject: [PATCH] #includes based off of srcdir rather than builddir. --- configure.in | 3 ++- simgear/Makefile.am | 1 + simgear/bucket/Makefile.am | 6 +++--- simgear/debug/Makefile.am | 2 +- simgear/ephemeris/Makefile.am | 2 +- simgear/io/Makefile.am | 2 +- simgear/magvar/Makefile.am | 4 ++-- simgear/math/Makefile.am | 4 ++-- simgear/metar/Makefile.am | 2 +- simgear/misc/Makefile.am | 4 ++-- simgear/screen/Makefile.am | 2 +- simgear/serial/Makefile.am | 6 +++--- simgear/sky/Makefile.am | 2 +- simgear/timing/Makefile.am | 2 +- simgear/xgl/Makefile.am | 2 +- simgear/xml/Makefile.am | 4 ++-- 16 files changed, 25 insertions(+), 23 deletions(-) diff --git a/configure.in b/configure.in index 509a8b8b..9181d6d8 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ dnl $Id$ 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 @@ -257,6 +257,7 @@ AC_OUTPUT( \ simgear/magvar/Makefile \ simgear/math/Makefile \ simgear/misc/Makefile \ + simgear/route/Makefile \ simgear/screen/Makefile \ simgear/serial/Makefile \ simgear/sky/Makefile \ diff --git a/simgear/Makefile.am b/simgear/Makefile.am index 94e14148..1fc14cc7 100644 --- a/simgear/Makefile.am +++ b/simgear/Makefile.am @@ -33,6 +33,7 @@ SUBDIRS = \ math \ $(METAR_DIRS) \ misc \ + route \ screen \ $(SERIAL_DIRS) \ sky \ diff --git a/simgear/bucket/Makefile.am b/simgear/bucket/Makefile.am index 7d64da0e..cb5a8995 100644 --- 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 = \ -# $(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 98942835..aa9f1a16 100644 --- 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) +INCLUDES += -I$(top_srcdir) diff --git a/simgear/ephemeris/Makefile.am b/simgear/ephemeris/Makefile.am index fa901de1..4f6c4ed7 100644 --- a/simgear/ephemeris/Makefile.am +++ b/simgear/ephemeris/Makefile.am @@ -31,4 +31,4 @@ libsgephem_a_SOURCES = \ 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 12bd629b..9e17a424 100644 --- a/simgear/io/Makefile.am +++ b/simgear/io/Makefile.am @@ -14,4 +14,4 @@ libsgio_a_SOURCES = \ 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 4df1f5c7..b9c1f00f 100644 --- a/simgear/magvar/Makefile.am +++ b/simgear/magvar/Makefile.am @@ -12,6 +12,6 @@ noinst_PROGRAMS = testmagvar 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 4e016998..275a965d 100644 --- a/simgear/math/Makefile.am +++ b/simgear/math/Makefile.am @@ -3,7 +3,7 @@ includedir = @includedir@/math 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 @@ -29,4 +29,4 @@ libsgmath_a_SOURCES = \ 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 cbe88c79..b9ed36ea 100644 --- 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_srcdir) diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am index b1119180..002ffab8 100644 --- a/simgear/misc/Makefile.am +++ b/simgear/misc/Makefile.am @@ -3,7 +3,7 @@ includedir = @includedir@/misc 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 @@ -26,4 +26,4 @@ libsgmisc_a_SOURCES = \ 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 f645ccfd..60df6eb2 100644 --- 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) +INCLUDES += -I$(top_srcdir) diff --git a/simgear/serial/Makefile.am b/simgear/serial/Makefile.am index 05975bc2..8e339db6 100644 --- 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)/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 fed48733..7264dd2e 100644 --- a/simgear/sky/Makefile.am +++ b/simgear/sky/Makefile.am @@ -20,4 +20,4 @@ libsgsky_a_SOURCES = \ 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 6d96633b..7e6f68f1 100644 --- a/simgear/timing/Makefile.am +++ b/simgear/timing/Makefile.am @@ -20,4 +20,4 @@ libsgtiming_a_SOURCES = \ # 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 3b976153..5381436a 100644 --- 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_srcdir) diff --git a/simgear/xml/Makefile.am b/simgear/xml/Makefile.am index 3b0f3db3..613ef545 100644 --- a/simgear/xml/Makefile.am +++ b/simgear/xml/Makefile.am @@ -1,7 +1,7 @@ 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 @@ -22,4 +22,4 @@ libsgxml_a_SOURCES = \ xmltok.h xmltok.c \ xmltok_impl.h -INCLUDES += -I$(top_builddir) $(ZLIB_INCL) +INCLUDES += -I$(top_srcdir) $(ZLIB_INCL)