ooo.lst: use more variables

Change-Id: I478996c43d069648241d8c5cff64ff78b9230154

config_host.mk.in

@@ -88,6 +88,7 @@ export CXX=@CXX@
 export CXX_FOR_BUILD=@CXX_FOR_BUILD@
 export CXX_X64_BINARY=@CXX_X64_BINARY@
 export DATADIR=@DATADIR@
+export DBGHELP_DLL=@DBGHELP_DLL@
 export DBUSMENUGTK_CFLAGS=@DBUSMENUGTK_CFLAGS@
 export DBUSMENUGTK_LIBS=@DBUSMENUGTK_LIBS@
 export DBUS_CFLAGS=@DBUS_CFLAGS@
@@ -616,6 +617,7 @@ export TOMCAT_TARBALL=@TOMCAT_TARBALL@
 export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@
 export SYSTEM_UCPP=@SYSTEM_UCPP@
 export UNIXWRAPPERNAME=@UNIXWRAPPERNAME@
+export UNOWINREG_DLL=@UNOWINREG_DLL@
 export UPD=@UPD@
 export USE_FT_EMBOLDEN=@USE_FT_EMBOLDEN@
 export use_shl_version=@use_shl_version@

configure.in

@@ -3302,8 +3302,10 @@ AC_SUBST(SHOWINCLUDES_PREFIX)
 #
 if test "$_os" == "WINNT"; then
     DBGHELP_DLL="13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll"
+    UNOWINREG_DLL="185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 fi
 AC_SUBST(DBGHELP_DLL)
+AC_SUBST(UNOWINREG_DLL)
 
 #
 # prefix C with ccache if needed

download

@@ -214,8 +214,8 @@ if [ "$COM" = "MSC" -a -n "$md5sum" ]; then
     # This can be run only on Windows itself (Cygwin)
     TMPUNPACK=`cygpath -d $TARFILE_LOCATION/tmp`
     chmod a+w $TARFILE_LOCATION/tmp
-    if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll ]; then
-	    cp $TARFILE_LOCATION/13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll ./external/dbghelp/dbghelp.dll
+    if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/$DBGHELP_DLL ]; then
+	    cp $TARFILE_LOCATION/$DBGHELP_DLL ./external/dbghelp/dbghelp.dll
 	fi
     if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/dbg_x86.msi ]; then
         msiexec /a `cygpath -d $TARFILE_LOCATION/dbg_x86.msi` /qn TARGETDIR=$TMPUNPACK SHORTFILENAMES=1

odk/source/unowinreg/win/makefile.mk

@@ -68,7 +68,7 @@ $(BIN)$/unowinreg.dll : unowinreg.cxx
 
 .ELSE
 
-$(BIN)$/unowinreg.dll : $(TARFILE_LOCATION)/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+$(BIN)$/unowinreg.dll : $(TARFILE_LOCATION)/$(UNOWINREG_DLL)
     @@-rm -f $@
     $(GNUCOPY) $< $@
 

ooo.lst.in

@@ -19,7 +19,7 @@ c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 @FONT_GENTIUM_TARBALL@
 @FONT_DEJAVU_TARBALL@
 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+@JFREEREPORT_SAC_TARBALL@
 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 @APACHE_COMMONS_LOGGING_TARBALL@
 48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
@@ -29,14 +29,14 @@ f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
-798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+@RHINO_TARBALL@
 3fa4d5236f2a36ca5c3af6715e837691-curl-7.26.0.tar.gz
 8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
 fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz
 @MOZ_TARBALL@
 a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
 @XSLTML_TARBALL@
-ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+@SAXON_TARBALL@
 @APACHE_COMMONS_CODEC_TARBALL@
 bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
 c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
@@ -46,7 +46,7 @@ d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
 e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
 e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
 e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
-ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
+@BSH_TARBALL@
 @VIGRA_TARBALL@
 dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
 fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
@@ -54,16 +54,16 @@ fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2
 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
-3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+@JFREEREPORT_LIBFORMULA_TARBALL@
+@JFREEREPORT_LIBFONTS_TARBALL@
+@JFREEREPORT_LIBREPOSITORY_TARBALL@
+@JFREEREPORT_LIBLOADER_TARBALL@
+@JFREEREPORT_LIBXML_TARBALL@
+@JFREEREPORT_FLUTE_TARBALL@
+@JFREEREPORT_LIBLAYOUT_TARBALL@
+@JFREEREPORT_LIBBASE_TARBALL@
+@JFREEREPORT_LIBSERIALIZER_TARBALL@
+@JFREEREPORT_FLOW_ENGINE_TARBALL@
 @NEON_TARBALL@
 3dd55b952826d2b32f51308f2f91aa89-gettext-0.18.1.1.tar.gz
 9f6e85e1e38490c3956f4415bcd33e6e-glib-2.28.1.tar.gz
@@ -78,7 +78,7 @@ a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
+@LANGUAGETOOL_TARBALL@
 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
 a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
 @WPG_TARBALL@
@@ -100,7 +100,7 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
 @FONTCONFIG_TARBALL@
 @ORCUS_TARBALL@
 http://dev-www.libreoffice.org/extern
-185d60944ea767075d27247c3162b3bc-unowinreg.dll
+@UNOWINREG_DLL@
 @DBGHELP_DLL@
 http://ooo.itc.hu/oxygenoffice/download/libreoffice/
 @OOOP_GALLERY_PACK@