From c7bfa8812b79c41b826793862373809950ddb2d9 Mon Sep 17 00:00:00 2001
From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 13 Jul 2010 16:07:53 +0200
Subject: [PATCH] src/Makefile.am: Use "LDADD" for applications, "LIBADD" for
 the library.

Use "LDFLAGS" only for "-version-info".
---
 src/Makefile.am | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index d411209..bc35a78 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,23 +21,24 @@ lib_LTLIBRARIES = liboping.la
 #   set age to 0. 
 #
 # <http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html>
-liboping_la_LDFLAGS = -version-info @LIBOPING_CURRENT@:@LIBOPING_REVISION@:@LIBOPING_AGE@
+liboping_la_SOURCES = oping.h liboping.c
+
+liboping_la_CPPFLAGS = $(AM_CPPFLAGS)
+liboping_la_LDFLAGS = $(AM_LDFLAGS) -version-info @LIBOPING_CURRENT@:@LIBOPING_REVISION@:@LIBOPING_AGE@
+liboping_la_LIBADD =
 if BUILD_WITH_LIBSOCKET
-liboping_la_LDFLAGS += -lsocket
+liboping_la_LIBADD += -lsocket
 endif
 if BUILD_WITH_LIBXNET
-liboping_la_LDFLAGS += -lxnet
+liboping_la_LIBADD += -lxnet
 endif
 
-liboping_la_SOURCES = oping.h liboping.c
-
 bin_PROGRAMS = oping
 
 oping_SOURCES = oping.c
-oping_LDADD = liboping.la
-oping_LDFLAGS = -lm
+oping_LDADD = liboping.la -lm
 if BUILD_WITH_LIBRT
-oping_LDFLAGS += -lrt
+oping_LDADD += -lrt
 endif
 
 if BUILD_WITH_LIBNCURSES
@@ -45,9 +46,8 @@ bin_PROGRAMS += noping
 
 noping_SOURCES = oping.c
 noping_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_NCURSES=1
-noping_LDADD = liboping.la
-noping_LDFLAGS = -lm -lncurses
+noping_LDADD = liboping.la -lm -lncurses
 if BUILD_WITH_LIBRT
-noping_LDFLAGS += -lrt
+noping_LDADD += -lrt
 endif
 endif # BUILD_WITH_LIBNCURSES
-- 
2.11.0