Author: af
Date: Wed Jun 27 09:26:26 2012
New Revision: 1354384
URL: http://svn.apache.org/viewvc?rev=1354384&view=rev
Log:
#i118906# Fixed dependencies between scp2 and apr-util and apr.
Modified:
incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk
incubator/ooo/trunk/ext_libraries/apr-util/prj/build.lst
incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst
incubator/ooo/trunk/main/scp2/prj/build.lst
Modified: incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk?rev=1354384&r1=1354383&r2=1354384&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk Wed Jun 27 09:26:26
2012
@@ -27,7 +27,7 @@ TARGET=aprutil
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
-.INCLUDE : aprutil_version.mk
+.INCLUDE : aprutil_version.mk
# --- Files --------------------------------------------------------
Modified: incubator/ooo/trunk/ext_libraries/apr-util/prj/build.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr-util/prj/build.lst?rev=1354384&r1=1354383&r2=1354384&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/prj/build.lst (original)
+++ incubator/ooo/trunk/ext_libraries/apr-util/prj/build.lst Wed Jun 27
09:26:26 2012
@@ -1,5 +1,5 @@
# adding dependence on sal due to used $gb_STDLIBS which contain uwinapi for
Windows
# here a corresponding cleanup is needed as apr-util should not have a
dependence on uwinapi
-apru apr-util : sal apr EXPAT:expat NULL
+apru apr-util : sal APR:apr EXPAT:expat NULL
apru apr-util usr1 - all apru_mkout NULL
apru apr-util nmake - all apru_apr-util NULL
Modified: incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst?rev=1354384&r1=1354383&r2=1354384&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst (original)
+++ incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst Wed Jun 27 09:26:26
2012
@@ -10,7 +10,6 @@ mkdir: %_DEST%\inc%_EXT%\apr-util
..\%__SRC%\lib\libaprutil-1.so.*.* %_DEST%\lib%_EXT%
..\%__SRC%\lib\libaprutil-1.so.* %_DEST%\lib%_EXT%
linklib: libaprutil-1.so.*.*
-linklib: libaprutil-1.so.*
# Mac
..\%__SRC%\lib\libaprutil-1.*dylib %_DEST%\lib%_EXT%
Modified: incubator/ooo/trunk/main/scp2/prj/build.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/prj/build.lst?rev=1354384&r1=1354383&r2=1354384&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/prj/build.lst (original)
+++ incubator/ooo/trunk/main/scp2/prj/build.lst Wed Jun 27 09:26:26 2012
@@ -1,4 +1,4 @@
-cp scp2 : L10N:l10n i18npool setup_native l10ntools PYTHON:python
ICU:icu REDLAND:redland LIBXSLT:libxslt APR:apr APR_UTIL:apr-util SERF:serf NULL
+cp scp2 : L10N:l10n i18npool setup_native l10ntools PYTHON:python
ICU:icu REDLAND:redland LIBXSLT:libxslt APR:apr apr-util SERF:serf NULL
cp scp2 usr1 - all cp_mkout NULL
cp scp2\macros nmake - all cp_langmacros NULL
cp scp2\source\templates nmake - all cp_langtemplates NULL
