Changeset 29

Show
Ignore:
Timestamp:
11/28/07 17:55:06
Author:
hobu
Message:

use .'s to separate version info and don't do -no-undefined

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • spatialindex/trunk/Makefile.am

    r28 r29  
    1414        src/tools/tools/libtools.la 
    1515 
    16 libspatialindex_la_LDFLAGS = -no-undefined -version-info 1:0:1 
     16libspatialindex_la_LDFLAGS = -release 1.0.1  

  • spatialindex/trunk/Makefile.in

    r26 r29  
    6161am_libspatialindex_la_OBJECTS = 
    6262libspatialindex_la_OBJECTS = $(am_libspatialindex_la_OBJECTS) 
     63libspatialindex_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ 
     64        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ 
     65        $(libspatialindex_la_LDFLAGS) $(LDFLAGS) -o $@ 
    6366DEFAULT_INCLUDES = -I.@am__isrc@ 
    6467COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 
    …… 
    204207lib_LTLIBRARIES = libspatialindex.la 
    205208libspatialindex_la_SOURCES =  
    206 libspatialindex_la_LIBADD = src/spatialindex/liblibrary.la src/storagemanager/libstoragemanager.la src/rtree/librtree.la src/mvrtree/libmvrtree.la src/tprtree/libtprtree.la src/tools/geometry/libgeometry.la src/tools/tools/libtools.la 
     209libspatialindex_la_LIBADD = \ 
     210        src/spatialindex/liblibrary.la \ 
     211        src/storagemanager/libstoragemanager.la \ 
     212        src/rtree/librtree.la \ 
     213        src/mvrtree/libmvrtree.la \ 
     214        src/tprtree/libtprtree.la \ 
     215        src/tools/geometry/libgeometry.la \ 
     216        src/tools/tools/libtools.la 
     217 
     218libspatialindex_la_LDFLAGS = -release 1.0.1  
    207219all: all-recursive 
    208220 
    …… 
    269281        done 
    270282libspatialindex.la: $(libspatialindex_la_OBJECTS) $(libspatialindex_la_DEPENDENCIES)  
    271         $(LINK) -rpath $(libdir) $(libspatialindex_la_OBJECTS) $(libspatialindex_la_LIBADD) $(LIBS) 
     283        $(libspatialindex_la_LINK) -rpath $(libdir) $(libspatialindex_la_OBJECTS) $(libspatialindex_la_LIBADD) $(LIBS) 
    272284 
    273285mostlyclean-compile: