[pisa-src] r1163 - 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 14:24:50 +0200
Author: biurrun
Date: Thu Oct 15 14:24:50 2009
New Revision: 1163
Log:
Add libpisa directory to the linker search path.
This fixes linking again. It was previously broken because a stray
installation of libpisa on power was masking linker failures.
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 14:06:38 2009
(r1162)
+++ trunk/community-operator/Makefile.am Thu Oct 15 14:24:50 2009
(r1163)
@@ -5,7 +5,7 @@
bin_PROGRAMS = co_server co_client
-LDFLAGS += -lpisa -lm
+LDFLAGS += -L../libpisa -lpisa -lm
if PISA_WITH_HIPL
# Things needed for compiling hipl-related codes
Modified: trunk/pairing/Makefile.am
==============================================================================
--- trunk/pairing/Makefile.am Thu Oct 15 14:06:38 2009 (r1162)
+++ trunk/pairing/Makefile.am Thu Oct 15 14:24:50 2009 (r1163)
@@ -16,7 +16,7 @@
defaults/authorized_hosts.cfg defaults/known_relays.cfg
defaults/relay_config.cfg \
defaults/sha.txt defaults/user_config.cfg
-LDFLAGS += -lcrypto -lpisa -lconfig -lm
+LDFLAGS += -L../libpisa -lpisa -lcrypto -lconfig -lm
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:06:38 2009 (r1162)
+++ trunk/pisacd/Makefile.am Thu Oct 15 14:24:50 2009 (r1163)
@@ -11,7 +11,7 @@
EXTRA_DIST = pisacd.conf
sysconf_DATA = pisacd.conf
-LDFLAGS = @LDFLAGS@ -lpisa -lconfig -lm
+LDFLAGS = @LDFLAGS@ -L../libpisa -lpisa -lconfig -lm
pisacd_SOURCES = cdmain.c cdconf.c cdconmgr.c cdctx.c cdderegister.c \
cdheartbeat.c cdmsg.c cdpending.c cdregister.c cdservers.c \
Modified: trunk/pisand/Makefile.am
==============================================================================
--- trunk/pisand/Makefile.am Thu Oct 15 14:06:38 2009 (r1162)
+++ trunk/pisand/Makefile.am Thu Oct 15 14:24:50 2009 (r1163)
@@ -10,7 +10,7 @@
EXTRA_DIST = pisand.conf
sysconf_DATA = pisand.conf
-LDFLAGS += -lpisa -lconfig -lm
+LDFLAGS += -L../libpisa -lpisa -lconfig -lm
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:06:38 2009 (r1162)
+++ trunk/pisasd/Makefile.am Thu Oct 15 14:24:50 2009 (r1163)
@@ -11,7 +11,7 @@
EXTRA_DIST = pisasd.conf authorized_hosts.conf users.conf
sysconf_DATA = pisasd.conf authorized_hosts.conf users.conf
-LDFLAGS += -lpisa -lconfig -lm
+LDFLAGS += -L../libpisa -lpisa -lconfig -lm
pisasd_SOURCES = sdmain.c sdclients.c sdconf.c sdctx.c sdderegister.c \
sdheartbeat.c sdmsg.c sdregister.c sdtun.c pisasdconf.c \
Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am Thu Oct 15 14:06:38 2009 (r1162)
+++ trunk/test/Makefile.am Thu Oct 15 14:24:50 2009 (r1163)
@@ -40,7 +40,7 @@
EXTRA_DIST += packaging/rh-init.d-pisand
EXTRA_DIST += packaging/rh-init.d-pisasd
-LDFLAGS += -lpisa -lconfig -lm
+LDFLAGS += -L../libpisa -lpisa -lconfig -lm
checkhipd_SOURCES = checkhipd.c
getns_SOURCES = getns.c
Other related posts:
- » [pisa-src] r1163 - in trunk: community-operator/Makefile.am pairing/Makefile.am pisacd/Makefile.am pisand/Makefile.am pisasd/Makefile.am test/Makefile.am - Diego Biurrun
