[Liblas-commits] hg: use proper linkages for C API vs. C++ API

[liblas-commits at liblas.org]

changeset 3cd20fe36a22 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=3cd20fe36a22
summary: use proper linkages for C API vs. C++ API

diffstat:

 apps/Makefile.am      |  6 +++++-
 python/liblas/core.py |  4 ++--
 src/Makefile.am       |  8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diffs (79 lines):

diff -r 188b1435490f -r 3cd20fe36a22 apps/Makefile.am
--- a/apps/Makefile.am	Wed Mar 31 09:51:47 2010 -0500
+++ b/apps/Makefile.am	Wed Mar 31 21:38:18 2010 -0500
@@ -28,7 +28,9 @@
 las2txt_SOURCES = las2txt.c lascommon.c
 txt2las_SOURCES = txt2las.c
 ts2las_SOURCES = ts2las.cpp
+ts2las_LDADD = ../src/liblas.la
 lasindex_SOURCES = lasindex.cpp
+lasindex_LDADD = ../src/liblas.la
 
 bin_PROGRAMS = lasinfo las2las lasmerge las2txt txt2las ts2las 
 
@@ -41,6 +43,7 @@
 if SPATIALINDEX_IS_CONFIG
 AM_CPPFLAGS += -Igeoraster
 las2oci_SOURCES = las2oci.cpp oci_wrapper.cpp
+las2oci_LDADD = ../src/liblas.la
 bin_PROGRAMS += las2oci
 endif
 endif
@@ -50,7 +53,8 @@
 
 if GDAL_IS_CONFIG
 las2ogr_SOURCES = las2ogr.cpp
+las2ogr_LDADD = ../src/liblas.la
 bin_PROGRAMS += las2ogr
 endif
 
-LDADD = ../src/liblas.la
+LDADD = ../src/liblas_c.la
diff -r 188b1435490f -r 3cd20fe36a22 python/liblas/core.py
--- a/python/liblas/core.py	Wed Mar 31 09:51:47 2010 -0500
+++ b/python/liblas/core.py	Wed Mar 31 21:38:18 2010 -0500
@@ -132,10 +132,10 @@
 elif os.name == 'posix':
     platform = os.uname()[0]
     if platform == 'Darwin':
-        lib_name = 'liblas.dylib'
+        lib_name = 'liblas_c.dylib'
         free = ctypes.CDLL(find_library('libc')).free
     else:
-        lib_name = 'liblas.so'
+        lib_name = 'liblas_c.so'
         free = ctypes.CDLL(find_library('libc.so.6')).free
     las = ctypes.CDLL(lib_name)
 else:
diff -r 188b1435490f -r 3cd20fe36a22 src/Makefile.am
--- a/src/Makefile.am	Wed Mar 31 09:51:47 2010 -0500
+++ b/src/Makefile.am	Wed Mar 31 21:38:18 2010 -0500
@@ -23,7 +23,7 @@
 
 AM_CPPFLAGS = -I../include/liblas/capi -I../include $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) $(SPATIALINDEX_CPPFLAGS) $(OCI_CPPFLAGS) $(BOOST_FLAGS)
 
-lib_LTLIBRARIES = liblas.la
+lib_LTLIBRARIES = liblas.la liblas_c.la
 
 liblas_la_SOURCES = \
 	lasclassification.cpp \
@@ -34,7 +34,6 @@
 	lasvariablerecord.cpp \
 	lasreader.cpp \
 	laswriter.cpp \
-	las_c_api.cpp \
 	lasspatialreference.cpp \
 	lasformat.cpp \
 	detail/reader/reader.cpp \
@@ -55,8 +54,9 @@
 						index/visitor.cpp \
 						index/query.cpp \
 						index/storage.cpp
-
-
 endif
 
+liblas_c_la_SOURCES = las_c_api.cpp
+liblas_c_la_LDFLAGS = -version-info 1:0:0 -lstdc++
+liblas_c_la_LIBADD = liblas.la
 liblas_la_LDFLAGS = -version-info 1:0:0