[pisa-src] r1171 - in trunk: community-operator/Makefile.am pairing/Makefile.am pisacd/Makefile.am pisand/Makefile.am pisasd/Makefile.am test/Makefile.am
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Thu, 15 Oct 2009 15:45:12 +0200
Author: biurrun
Date: Thu Oct 15 15:45:11 2009
New Revision: 1171
Log:
Simplify linker flag settings.
Modified:
trunk/community-operator/Makefile.am
trunk/pairing/Makefile.am
trunk/pisacd/Makefile.am
trunk/pisand/Makefile.am
trunk/pisasd/Makefile.am
trunk/test/Makefile.am
Modified: trunk/community-operator/Makefile.am
==============================================================================
--- trunk/community-operator/Makefile.am Thu Oct 15 15:36:59 2009
(r1170)
+++ trunk/community-operator/Makefile.am Thu Oct 15 15:45:11 2009
(r1171)
@@ -5,13 +5,12 @@
bin_PROGRAMS = co_server co_client
-LDADD =
-LDFLAGS = @LDFLAGS@
+LDFLAGS += -lconfig -lcrypto -lm
if PISA_FORCE_SHLIB
- LDADD += -L../libpisa -lpisa -lconfig
+ LDFLAGS += -L../libpisa -lpisa
else
- LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
+ LDFLAGS += @PISA_LIBPISA_LIB_STATIC@
endif
if PISA_WITH_HIPL
@@ -27,14 +26,12 @@
INCLUDES += -I@PISA_HIPL_SRCDIR@/pjproject/pjlib-util/include
endif
-co_server_LDADD = $(LDADD) -lm -lcrypto
if PISA_WITH_HIPL
-co_server_LDADD += @PISA_HIPL_SRCDIR@/libinet6/.libs/libinet6.a
+co_server_LDADD = @PISA_HIPL_SRCDIR@/libinet6/.libs/libinet6.a
co_server_LDADD += @PISA_HIPL_SRCDIR@/libhiptool/.libs/libhiptool.a
endif
co_server_SOURCES = co_server.c hipl.c
-co_client_LDADD = $(LDADD) -lm -lcrypto
co_client_SOURCES = co_client.c
include_HEADERS = hipl.h
Modified: trunk/pairing/Makefile.am
==============================================================================
--- trunk/pairing/Makefile.am Thu Oct 15 15:36:59 2009 (r1170)
+++ trunk/pairing/Makefile.am Thu Oct 15 15:45:11 2009 (r1171)
@@ -16,13 +16,12 @@
defaults/authorized_hosts.cfg defaults/known_relays.cfg
defaults/relay_config.cfg \
defaults/sha.txt defaults/user_config.cfg
-LDADD = -lcrypto
-LDFLAGS = @LDFLAGS@
+LDFLAGS += -lcrypto -lconfig -lm
if PISA_FORCE_SHLIB
- LDADD += -L../libpisa -lpisa -lconfig -lm
+ LDFLAGS += -L../libpisa -lpisa
else
- LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
+ LDFLAGS += @PISA_LIBPISA_LIB_STATIC@
endif
COMMON_SRCS = common.c common_headers.c libconfig_wrapper.c
Modified: trunk/pisacd/Makefile.am
==============================================================================
--- trunk/pisacd/Makefile.am Thu Oct 15 15:36:59 2009 (r1170)
+++ trunk/pisacd/Makefile.am Thu Oct 15 15:45:11 2009 (r1171)
@@ -11,20 +11,18 @@
EXTRA_DIST = pisacd.conf
sysconf_DATA = pisacd.conf
-LDADD =
-LDFLAGS = @LDFLAGS@
+LDFLAGS += -lconfig -lm
if PISA_FORCE_SHLIB
- LDADD += -L../libpisa -lpisa -lconfig
+ LDFLAGS += -L../libpisa -lpisa
else
- LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
+ LDFLAGS += @PISA_LIBPISA_LIB_STATIC@
endif
if PISA_PERFORMANCE
- LDADD += @PISA_PERFORMANCE_LIB_STATIC@
+ LDFLAGS += @PISA_PERFORMANCE_LIB_STATIC@
endif
-LDADD += -lm
pisacd_SOURCES = cdmain.c cdconf.c cdconmgr.c cdctx.c cdderegister.c \
cdheartbeat.c cdmsg.c cdpending.c cdregister.c cdservers.c \
cdtimeout.c cdtun.c pisacdconf.c cdconfhandlers.c
Modified: trunk/pisand/Makefile.am
==============================================================================
--- trunk/pisand/Makefile.am Thu Oct 15 15:36:59 2009 (r1170)
+++ trunk/pisand/Makefile.am Thu Oct 15 15:45:11 2009 (r1171)
@@ -10,17 +10,16 @@
EXTRA_DIST = pisand.conf
sysconf_DATA = pisand.conf
-LDADD = -lm
-LDFLAGS = @LDFLAGS@
+LDFLAGS += -lconfig -lm
if PISA_FORCE_SHLIB
- LDADD += -L../libpisa -lpisa -lconfig
+ LDFLAGS += -L../libpisa -lpisa
else
- LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
+ LDFLAGS += @PISA_LIBPISA_LIB_STATIC@
endif
if PISA_PERFORMANCE
- LDADD += @PISA_PERFORMANCE_LIB_STATIC@
+ LDFLAGS += @PISA_PERFORMANCE_LIB_STATIC@
endif
pisand_SOURCES = ndmain.c ndconf.c ndconmgr.c ndctx.c ndmsg.c neighbor.c
Modified: trunk/pisasd/Makefile.am
==============================================================================
--- trunk/pisasd/Makefile.am Thu Oct 15 15:36:59 2009 (r1170)
+++ trunk/pisasd/Makefile.am Thu Oct 15 15:45:11 2009 (r1171)
@@ -11,20 +11,18 @@
EXTRA_DIST = pisasd.conf authorized_hosts.conf users.conf
sysconf_DATA = pisasd.conf authorized_hosts.conf users.conf
-LDADD =
-LDFLAGS = @LDFLAGS@
+LDFLAGS += -lconfig -lm
if PISA_FORCE_SHLIB
- LDADD += -L../libpisa -lpisa -lconfig
+ LDFLAGS += -L../libpisa -lpisa
else
- LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
+ LDFLAGS += @PISA_LIBPISA_LIB_STATIC@
endif
if PISA_PERFORMANCE
- LDADD += @PISA_PERFORMANCE_LIB_STATIC@
+ LDFLAGS += @PISA_PERFORMANCE_LIB_STATIC@
endif
-LDADD += -lm
pisasd_SOURCES = sdmain.c sdclients.c sdconf.c sdctx.c sdderegister.c \
sdheartbeat.c sdmsg.c sdregister.c sdtun.c pisasdconf.c \
sdnat.c
Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am Thu Oct 15 15:36:59 2009 (r1170)
+++ trunk/test/Makefile.am Thu Oct 15 15:45:11 2009 (r1171)
@@ -40,13 +40,12 @@
EXTRA_DIST += packaging/rh-init.d-pisand
EXTRA_DIST += packaging/rh-init.d-pisasd
-LDADD = -lm
-LDFLAGS = @LDFLAGS@
+LDFLAGS += -lconfig -lm
if PISA_FORCE_SHLIB
- LDADD += -L../libpisa -lpisa -lconfig
+ LDFLAGS += -L../libpisa -lpisa
else
- LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
+ LDFLAGS += @PISA_LIBPISA_LIB_STATIC@
endif
checkhipd_SOURCES = checkhipd.c
@@ -74,7 +73,7 @@
if PISA_PREAUTH
hipl_SOURCES = hipl.c
-hipl_LDADD = -lm -lcrypto
+hipl_LDADD = -lcrypto
if PISA_WITH_HIPL
hipl_LDADD += @PISA_HIPL_SRCDIR@/libinet6/.libs/libinet6.a
Other related posts:
- » [pisa-src] r1171 - in trunk: community-operator/Makefile.am pairing/Makefile.am pisacd/Makefile.am pisand/Makefile.am pisasd/Makefile.am test/Makefile.am - Diego Biurrun
