From 4b69bc10753f1a14b358b4669cfea77da6448ef8 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 7 Jul 2009 17:10:18 +0200 Subject: Split build: build.lst updates so that everything builds. * afms/prj/build.lst: * agg/prj/build.lst: * apple_remote/prj/build.lst: * beanshell/prj/build.lst: * cppunit/prj/build.lst: * epm/prj/build.lst: * external/prj/build.lst: * fondu/prj/build.lst: * hsqldb/prj/build.lst: * hyphen/prj/build.lst: * icc/prj/build.lst: * libegg/prj/build.lst: * libtextcat/prj/build.lst: * libwpd/prj/build.lst: * libxmlsec/prj/build.lst: * lpsolve/prj/build.lst: * lucene/prj/build.lst: * msfontextract/prj/build.lst: * np_sdk/prj/build.lst: * openssl/prj/build.lst: * redland/prj/build.lst: * redland/prj/d.lst: * redland/raptor/makefile.mk: * redland/rasqal/makefile.mk: * redland/redland/makefile.mk: * redland/redlandversion.mk: Moved to solenv/inc. * rhino/prj/build.lst: * sane/prj/build.lst: * twain/prj/build.lst: * unixODBC/prj/build.lst: * vigra/prj/build.lst: * x11_extensions/prj/build.lst: * xsltml/prj/build.lst: --- afms/prj/build.lst | 2 +- agg/prj/build.lst | 2 +- apple_remote/prj/build.lst | 2 +- beanshell/prj/build.lst | 2 +- cppunit/prj/build.lst | 2 +- epm/prj/build.lst | 2 +- external/prj/build.lst | 2 +- fondu/prj/build.lst | 2 +- hsqldb/prj/build.lst | 2 +- hyphen/prj/build.lst | 2 +- icc/prj/build.lst | 2 +- libegg/prj/build.lst | 2 +- libtextcat/prj/build.lst | 2 +- libwpd/prj/build.lst | 2 +- libxmlsec/prj/build.lst | 2 +- lpsolve/prj/build.lst | 2 +- lucene/prj/build.lst | 2 +- msfontextract/prj/build.lst | 2 +- np_sdk/prj/build.lst | 2 +- openssl/prj/build.lst | 2 +- redland/prj/build.lst | 2 +- redland/prj/d.lst | 1 - redland/raptor/makefile.mk | 2 +- redland/rasqal/makefile.mk | 2 +- redland/redland/makefile.mk | 2 +- redland/redlandversion.mk | 37 ------------------------------------- rhino/prj/build.lst | 2 +- sane/prj/build.lst | 2 +- twain/prj/build.lst | 2 +- unixODBC/prj/build.lst | 2 +- vigra/prj/build.lst | 2 +- x11_extensions/prj/build.lst | 2 +- xsltml/prj/build.lst | 2 +- 33 files changed, 31 insertions(+), 69 deletions(-) delete mode 100644 redland/redlandversion.mk diff --git a/afms/prj/build.lst b/afms/prj/build.lst index ed3d01f..ec184cc 100644 --- a/afms/prj/build.lst +++ b/afms/prj/build.lst @@ -1,3 +1,3 @@ -af afms : solenv NULL +af afms : NULL af afms usr1 - all af_mkout NULL af afms nmake - all af_fonts NULL diff --git a/agg/prj/build.lst b/agg/prj/build.lst index d1456c6..533977d 100755 --- a/agg/prj/build.lst +++ b/agg/prj/build.lst @@ -1,4 +1,4 @@ -ag agg : sal xml2cmp soltools NULL +ag agg : xml2cmp NULL ag agg usr1 - all ag_mkout NULL ag agg\inc get - all ag_inc NULL ag agg\prj get - all ag_prj NULL diff --git a/apple_remote/prj/build.lst b/apple_remote/prj/build.lst index ff4ee57..455eeec 100644 --- a/apple_remote/prj/build.lst +++ b/apple_remote/prj/build.lst @@ -1,2 +1,2 @@ -apr apple_remote : solenv soltools NULL +apr apple_remote : NULL apr apple_remote nmake - u apr_aprem NULL diff --git a/beanshell/prj/build.lst b/beanshell/prj/build.lst index 2a1401b..ea40e29 100644 --- a/beanshell/prj/build.lst +++ b/beanshell/prj/build.lst @@ -1,3 +1,3 @@ -be beanshell : solenv NULL +be beanshell : NULL be beanshell usr1 - all be_mkout NULL be beanshell nmake - all be_beanshell NULL diff --git a/cppunit/prj/build.lst b/cppunit/prj/build.lst index a1cce90..19b8cde 100644 --- a/cppunit/prj/build.lst +++ b/cppunit/prj/build.lst @@ -1,3 +1,3 @@ -c5t cppunit : sal NULL +c5t cppunit : NULL c5t cppunit usr1 - all c5t_mkout NULL c5t cppunit nmake - all c5t_make NULL diff --git a/epm/prj/build.lst b/epm/prj/build.lst index 1086d14..4a0d9cc 100644 --- a/epm/prj/build.lst +++ b/epm/prj/build.lst @@ -1,2 +1,2 @@ -ep epm : solenv NULL +ep epm : NULL ep epm nmake - u ep_mkout NULL diff --git a/external/prj/build.lst b/external/prj/build.lst index b187daf..1a77354 100644 --- a/external/prj/build.lst +++ b/external/prj/build.lst @@ -1,4 +1,4 @@ -el external : SO:external_so soltools NULL +el external : SO:external_so NULL el external usr1 - all el_mkout NULL el external\glibc nmake - all el_glibc NULL el external\gpc nmake - all el_gpc NULL diff --git a/fondu/prj/build.lst b/fondu/prj/build.lst index d99a2c2..bef4227 100644 --- a/fondu/prj/build.lst +++ b/fondu/prj/build.lst @@ -1,2 +1,2 @@ -fd fondu : solenv NULL +fd fondu : NULL fd fondu nmake - u fd_fondu NULL diff --git a/hsqldb/prj/build.lst b/hsqldb/prj/build.lst index a7c0623..6dec1e9 100755 --- a/hsqldb/prj/build.lst +++ b/hsqldb/prj/build.lst @@ -1,2 +1,2 @@ -hs hsqldb : solenv NULL +hs hsqldb : NULL hs hsqldb nmake - all hs_mkout NULL diff --git a/hyphen/prj/build.lst b/hyphen/prj/build.lst index dbb21f3..b58cf25 100644 --- a/hyphen/prj/build.lst +++ b/hyphen/prj/build.lst @@ -1,3 +1,3 @@ -hyp hyphen : solenv sal NULL +hyp hyphen : NULL hyp hyphen usr1 - all hyp_mkout NULL hyp hyphen nmake - all hyp_hyphen NULL diff --git a/icc/prj/build.lst b/icc/prj/build.lst index 7ce035b..4e05748 100644 --- a/icc/prj/build.lst +++ b/icc/prj/build.lst @@ -1,3 +1,3 @@ -ip icc : solenv external NULL +ip icc : external NULL ip icc usr1 - all ip_mkout NULL ip icc nmake - all ip_icc NULL diff --git a/libegg/prj/build.lst b/libegg/prj/build.lst index a4cb56a..a8d2334 100644 --- a/libegg/prj/build.lst +++ b/libegg/prj/build.lst @@ -1,2 +1,2 @@ -eg libegg : soltools NULL +eg libegg : NULL eg libegg\source nmake - u eg_src NULL diff --git a/libtextcat/prj/build.lst b/libtextcat/prj/build.lst index e4bc4af..8a5efd1 100644 --- a/libtextcat/prj/build.lst +++ b/libtextcat/prj/build.lst @@ -1,3 +1,3 @@ -ltc libtextcat : solenv sal NULL +ltc libtextcat : NULL ltc libtextcat usr1 - all ltc_mkout NULL ltc libtextcat nmake - all ltc_libtextcat NULL diff --git a/libwpd/prj/build.lst b/libwpd/prj/build.lst index 1da425b..fe5f5bc 100644 --- a/libwpd/prj/build.lst +++ b/libwpd/prj/build.lst @@ -1,3 +1,3 @@ -lw libwpd : soltools NULL +lw libwpd : NULL lw libwpd usr1 - all lw_mkout NULL lw libwpd nmake - all lw_libwpd NULL diff --git a/libxmlsec/prj/build.lst b/libxmlsec/prj/build.lst index b557aa3..11fa021 100644 --- a/libxmlsec/prj/build.lst +++ b/libxmlsec/prj/build.lst @@ -1,3 +1,3 @@ -ls libxmlsec : stlport soltools LIBXML2:libxml2 MOZ:moz SO:moz_prebuilt sal NULL +ls libxmlsec : LIBXML2:libxml2 MOZ:moz SO:moz_prebuilt NULL ls libxmlsec usr1 - all ls_mkout NULL ls libxmlsec nmake - all ls_xmlsec1 NULL diff --git a/lpsolve/prj/build.lst b/lpsolve/prj/build.lst index 516f37a..b438993 100644 --- a/lpsolve/prj/build.lst +++ b/lpsolve/prj/build.lst @@ -1,3 +1,3 @@ -lps lpsolve : sal NULL +lps lpsolve : NULL lps lpsolve usr1 - all lps_mkout NULL lps lpsolve nmake - all lps_lpsolve NULL diff --git a/lucene/prj/build.lst b/lucene/prj/build.lst index 9f51b60..a370550 100644 --- a/lucene/prj/build.lst +++ b/lucene/prj/build.lst @@ -1,3 +1,3 @@ -xh lucene : soltools EXPAT:expat NULL +xh lucene : EXPAT:expat NULL xh lucene usr1 - all xh_mkout NULL xh lucene nmake - all xh_lucene NULL diff --git a/msfontextract/prj/build.lst b/msfontextract/prj/build.lst index 7b52864..26469f4 100644 --- a/msfontextract/prj/build.lst +++ b/msfontextract/prj/build.lst @@ -1,2 +1,2 @@ -mf msfontextract : soltools sal NULL +mf msfontextract : NULL mf msfontextract nmake - all mf_mkout NULL diff --git a/np_sdk/prj/build.lst b/np_sdk/prj/build.lst index 01dbd7b..af15fed 100644 --- a/np_sdk/prj/build.lst +++ b/np_sdk/prj/build.lst @@ -1,3 +1,3 @@ -np np_sdk : soltools NULL +np np_sdk : NULL np np_sdk usr1 - all np_sdk NULL np np_sdk\mozsrc nmake - all np_mozsrc NULL diff --git a/openssl/prj/build.lst b/openssl/prj/build.lst index 756d0ed..0a8f192 100644 --- a/openssl/prj/build.lst +++ b/openssl/prj/build.lst @@ -1,3 +1,3 @@ -ssl openssl : soltools external EXPAT:expat NULL +ssl openssl : external EXPAT:expat NULL ssl openssl usr1 - all ssl_mkout NULL ssl openssl nmake - all ssl_openssl NULL diff --git a/redland/prj/build.lst b/redland/prj/build.lst index a5653f0..2420ec9 100644 --- a/redland/prj/build.lst +++ b/redland/prj/build.lst @@ -1,4 +1,4 @@ -rld redland : sal soltools ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL +rld redland : ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL rld redland usr1 - all rld_mkout NULL rld redland\raptor nmake - all rld_raptor NULL rld redland\rasqal nmake - all rld_rasqal rld_raptor NULL diff --git a/redland/prj/d.lst b/redland/prj/d.lst index 03bbd21..9fd8969 100644 --- a/redland/prj/d.lst +++ b/redland/prj/d.lst @@ -15,4 +15,3 @@ symlink: %_DEST%\lib%_EXT%\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.dylib ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% -..\redlandversion.mk %_DEST%\inc%_EXT%\redlandversion.mk diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 12479a3..ee4d7e6 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -46,7 +46,7 @@ all: # --- Files -------------------------------------------------------- -.INCLUDE : ../redlandversion.mk +.INCLUDE : redlandversion.mk RAPTORVERSION=$(RAPTOR_MAJOR).4.17 diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index e739671..353b08e 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -46,7 +46,7 @@ all: # --- Files -------------------------------------------------------- -.INCLUDE : ../redlandversion.mk +.INCLUDE : redlandversion.mk RASQALVERSION=0.9.15 diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index e8b4737..9280e85 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -46,7 +46,7 @@ all: # --- Files -------------------------------------------------------- -.INCLUDE : ../redlandversion.mk +.INCLUDE : redlandversion.mk REDLANDVERSION=1.0.7 diff --git a/redland/redlandversion.mk b/redland/redlandversion.mk deleted file mode 100644 index 9b7f736..0000000 --- a/redland/redlandversion.mk +++ /dev/null @@ -1,37 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: redlandversion.mk,v $ -# -# $Revision: 1.1 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -RAPTOR_MAJOR=1 -# rasqal has no stable abi -RASQAL_MAJOR=0 -# redland has no stable abi -REDLAND_MAJOR=0 - diff --git a/rhino/prj/build.lst b/rhino/prj/build.lst index d23bc36..04ebecb 100644 --- a/rhino/prj/build.lst +++ b/rhino/prj/build.lst @@ -1,3 +1,3 @@ -xh rhino : soltools NULL +xh rhino : NULL xh rhino usr1 - all xh_mkout NULL xh rhino nmake - all xh_rhino NULL diff --git a/sane/prj/build.lst b/sane/prj/build.lst index c1c6fb9..83bfa7f 100644 --- a/sane/prj/build.lst +++ b/sane/prj/build.lst @@ -1,3 +1,3 @@ -sa sane : solenv NULL +sa sane : NULL sa sane usr1 - all sa_mkout NULL sa sane\prj get - all sa_prj NULL diff --git a/twain/prj/build.lst b/twain/prj/build.lst index cfeab25..44a83f2 100644 --- a/twain/prj/build.lst +++ b/twain/prj/build.lst @@ -1,3 +1,3 @@ -tw twain : solenv NULL +tw twain : NULL tw twain usr1 - all tw_mkout NULL tw twain\util nmake - n tw_util NULL diff --git a/unixODBC/prj/build.lst b/unixODBC/prj/build.lst index 2adf385..6a5dd6e 100644 --- a/unixODBC/prj/build.lst +++ b/unixODBC/prj/build.lst @@ -1,3 +1,3 @@ -uo unixODBC : solenv NULL +uo unixODBC : NULL uo unixODBC usr1 - all uo_mkout NULL uo unixODBC\prj get - all uo_prj NULL diff --git a/vigra/prj/build.lst b/vigra/prj/build.lst index 47f7eee..5c29164 100644 --- a/vigra/prj/build.lst +++ b/vigra/prj/build.lst @@ -1,3 +1,3 @@ -vi vigra : solenv NULL +vi vigra : NULL vi vigra usr1 - all vi_mkout NULL vi vigra nmake - all vi_vigra NULL diff --git a/x11_extensions/prj/build.lst b/x11_extensions/prj/build.lst index c4d6b1d..4c9b6a3 100644 --- a/x11_extensions/prj/build.lst +++ b/x11_extensions/prj/build.lst @@ -1,3 +1,3 @@ -x1 x11_extensions : solenv NULL +x1 x11_extensions : NULL x1 x11_extensions usr1 - u x11_mkout NULL diff --git a/xsltml/prj/build.lst b/xsltml/prj/build.lst index fe09f17..0c04a34 100755 --- a/xsltml/prj/build.lst +++ b/xsltml/prj/build.lst @@ -1,3 +1,3 @@ -xm xsltml : solenv external NULL +xm xsltml : external NULL xm xsltml usr1 - all xm_mkout NULL xm xsltml nmake - all xm_xsltml NULL -- cgit v1.2.3