FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#includes based off of srcdir rather than builddir.

Browse Source
This commit is contained in:
curt 2000-09-20 21:14:42 +00:00
parent 8c3de351b0
commit f1c00cdd18
16 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.in
View File

@ -6,7 +6,7 @@ dnl $Id$
AC_INIT(simgear/bucket/newbucket.cxx) AC_INIT(simgear/bucket/newbucket.cxx)
dnl Initialize the automake stuff dnl Initialize the automake stuff
AM_INIT_AUTOMAKE(SimGear, 0.0.13) AM_INIT_AUTOMAKE(SimGear, 0.0.14)
dnl Checks for programs. dnl Checks for programs.
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
@ -257,6 +257,7 @@ AC_OUTPUT( \
simgear/magvar/Makefile \ simgear/magvar/Makefile \
simgear/math/Makefile \ simgear/math/Makefile \
simgear/misc/Makefile \ simgear/misc/Makefile \
simgear/route/Makefile \
simgear/screen/Makefile \ simgear/screen/Makefile \
simgear/serial/Makefile \ simgear/serial/Makefile \
simgear/sky/Makefile \ simgear/sky/Makefile \

1
simgear/Makefile.am
View File

@ -33,6 +33,7 @@ SUBDIRS = \
math \ math \
$(METAR_DIRS) \ $(METAR_DIRS) \
misc \ misc \
route \
screen \ screen \
$(SERIAL_DIRS) \ $(SERIAL_DIRS) \
sky \ sky \

6
simgear/bucket/Makefile.am
View File

@ -11,7 +11,7 @@ libsgbucket_a_SOURCES = newbucket.cxx
# testbucket_SOURCES = testbucket.cxx # testbucket_SOURCES = testbucket.cxx
# testbucket_LDADD = \ # testbucket_LDADD = \
# $(top_builddir)/bucket/libsgbucket.a \ # $(top_srcdir)/bucket/libsgbucket.a \
# $(top_builddir)/misc/libsgmisc.a # $(top_srcdir)/misc/libsgmisc.a
INCLUDES += -I$(top_builddir) INCLUDES += -I$(top_srcdir)

2
simgear/debug/Makefile.am
View File

@ -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)

2
simgear/ephemeris/Makefile.am
View File

@ -31,4 +31,4 @@ libsgephem_a_SOURCES = \
uranus.cxx \ uranus.cxx \
venus.cxx venus.cxx
INCLUDES += -I$(top_builddir) INCLUDES += -I$(top_srcdir)

2
simgear/io/Makefile.am
View File

@ -14,4 +14,4 @@ libsgio_a_SOURCES = \
sg_serial.cxx \ sg_serial.cxx \
sg_socket.cxx sg_socket.cxx
INCLUDES += -I$(top_builddir) INCLUDES += -I$(top_srcdir)

4
simgear/magvar/Makefile.am
View File

@ -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)

4
simgear/math/Makefile.am
View File

@ -3,7 +3,7 @@ includedir = @includedir@/math
if HAVE_ZLIB if HAVE_ZLIB
ZLIB_INCL = ZLIB_INCL =
else else
ZLIB_INCL = -I$(top_builddir)/src/zlib ZLIB_INCL = -I$(top_srcdir)/src/zlib
endif endif
lib_LIBRARIES = libsgmath.a lib_LIBRARIES = libsgmath.a
@ -29,4 +29,4 @@ libsgmath_a_SOURCES = \
polar3d.cxx \ polar3d.cxx \
vector.cxx vector.cxx
INCLUDES += -I$(top_builddir) $(ZLIB_INCL) INCLUDES += -I$(top_srcdir) $(ZLIB_INCL)

2
simgear/metar/Makefile.am
View File

@ -9,4 +9,4 @@ libsgmetar_a_SOURCES = \
MetarStation.cpp MetarStation.h \ MetarStation.cpp MetarStation.h \
Prtdmetr.cpp Stspack2.cpp Stspack3.cpp Prtdmetr.cpp Stspack2.cpp Stspack3.cpp
INCLUDES += -I$(top_builddir) INCLUDES += -I$(top_srcdir)

4
simgear/misc/Makefile.am
View File

@ -3,7 +3,7 @@ includedir = @includedir@/misc
if HAVE_ZLIB if HAVE_ZLIB
ZLIB_INCL = ZLIB_INCL =
else else
ZLIB_INCL = -I$(top_builddir)/src/zlib ZLIB_INCL = -I$(top_srcdir)/src/zlib
endif endif
lib_LIBRARIES = libsgmisc.a lib_LIBRARIES = libsgmisc.a
@ -26,4 +26,4 @@ libsgmisc_a_SOURCES = \
texcoord.cxx \ texcoord.cxx \
zfstream.cxx zfstream.cxx
INCLUDES += -I$(top_builddir) $(ZLIB_INCL) INCLUDES += -I$(top_srcdir) $(ZLIB_INCL)

2
simgear/screen/Makefile.am
View File

@ -9,4 +9,4 @@ libsgscreen_a_SOURCES = \
screen-dump.cxx \ screen-dump.cxx \
win32-printer.h win32-printer.h
INCLUDES += -I$(top_builddir) INCLUDES += -I$(top_srcdir)

6
simgear/serial/Makefile.am
View File

@ -11,7 +11,7 @@ libsgserial_a_SOURCES = serial.cxx
testserial_SOURCES = testserial.cxx testserial_SOURCES = testserial.cxx
testserial_LDADD = \ testserial_LDADD = \
$(top_builddir)/simgear/serial/libsgserial.a \ $(top_srcdir)/simgear/serial/libsgserial.a \
$(top_builddir)/simgear/debug/libsgdebug.a $(top_srcdir)/simgear/debug/libsgdebug.a
INCLUDES += -I$(top_builddir) INCLUDES += -I$(top_srcdir)

2
simgear/sky/Makefile.am
View File

@ -20,4 +20,4 @@ libsgsky_a_SOURCES = \
sphere.cxx \ sphere.cxx \
stars.cxx stars.cxx
INCLUDES += -I$(top_builddir) INCLUDES += -I$(top_srcdir)

2
simgear/timing/Makefile.am
View File

@ -20,4 +20,4 @@ libsgtiming_a_SOURCES = \
# sunpos.cxx sunpos.hxx \ # sunpos.cxx sunpos.hxx \
# timestamp.hxx # timestamp.hxx
INCLUDES += -I$(top_builddir) INCLUDES += -I$(top_srcdir)

2
simgear/xgl/Makefile.am
View File

@ -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)

4
simgear/xml/Makefile.am
View File

@ -1,7 +1,7 @@
if HAVE_ZLIB if HAVE_ZLIB
ZLIB_INCL = ZLIB_INCL =
else else
XLIB_INCL = -I$(top_builddir)/src/zlib XLIB_INCL = -I$(top_srcdir)/src/zlib
endif endif
lib_LIBRARIES = libsgxml.a lib_LIBRARIES = libsgxml.a
@ -22,4 +22,4 @@ libsgxml_a_SOURCES = \
xmltok.h xmltok.c \ xmltok.h xmltok.c \
xmltok_impl.h xmltok_impl.h
INCLUDES += -I$(top_builddir) $(ZLIB_INCL) INCLUDES += -I$(top_srcdir) $(ZLIB_INCL)