From 6a481eed3616bd1c889d589bcee4d3d19eb26325 Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 15 May 2001 21:31:35 +0000 Subject: [PATCH] We have to add a few more libs to a couple link lines in order to make irix happy because it tries to resolve dependencies even if they are eventually never used. --- simgear/Makefile.am | 8 ++++---- simgear/io/Makefile.am | 7 +++++-- simgear/route/Makefile.am | 4 +++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/simgear/Makefile.am b/simgear/Makefile.am index 9bdce9d4..6cddb530 100644 --- a/simgear/Makefile.am +++ b/simgear/Makefile.am @@ -32,15 +32,15 @@ include_HEADERS = \ SUBDIRS = \ $(ZLIB_DIRS) \ - bucket \ + xml \ debug \ + misc \ + bucket \ ephemeris \ + io \ magvar \ math \ $(METAR_DIRS) \ - xml \ - misc \ - io \ route \ screen \ $(SERIAL_DIRS) \ diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am index d566f9fa..0f84bf1b 100644 --- a/simgear/io/Makefile.am +++ b/simgear/io/Makefile.am @@ -25,8 +25,11 @@ noinst_PROGRAMS = decode_binobj socktest lowtest socktest_SOURCES = socktest.cxx socktest_LDADD = \ - $(top_builddir)/simgear/io/libsgio.a \ - $(top_builddir)/simgear/debug/libsgdebug.a + $(top_builddir)/simgear/bucket/libsgbucket.a \ + $(top_builddir)/simgear/io/libsgio.a \ + $(top_builddir)/simgear/debug/libsgdebug.a \ + $(top_builddir)/simgear/misc/libsgmisc.a \ + -lz lowtest_SOURCES = lowtest.cxx diff --git a/simgear/route/Makefile.am b/simgear/route/Makefile.am index b3510070..cfc1b0bf 100644 --- a/simgear/route/Makefile.am +++ b/simgear/route/Makefile.am @@ -17,7 +17,9 @@ waytest_SOURCES = waytest.cxx waytest_LDADD = \ $(top_builddir)/simgear/route/libsgroute.a \ $(top_builddir)/simgear/math/libsgmath.a \ - $(top_builddir)/simgear/debug/libsgdebug.a + $(top_builddir)/simgear/debug/libsgdebug.a \ + $(top_builddir)/simgear/misc/libsgmisc.a \ + -lz routetest_SOURCES = routetest.cxx -- 2.39.5