From 7289ac645a5a11f1841d3b295ff4dfd70d14ac6c Mon Sep 17 00:00:00 2001 From: ehofman Date: Fri, 29 Aug 2003 07:35:55 +0000 Subject: [PATCH] New automake, new problems. Use $base_LIBS where $LIBS was automatically added before --- simgear/ephemeris/Makefile.am | 2 +- simgear/io/Makefile.am | 23 +++++++++++------------ simgear/magvar/Makefile.am | 4 +++- simgear/misc/Makefile.am | 8 ++++---- simgear/props/Makefile.am | 2 +- simgear/route/Makefile.am | 5 +++-- simgear/screen/Makefile.am | 2 +- simgear/xml/Makefile.am | 2 +- 8 files changed, 25 insertions(+), 23 deletions(-) diff --git a/simgear/ephemeris/Makefile.am b/simgear/ephemeris/Makefile.am index ce26c870..c6ea748f 100644 --- a/simgear/ephemeris/Makefile.am +++ b/simgear/ephemeris/Makefile.am @@ -4,7 +4,7 @@ lib_LIBRARIES = libsgephem.a include_HEADERS = \ celestialBody.hxx \ - ephemeris.hxx \ + ephemeris.hxx \ jupiter.hxx \ mars.hxx \ mercury.hxx \ diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am index 2c869c0a..c4d5b58d 100644 --- a/simgear/io/Makefile.am +++ b/simgear/io/Makefile.am @@ -31,9 +31,9 @@ tcp_server_LDADD = \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ - $(top_builddir)/simgear/xml/libsgxml.a \ -lplibnet -lplibul -lz \ - $(network_LIBS) + $(network_LIBS) \ + $(base_LIBS) tcp_client_SOURCES = tcp_client.cxx @@ -42,20 +42,20 @@ tcp_client_LDADD = \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ - $(top_builddir)/simgear/xml/libsgxml.a \ -lplibnet -lplibul -lz \ - $(network_LIBS) + $(network_LIBS) \ + $(base_LIBS) socktest_SOURCES = socktest.cxx socktest_LDADD = \ $(top_builddir)/simgear/bucket/libsgbucket.a \ - $(top_builddir)/simgear/io/libsgio.a \ + $(top_builddir)/simgear/io/libsgio.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ - $(top_builddir)/simgear/xml/libsgxml.a \ -lplibnet -lplibul -lz \ - $(network_LIBS) + $(network_LIBS) \ + $(base_LIBS) lowtest_SOURCES = lowtest.cxx @@ -66,8 +66,7 @@ decode_binobj_SOURCES = decode_binobj.cxx decode_binobj_LDADD = \ $(top_builddir)/simgear/io/libsgio.a \ - $(top_builddir)/simgear/bucket/libsgbucket.a \ - $(top_builddir)/simgear/misc/libsgmisc.a \ - $(top_builddir)/simgear/debug/libsgdebug.a \ - $(top_builddir)/simgear/xml/libsgxml.a \ - -lz + $(top_builddir)/simgear/bucket/libsgbucket.a \ + $(top_builddir)/simgear/misc/libsgmisc.a \ + $(top_builddir)/simgear/debug/libsgdebug.a \ + $(base_LIBS) -lz diff --git a/simgear/magvar/Makefile.am b/simgear/magvar/Makefile.am index e0c9c664..619e2830 100644 --- a/simgear/magvar/Makefile.am +++ b/simgear/magvar/Makefile.am @@ -12,6 +12,8 @@ noinst_PROGRAMS = testmagvar testmagvar_SOURCES = testmagvar.cxx -testmagvar_LDADD = $(top_builddir)/simgear/magvar/libsgmagvar.a +testmagvar_LDADD = \ + $(top_builddir)/simgear/magvar/libsgmagvar.a \ + $(base_LIBS) INCLUDES = -I$(top_srcdir) diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am index 8c6d70da..1d0ac77b 100644 --- a/simgear/misc/Makefile.am +++ b/simgear/misc/Makefile.am @@ -3,8 +3,8 @@ includedir = @includedir@/misc lib_LIBRARIES = libsgmisc.a include_HEADERS = \ - commands.hxx \ - exception.hxx \ + commands.hxx \ + exception.hxx \ sg_path.hxx \ sgstream.hxx \ stopwatch.hxx \ @@ -14,8 +14,8 @@ include_HEADERS = \ zfstream.hxx libsgmisc_a_SOURCES = \ - commands.cxx \ - exception.cxx \ + commands.cxx \ + exception.cxx \ sg_path.cxx \ sgstream.cxx \ strutils.cxx \ diff --git a/simgear/props/Makefile.am b/simgear/props/Makefile.am index 3195e69d..f6928205 100644 --- a/simgear/props/Makefile.am +++ b/simgear/props/Makefile.am @@ -10,7 +10,7 @@ include_HEADERS = \ libsgprops_a_SOURCES = \ condition.cxx \ props.cxx \ - props_io.cxx + props_io.cxx noinst_PROGRAMS = props_test diff --git a/simgear/route/Makefile.am b/simgear/route/Makefile.am index 8035f101..ead62da8 100644 --- a/simgear/route/Makefile.am +++ b/simgear/route/Makefile.am @@ -19,7 +19,7 @@ waytest_LDADD = \ $(top_builddir)/simgear/math/libsgmath.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ - $(top_builddir)/simgear/xml/libsgxml.a \ + $(base_LIBS) \ -lz routetest_SOURCES = routetest.cxx @@ -27,4 +27,5 @@ routetest_SOURCES = routetest.cxx routetest_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 \ + $(base_LIBS) diff --git a/simgear/screen/Makefile.am b/simgear/screen/Makefile.am index cec32d80..b711d219 100644 --- a/simgear/screen/Makefile.am +++ b/simgear/screen/Makefile.am @@ -27,7 +27,7 @@ libsgscreen_a_SOURCES = \ GLBitmaps.cxx GLBitmaps.h \ $(IMAGE_SERVER_SRCS) \ screen-dump.cxx \ - tr.cxx \ + tr.cxx \ extensions.cxx \ win32-printer.h diff --git a/simgear/xml/Makefile.am b/simgear/xml/Makefile.am index cf449e5f..274f97ec 100644 --- a/simgear/xml/Makefile.am +++ b/simgear/xml/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = \ xmltok_impl.c xmltok_ns.c libsgxml_a_SOURCES = \ - asciitab.h \ + asciitab.h \ easyxml.cxx \ hashtable.h hashtable.c \ iasciitab.h latin1tab.h nametab.h utf8tab.h xmldef.h \ -- 2.39.5