diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-01-06 21:09:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-01-06 21:09:13 +0100 |
| commit | 23dd856d3c70a63dd47ae2a09a75833267296432 (patch) | |
| tree | 3ed426d983d5a46cc48dc1ee873ac5627b867f05 /RepositoryFixes.mk | |
| parent | 5106b38a9cc64677b3fa4a0aea7450560775e78e (diff) | |
| parent | 7e5b321535977ccddc6703c0ad4e5d25af797654 (diff) | |
Merge branch 'feature/gbuild_extensions'
Conflicts:
extensions/source/ole/servreg.cxx
extensions/source/plugin/util/makefile.mk
postprocess/packcomponents/makefile.mk
postprocess/prj/build.lst
tail_build/prj/build.lst
Diffstat (limited to 'RepositoryFixes.mk')
| -rw-r--r-- | RepositoryFixes.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index cb80f454f036..bcbbdc31b12f 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -61,6 +61,8 @@ gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst curl:icurl%,curl:libcurl%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst npsoplugin:inpsoplugin%,npsoplugin:npsoplugin%,$(gb_Library_FILENAMES)) gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES)) |