[pisa-src] r1168 - 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:12:24 +0200

Author: biurrun
Date: Thu Oct 15 15:12:23 2009
New Revision: 1168

Log:
Add libpisa directory to the linker search path.
This fixes compilation with --enable-force-shlib.

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:07:24 2009        
(r1167)
+++ trunk/community-operator/Makefile.am        Thu Oct 15 15:12:23 2009        
(r1168)
@@ -9,7 +9,7 @@
 LDFLAGS = @LDFLAGS@
 
 if PISA_FORCE_SHLIB
-  LDADD += -lpisa -lconfig
+  LDADD += -L../libpisa -lpisa -lconfig
 else
   LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
 endif

Modified: trunk/pairing/Makefile.am
==============================================================================
--- trunk/pairing/Makefile.am   Thu Oct 15 15:07:24 2009        (r1167)
+++ trunk/pairing/Makefile.am   Thu Oct 15 15:12:23 2009        (r1168)
@@ -20,7 +20,7 @@
 LDFLAGS = @LDFLAGS@
 
 if PISA_FORCE_SHLIB
-  LDADD += -lpisa -lconfig -lm
+  LDADD += -L../libpisa -lpisa -lconfig -lm
 else
   LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
 endif

Modified: trunk/pisacd/Makefile.am
==============================================================================
--- trunk/pisacd/Makefile.am    Thu Oct 15 15:07:24 2009        (r1167)
+++ trunk/pisacd/Makefile.am    Thu Oct 15 15:12:23 2009        (r1168)
@@ -15,7 +15,7 @@
 LDFLAGS = @LDFLAGS@
 
 if PISA_FORCE_SHLIB
-  LDADD += -lpisa -lconfig
+  LDADD += -L../libpisa -lpisa -lconfig
 else
   LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
 endif

Modified: trunk/pisand/Makefile.am
==============================================================================
--- trunk/pisand/Makefile.am    Thu Oct 15 15:07:24 2009        (r1167)
+++ trunk/pisand/Makefile.am    Thu Oct 15 15:12:23 2009        (r1168)
@@ -14,7 +14,7 @@
 LDFLAGS = @LDFLAGS@
 
 if PISA_FORCE_SHLIB
-  LDADD += -lpisa -lconfig
+  LDADD += -L../libpisa -lpisa -lconfig
 else
   LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
 endif

Modified: trunk/pisasd/Makefile.am
==============================================================================
--- trunk/pisasd/Makefile.am    Thu Oct 15 15:07:24 2009        (r1167)
+++ trunk/pisasd/Makefile.am    Thu Oct 15 15:12:23 2009        (r1168)
@@ -15,7 +15,7 @@
 LDFLAGS = @LDFLAGS@
 
 if PISA_FORCE_SHLIB
-  LDADD += -lpisa -lconfig
+  LDADD += -L../libpisa -lpisa -lconfig
 else
   LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
 endif

Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am      Thu Oct 15 15:07:24 2009        (r1167)
+++ trunk/test/Makefile.am      Thu Oct 15 15:12:23 2009        (r1168)
@@ -44,7 +44,7 @@
 LDFLAGS = @LDFLAGS@
 
 if PISA_FORCE_SHLIB
-  LDADD += -lpisa -lconfig
+  LDADD += -L../libpisa -lpisa -lconfig
 else
   LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
 endif

Other related posts:

  • » [pisa-src] r1168 - in trunk: community-operator/Makefile.am pairing/Makefile.am pisacd/Makefile.am pisand/Makefile.am pisasd/Makefile.am test/Makefile.am - Diego Biurrun