diff options
author | David Tardon <dtardon@redhat.com> | 2012-04-13 16:24:16 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-04-13 16:27:18 +0200 |
commit | 4d6a36dd0c3c0f61ee8e80f748dd6d8ec2cebbd5 (patch) | |
tree | 619cdc25faa1a4e0dae31a3ff80ed4af9834b028 /redland/raptor | |
parent | 370e3b6d6031aba675b66ed7495505f605c41779 (diff) |
renaming dlls makes little sense on windows
Diffstat (limited to 'redland/raptor')
-rw-r--r-- | redland/raptor/makefile.mk | 6 | ||||
-rw-r--r-- | redland/raptor/raptor-1.4.18.patch.mingw | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 3d25291bcb75..0229bf853e83 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -59,8 +59,12 @@ OOO_PATCH_FILES= \ $(TARFILE_NAME).patch.win32 \ $(TARFILE_NAME).patch.rindex \ raptor-aix.patch \ - $(TARFILE_NAME).entities.patch \ + $(TARFILE_NAME).entities.patch + +.IF "$(GUI)" == "UNX" +OOO_PATCH_FILES+= \ $(TARFILE_NAME).patch.bundled-soname +.ENDIF .IF "$(CROSS_COMPILING)"=="YES" OOO_PATCH_FILES += \ diff --git a/redland/raptor/raptor-1.4.18.patch.mingw b/redland/raptor/raptor-1.4.18.patch.mingw index b671e4db141e..bb9f6f4eff48 100644 --- a/redland/raptor/raptor-1.4.18.patch.mingw +++ b/redland/raptor/raptor-1.4.18.patch.mingw @@ -34,8 +34,8 @@ $(am__append_20) $(am__append_21) $(am__append_22) \ $(am__append_23) $(am__append_24) $(am__append_25) \ $(am__append_26) --libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo -+libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo -no-undefined +-libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ ++libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -no-undefined libraptor_la_LIBADD = @LTLIBOBJS@ EXTRA_DIST = \ raptor-config.in \ |