X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fio%2FMakefile.am;h=d51e287ad379979fefe7699b0551c44848f07c50;hb=6a7c2000027cd22eea603e936ddbad1a5bfc8b04;hp=60bf8015a84085804266e7e6436546d7bb9964c7;hpb=cb2df234aeab0961fd783ba4ed503a67f4c04afe;p=simgear.git

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index 60bf8015..d51e287a 100644
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -26,45 +26,69 @@ noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
 
 tcp_server_SOURCES = tcp_server.cxx
 
+if HAVE_FRAMEWORK_PLIB
+tcp_server_LDFLAGS = $(plib_FRAMEWORK)
+else
+tcp_server_PLIB_LIBS = -lplibnet -lplibul
+endif
+
 tcp_server_LDADD = \
-	$(top_builddir)/simgear/io/libsgio.a \
+	libsgio.a \
 	$(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
+	$(tcp_server_PLIB_LIBS) -lz \
+	$(network_LIBS) \
+	$(base_LIBS)
 
 tcp_client_SOURCES = tcp_client.cxx
 
+if HAVE_FRAMEWORK_PLIB
+tcp_client_LDFLAGS = $(plib_FRAMEWORK)
+else
+tcp_client_PLIB_LIBS = -lplibnet -lplibul
+endif
+
 tcp_client_LDADD = \
-	$(top_builddir)/simgear/io/libsgio.a \
+	libsgio.a \
 	$(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
+	$(tcp_client_PLIB_LIBS) -lz \
+	$(network_LIBS) \
+	$(base_LIBS)
 
 socktest_SOURCES = socktest.cxx
 
+if HAVE_FRAMEWORK_PLIB
+socktest_LDFLAGS = $(plib_FRAMEWORK)
+else
+socktest_PLIB_LIBS = -lplibnet -lplibul
+endif
+
 socktest_LDADD = \
-	$(top_builddir)/simgear/bucket/libsgbucket.a \
-        $(top_builddir)/simgear/io/libsgio.a \
+	libsgio.a \
 	$(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
+        $(socktest_PLIB_LIBS) -lz
+	$(network_LIBS) \
+	$(base_LIBS) 
 
 lowtest_SOURCES = lowtest.cxx
 
 lowtest_LDADD = \
-	$(top_builddir)/simgear/io/libsgio.a
+	libsgio.a \
+	$(top_builddir)/simgear/debug/libsgdebug.a \
+	$(top_builddir)/simgear/bucket/libsgbucket.a \
+	$(top_builddir)/simgear/misc/libsgmisc.a \
+	$(base_LIBS) -lz
 
 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
+	libsgio.a \
+	$(top_builddir)/simgear/debug/libsgdebug.a \
+	$(top_builddir)/simgear/bucket/libsgbucket.a \
+	$(top_builddir)/simgear/misc/libsgmisc.a \
+	$(base_LIBS) -lz