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

New automake, new problems. Use $base_LIBS where $LIBS was automatically added before

Browse Source
This commit is contained in:
ehofman
2003-08-29 07:35:55 +00:00
parent 699909f808
commit 7289ac645a
8 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/ephemeris/Makefile.am
+1 -1
View File
@@ -4,7 +4,7 @@ lib_LIBRARIES = libsgephem.a
include_HEADERS = \ include_HEADERS = \
celestialBody.hxx \ celestialBody.hxx \
ephemeris.hxx \ ephemeris.hxx \
jupiter.hxx \ jupiter.hxx \
mars.hxx \ mars.hxx \
mercury.hxx \ mercury.hxx \
simgear/io/Makefile.am
+11 -12
View File
@@ -31,9 +31,9 @@ tcp_server_LDADD = \
$(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \ $(top_builddir)/simgear/misc/libsgmisc.a \
$(top_builddir)/simgear/xml/libsgxml.a \
-lplibnet -lplibul -lz \ -lplibnet -lplibul -lz \
$(network_LIBS) $(network_LIBS) \
$(base_LIBS)
tcp_client_SOURCES = tcp_client.cxx tcp_client_SOURCES = tcp_client.cxx
@@ -42,20 +42,20 @@ tcp_client_LDADD = \
$(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \ $(top_builddir)/simgear/misc/libsgmisc.a \
$(top_builddir)/simgear/xml/libsgxml.a \
-lplibnet -lplibul -lz \ -lplibnet -lplibul -lz \
$(network_LIBS) $(network_LIBS) \
$(base_LIBS)
socktest_SOURCES = socktest.cxx socktest_SOURCES = socktest.cxx
socktest_LDADD = \ socktest_LDADD = \
$(top_builddir)/simgear/bucket/libsgbucket.a \ $(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/debug/libsgdebug.a \
$(top_builddir)/simgear/misc/libsgmisc.a \ $(top_builddir)/simgear/misc/libsgmisc.a \
$(top_builddir)/simgear/xml/libsgxml.a \
-lplibnet -lplibul -lz \ -lplibnet -lplibul -lz \
$(network_LIBS) $(network_LIBS) \
$(base_LIBS)
lowtest_SOURCES = lowtest.cxx lowtest_SOURCES = lowtest.cxx
@@ -66,8 +66,7 @@ decode_binobj_SOURCES = decode_binobj.cxx
decode_binobj_LDADD = \ decode_binobj_LDADD = \
$(top_builddir)/simgear/io/libsgio.a \ $(top_builddir)/simgear/io/libsgio.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \ $(top_builddir)/simgear/misc/libsgmisc.a \
$(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/xml/libsgxml.a \ $(base_LIBS) -lz
-lz
simgear/magvar/Makefile.am
+3 -1
View File
@@ -12,6 +12,8 @@ noinst_PROGRAMS = testmagvar
testmagvar_SOURCES = testmagvar.cxx 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) INCLUDES = -I$(top_srcdir)
simgear/misc/Makefile.am
+4 -4
View File
@@ -3,8 +3,8 @@ includedir = @includedir@/misc
lib_LIBRARIES = libsgmisc.a lib_LIBRARIES = libsgmisc.a
include_HEADERS = \ include_HEADERS = \
commands.hxx \ commands.hxx \
exception.hxx \ exception.hxx \
sg_path.hxx \ sg_path.hxx \
sgstream.hxx \ sgstream.hxx \
stopwatch.hxx \ stopwatch.hxx \
@@ -14,8 +14,8 @@ include_HEADERS = \
zfstream.hxx zfstream.hxx
libsgmisc_a_SOURCES = \ libsgmisc_a_SOURCES = \
commands.cxx \ commands.cxx \
exception.cxx \ exception.cxx \
sg_path.cxx \ sg_path.cxx \
sgstream.cxx \ sgstream.cxx \
strutils.cxx \ strutils.cxx \
simgear/props/Makefile.am
+1 -1
View File
@@ -10,7 +10,7 @@ include_HEADERS = \
libsgprops_a_SOURCES = \ libsgprops_a_SOURCES = \
condition.cxx \ condition.cxx \
props.cxx \ props.cxx \
props_io.cxx props_io.cxx
noinst_PROGRAMS = props_test noinst_PROGRAMS = props_test
simgear/route/Makefile.am
+3 -2
View File
@@ -19,7 +19,7 @@ waytest_LDADD = \
$(top_builddir)/simgear/math/libsgmath.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 \ $(top_builddir)/simgear/misc/libsgmisc.a \
$(top_builddir)/simgear/xml/libsgxml.a \ $(base_LIBS) \
-lz -lz
routetest_SOURCES = routetest.cxx routetest_SOURCES = routetest.cxx
@@ -27,4 +27,5 @@ routetest_SOURCES = routetest.cxx
routetest_LDADD = \ routetest_LDADD = \
$(top_builddir)/simgear/route/libsgroute.a \ $(top_builddir)/simgear/route/libsgroute.a \
$(top_builddir)/simgear/math/libsgmath.a \ $(top_builddir)/simgear/math/libsgmath.a \
$(top_builddir)/simgear/debug/libsgdebug.a $(top_builddir)/simgear/debug/libsgdebug.a \
$(base_LIBS)
simgear/screen/Makefile.am
+1 -1
View File
@@ -27,7 +27,7 @@ libsgscreen_a_SOURCES = \
GLBitmaps.cxx GLBitmaps.h \ GLBitmaps.cxx GLBitmaps.h \
$(IMAGE_SERVER_SRCS) \ $(IMAGE_SERVER_SRCS) \
screen-dump.cxx \ screen-dump.cxx \
tr.cxx \ tr.cxx \
extensions.cxx \ extensions.cxx \
win32-printer.h win32-printer.h
simgear/xml/Makefile.am
+1 -1
View File
@@ -9,7 +9,7 @@ noinst_HEADERS = \
xmltok_impl.c xmltok_ns.c xmltok_impl.c xmltok_ns.c
libsgxml_a_SOURCES = \ libsgxml_a_SOURCES = \
asciitab.h \ asciitab.h \
easyxml.cxx \ easyxml.cxx \
hashtable.h hashtable.c \ hashtable.h hashtable.c \
iasciitab.h latin1tab.h nametab.h utf8tab.h xmldef.h \ iasciitab.h latin1tab.h nametab.h utf8tab.h xmldef.h \