diff options
| -rw-r--r-- | redland/prj/d.lst | 15 | ||||
| -rw-r--r-- | redland/raptor/makefile.mk | 5 | ||||
| -rw-r--r-- | redland/rasqal/makefile.mk | 5 | ||||
| -rw-r--r-- | redland/redland/makefile.mk | 5 | ||||
| -rw-r--r-- | redland/redlandversion.mk | 6 |
5 files changed, 18 insertions, 18 deletions
diff --git a/redland/prj/d.lst b/redland/prj/d.lst index 1d82c72e7485..03bbd21147ea 100644 --- a/redland/prj/d.lst +++ b/redland/prj/d.lst @@ -1,7 +1,16 @@ ..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% -..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT% -..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% +..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so.1 +symlink: %_DEST%\lib%_EXT%\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so +..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.1.dylib +symlink: %_DEST%\lib%_EXT%\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.dylib +..\%__SRC%\lib\librasqal.so.0 %_DEST%\lib%_EXT%\librasqal.so.0 +symlink: %_DEST%\lib%_EXT%\librasqal.so.0 %_DEST%\lib%_EXT%\librasqal.so +..\%__SRC%\lib\librasqal.0.dylib %_DEST%\lib%_EXT%\librasqal.0.dylib +symlink: %_DEST%\lib%_EXT%\librasqal.0.dylib %_DEST%\lib%_EXT%\librasqal.dylib +..\%__SRC%\lib\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so.0 +symlink: %_DEST%\lib%_EXT%\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so +..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.0.dylib +symlink: %_DEST%\lib%_EXT%\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.dylib ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\lib*.a diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index f51c915030a4..12479a355f00 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -48,7 +48,6 @@ all: .INCLUDE : ../redlandversion.mk -#RAPTORVERSION=$(RAPTOR_MAJOR).$(RAPTOR_MINOR).$(RAPTOR_MICRO) RAPTORVERSION=$(RAPTOR_MAJOR).4.17 TARFILE_NAME=raptor-$(RAPTORVERSION) @@ -123,7 +122,7 @@ BUILD_DIR=$(CONFIGURE_DIR) OUT2INC+=src$/raptor.h .IF "$(OS)"=="MACOSX" -OUT2LIB+=src$/.libs$/libraptor*.dylib +OUT2LIB+=src$/.libs$/libraptor.1.dylib src$/.libs$/libraptor.dylib OUT2BIN+=src/raptor-config .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" @@ -138,7 +137,7 @@ OUT2BIN+=src/raptor-config # if we use dmake, this is done automagically .ELSE -OUT2LIB+=src$/.libs$/libraptor*.so* +OUT2LIB+=src$/.libs$/libraptor.so.1 src$/.libs$/libraptor.so OUT2BIN+=src/raptor-config .ENDIF diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 0a14095fedc4..e739671eef13 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -48,7 +48,6 @@ all: .INCLUDE : ../redlandversion.mk -#RASQALVERSION=$(RASQAL_MAJOR).$(RASQAL_MINOR).$(RASQAL_MICRO) RASQALVERSION=0.9.15 TARFILE_NAME=rasqal-$(RASQALVERSION) @@ -121,7 +120,7 @@ BUILD_DIR=$(CONFIGURE_DIR) OUT2INC+=src$/rasqal.h .IF "$(OS)"=="MACOSX" -OUT2LIB+=src$/.libs$/librasqal*.dylib +OUT2LIB+=src$/.libs$/librasqal.0.dylib src$/.libs$/librasqal.dylib OUT2BIN+=src/rasqal-config .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" @@ -136,7 +135,7 @@ OUT2BIN+=src/rasqal-config # if we use dmake, this is done automagically .ELSE -OUT2LIB+=src$/.libs$/librasqal*.so* +OUT2LIB+=src$/.libs$/librasqal.so.0 src$/.libs$/librasqal.so OUT2BIN+=src/rasqal-config .ENDIF diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 9508d66f530d..e8b473769821 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -48,7 +48,6 @@ all: .INCLUDE : ../redlandversion.mk -#REDLANDVERSION=$(REDLAND_MAJOR).$(REDLAND_MINOR).$(REDLAND_MICRO) REDLANDVERSION=1.0.7 TARFILE_NAME=redland-$(REDLANDVERSION) @@ -127,7 +126,7 @@ BUILD_DIR=$(CONFIGURE_DIR) OUT2INC+=librdf$/*.h .IF "$(OS)"=="MACOSX" -OUT2LIB+=librdf$/.libs$/librdf*.dylib +OUT2LIB+=librdf$/.libs$/librdf.0.dylib .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2LIB+=librdf$/.libs$/*.a @@ -140,7 +139,7 @@ OUT2BIN+=librdf$/.libs$/*.dll # if we use dmake, this is done automagically .ELSE -OUT2LIB+=librdf$/.libs$/librdf*.so* +OUT2LIB+=librdf$/.libs$/librdf.so.0 .ENDIF # --- Targets ------------------------------------------------------ diff --git a/redland/redlandversion.mk b/redland/redlandversion.mk index a95bdb82cbea..9b7f73665c9b 100644 --- a/redland/redlandversion.mk +++ b/redland/redlandversion.mk @@ -30,14 +30,8 @@ #************************************************************************* RAPTOR_MAJOR=1 -RAPTOR_MINOR=1 -RAPTOR_MICRO=0 # rasqal has no stable abi RASQAL_MAJOR=0 -RASQAL_MINOR=0 -RASQAL_MICRO=0 # redland has no stable abi REDLAND_MAJOR=0 -REDLAND_MINOR=0 -REDLAND_MICRO=0 |