Kaydet (Commit) 4d6a36dd authored tarafından David Tardon's avatar David Tardon

renaming dlls makes little sense on windows

üst 370e3b6d
...@@ -59,8 +59,12 @@ OOO_PATCH_FILES= \ ...@@ -59,8 +59,12 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.win32 \ $(TARFILE_NAME).patch.win32 \
$(TARFILE_NAME).patch.rindex \ $(TARFILE_NAME).patch.rindex \
raptor-aix.patch \ raptor-aix.patch \
$(TARFILE_NAME).entities.patch \ $(TARFILE_NAME).entities.patch
.IF "$(GUI)" == "UNX"
OOO_PATCH_FILES+= \
$(TARFILE_NAME).patch.bundled-soname $(TARFILE_NAME).patch.bundled-soname
.ENDIF
.IF "$(CROSS_COMPILING)"=="YES" .IF "$(CROSS_COMPILING)"=="YES"
OOO_PATCH_FILES += \ OOO_PATCH_FILES += \
......
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
$(am__append_20) $(am__append_21) $(am__append_22) \ $(am__append_20) $(am__append_21) $(am__append_22) \
$(am__append_23) $(am__append_24) $(am__append_25) \ $(am__append_23) $(am__append_24) $(am__append_25) \
$(am__append_26) $(am__append_26)
-libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo -libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@
+libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo -no-undefined +libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -no-undefined
libraptor_la_LIBADD = @LTLIBOBJS@ libraptor_la_LIBADD = @LTLIBOBJS@
EXTRA_DIST = \ EXTRA_DIST = \
raptor-config.in \ raptor-config.in \
...@@ -57,8 +57,12 @@ OOO_PATCH_FILES= \ ...@@ -57,8 +57,12 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.ooo_build \ $(TARFILE_NAME).patch.ooo_build \
$(TARFILE_NAME).patch.dmake \ $(TARFILE_NAME).patch.dmake \
$(TARFILE_NAME).patch.win32 \ $(TARFILE_NAME).patch.win32 \
rasqal-aix.patch \ rasqal-aix.patch
.IF "$(GUI)" == "UNX"
OOO_PATCH_FILES+= \
$(TARFILE_NAME).patch.bundled-soname $(TARFILE_NAME).patch.bundled-soname
.ENDIF
PATCH_FILES=$(OOO_PATCH_FILES) PATCH_FILES=$(OOO_PATCH_FILES)
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
rasqal_xsd_datatypes.c rasqal_decimal.c rasqal_datetime.c \ rasqal_xsd_datatypes.c rasqal_decimal.c rasqal_datetime.c \
rasqal_rowsource.c rasqal_sparql_xml.c $(am__append_3) \ rasqal_rowsource.c rasqal_sparql_xml.c $(am__append_3) \
$(am__append_4) $(am__append_5) $(am__append_4) $(am__append_5)
-librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -release lo -librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@
+librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -release lo -no-undefined +librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -no-undefined
librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS) librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS)
librasqal_la_DEPENDENCIES = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ librasqal_la_DEPENDENCIES = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@
EXTRA_DIST = \ EXTRA_DIST = \
...@@ -57,8 +57,12 @@ OOO_PATCH_FILES= \ ...@@ -57,8 +57,12 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.dmake \ $(TARFILE_NAME).patch.dmake \
$(TARFILE_NAME).patch.ooo_build \ $(TARFILE_NAME).patch.ooo_build \
$(TARFILE_NAME).patch.win32 \ $(TARFILE_NAME).patch.win32 \
redland-aix.patch \ redland-aix.patch
.IF "$(GUI)" == "UNX"
OOO_PATCH_FILES+= \
$(TARFILE_NAME).patch.bundled-soname $(TARFILE_NAME).patch.bundled-soname
.ENDIF
PATCH_FILES=$(OOO_PATCH_FILES) \ PATCH_FILES=$(OOO_PATCH_FILES) \
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
rdf_parser_raptor.c rdf_parser_raptor.c
EXTRA_DIST = redland.spec redland.spec.in mysql-v1.ttl mysql-v2.ttl EXTRA_DIST = redland.spec redland.spec.in mysql-v1.ttl mysql-v2.ttl
-librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -release lo \ -librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ \
+librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -release lo -no-undefined \ +librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -no-undefined \
@LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS) @LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
pkgdata_DATA = $(am__append_11) pkgdata_DATA = $(am__append_11)
...@@ -1573,9 +1573,9 @@ File gid_File_Lib_Raptor ...@@ -1573,9 +1573,9 @@ File gid_File_Lib_Raptor
#endif #endif
#else #else
#ifdef _gcc3 #ifdef _gcc3
Name = "libraptor-lo-1.dll"; Name = "libraptor-1.dll";
#else #else
Name = "raptor-lo.dll"; Name = "raptor.dll";
#endif #endif
#endif #endif
End End
...@@ -1592,9 +1592,9 @@ File gid_File_Lib_Rasqal ...@@ -1592,9 +1592,9 @@ File gid_File_Lib_Rasqal
#endif #endif
#else #else
#ifdef _gcc3 #ifdef _gcc3
Name = STRING(CONCAT3(librasqal-lo-,RASQAL_MAJOR,.dll)); Name = STRING(CONCAT3(librasqal-,RASQAL_MAJOR,.dll));
#else #else
Name = "rasqal-lo.dll"; Name = "rasqal.dll";
#endif #endif
#endif #endif
End End
...@@ -1611,9 +1611,9 @@ File gid_File_Lib_Rdf ...@@ -1611,9 +1611,9 @@ File gid_File_Lib_Rdf
#endif #endif
#else #else
#ifdef _gcc3 #ifdef _gcc3
Name = "librdf-lo-0.dll"; Name = "librdf-0.dll";
#else #else
Name = "librdf-lo.dll"; Name = "librdf.dll";
#endif #endif
#endif #endif
End End
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment