[pisa-src] r1164 - in trunk: community-operator/Makefile.am configure.ac 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 14:44:26 +0200
Author: biurrun
Date: Thu Oct 15 14:44:26 2009
New Revision: 1164
Log:
Remove previous failed attempt to clean up linker flag settings.
Modified:
trunk/community-operator/Makefile.am
trunk/configure.ac
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 14:24:50 2009
(r1163)
+++ trunk/community-operator/Makefile.am Thu Oct 15 14:44:26 2009
(r1164)
@@ -5,7 +5,18 @@
bin_PROGRAMS = co_server co_client
-LDFLAGS += -L../libpisa -lpisa -lm
+LDADD =
+LDFLAGS = @LDFLAGS@
+
+if PISA_FORCE_SHLIB
+ LDADD += -lpisa -lconfig
+else
+if PISA_FORCE_SHLIBCONFIG
+ LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
+else
+ LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@
+endif
+endif
if PISA_WITH_HIPL
# Things needed for compiling hipl-related codes
@@ -20,11 +31,14 @@
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/configure.ac
==============================================================================
--- trunk/configure.ac Thu Oct 15 14:24:50 2009 (r1163)
+++ trunk/configure.ac Thu Oct 15 14:44:26 2009 (r1164)
@@ -164,6 +164,11 @@
AC_SUBST(PISA_LIBPISA_LIB_STATIC, "$PISA_LIBPISA_LIB/libpisa.a")
AC_SUBST(PISA_LIBPISA_LIB_DYNAMIC, "$PISA_LIBPISA_LIB/libpisa.so")
+AC_SUBST(PISA_LIBCONFIG, "/usr/lib")
+AC_SUBST(PISA_LIBCONFIG_LIB, "$PISA_LIBCONFIG")
+AC_SUBST(PISA_LIBCONFIG_LIB_STATIC, "$PISA_LIBCONFIG_LIB/libconfig.a")
+AC_SUBST(PISA_LIBCONFIG_LIB_DYNAMIC, "$PISA_LIBCONFIG_LIB/libconfig.so")
+
AC_SUBST(PISA_PISACD, "$TOPSRC/pisacd")
AC_SUBST(PISA_PISACD_INCLUDES, "$PISA_PISACD")
AC_SUBST(PISA_PISAND, "$TOPSRC/pisand")
Modified: trunk/pairing/Makefile.am
==============================================================================
--- trunk/pairing/Makefile.am Thu Oct 15 14:24:50 2009 (r1163)
+++ trunk/pairing/Makefile.am Thu Oct 15 14:44:26 2009 (r1164)
@@ -16,8 +16,19 @@
defaults/authorized_hosts.cfg defaults/known_relays.cfg
defaults/relay_config.cfg \
defaults/sha.txt defaults/user_config.cfg
-LDFLAGS += -L../libpisa -lpisa -lcrypto -lconfig -lm
+LDADD = -lcrypto
+LDFLAGS = @LDFLAGS@
+if PISA_FORCE_SHLIB
+ LDADD += -lpisa -lconfig -lm
+else
+if PISA_FORCE_SHLIBCONFIG
+ LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
+else
+ LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@
+endif
+endif
+
COMMON_SRCS = common.c common_headers.c libconfig_wrapper.c
ACCEPT_SEND_SRCS = hash.c packet_handler.c $(COMMON_SRCS)
Modified: trunk/pisacd/Makefile.am
==============================================================================
--- trunk/pisacd/Makefile.am Thu Oct 15 14:24:50 2009 (r1163)
+++ trunk/pisacd/Makefile.am Thu Oct 15 14:44:26 2009 (r1164)
@@ -11,8 +11,24 @@
EXTRA_DIST = pisacd.conf
sysconf_DATA = pisacd.conf
-LDFLAGS = @LDFLAGS@ -L../libpisa -lpisa -lconfig -lm
+LDADD =
+LDFLAGS = @LDFLAGS@
+if PISA_FORCE_SHLIB
+ LDADD += -lpisa -lconfig
+else
+if PISA_FORCE_SHLIBCONFIG
+ LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
+else
+ LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@
+endif
+endif
+
+if PISA_PERFORMANCE
+ LDADD += @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 14:24:50 2009 (r1163)
+++ trunk/pisand/Makefile.am Thu Oct 15 14:44:26 2009 (r1164)
@@ -10,7 +10,22 @@
EXTRA_DIST = pisand.conf
sysconf_DATA = pisand.conf
-LDFLAGS += -L../libpisa -lpisa -lconfig -lm
+LDADD = -lm
+LDFLAGS = @LDFLAGS@
+
+if PISA_FORCE_SHLIB
+ LDADD += -lpisa -lconfig
+else
+if PISA_FORCE_SHLIBCONFIG
+ LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
+else
+ LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@
+endif
+endif
+
+if PISA_PERFORMANCE
+ LDADD += @PISA_PERFORMANCE_LIB_STATIC@
+endif
pisand_SOURCES = ndmain.c ndconf.c ndconmgr.c ndctx.c ndmsg.c neighbor.c
include_HEADERS = ndconf.h ndconmgr.h ndctx.h ndmsg.h neighbor.h
Modified: trunk/pisasd/Makefile.am
==============================================================================
--- trunk/pisasd/Makefile.am Thu Oct 15 14:24:50 2009 (r1163)
+++ trunk/pisasd/Makefile.am Thu Oct 15 14:44:26 2009 (r1164)
@@ -11,8 +11,24 @@
EXTRA_DIST = pisasd.conf authorized_hosts.conf users.conf
sysconf_DATA = pisasd.conf authorized_hosts.conf users.conf
-LDFLAGS += -L../libpisa -lpisa -lconfig -lm
+LDADD =
+LDFLAGS = @LDFLAGS@
+if PISA_FORCE_SHLIB
+ LDADD += -lpisa -lconfig
+else
+if PISA_FORCE_SHLIBCONFIG
+ LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
+else
+ LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@
+endif
+endif
+
+if PISA_PERFORMANCE
+ LDADD += @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 14:24:50 2009 (r1163)
+++ trunk/test/Makefile.am Thu Oct 15 14:44:26 2009 (r1164)
@@ -40,7 +40,18 @@
EXTRA_DIST += packaging/rh-init.d-pisand
EXTRA_DIST += packaging/rh-init.d-pisasd
-LDFLAGS += -L../libpisa -lpisa -lconfig -lm
+LDADD = -lm
+LDFLAGS = @LDFLAGS@
+
+if PISA_FORCE_SHLIB
+ LDADD += -lpisa -lconfig
+else
+if PISA_FORCE_SHLIBCONFIG
+ LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
+else
+ LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@
+endif
+endif
checkhipd_SOURCES = checkhipd.c
getns_SOURCES = getns.c
@@ -67,7 +78,7 @@
if PISA_PREAUTH
hipl_SOURCES = hipl.c
-hipl_LDADD = -lcrypto
+hipl_LDADD = -lm -lcrypto
if PISA_WITH_HIPL
hipl_LDADD += @PISA_HIPL_SRCDIR@/libinet6/.libs/libinet6.a
Other related posts:
- » [pisa-src] r1164 - in trunk: community-operator/Makefile.am configure.ac pairing/Makefile.am pisacd/Makefile.am pisand/Makefile.am pisasd/Makefile.am test/Makefile.am - Diego Biurrun
