From 508b7caddff9acb84b65d9a3679f61e494c6a6e0 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 20 Dec 2010 05:34:28 -0600 Subject: simpified repository setup --- Repository.mk | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 Repository.mk (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk new file mode 100644 index 000000000000..6bd044ae0408 --- /dev/null +++ b/Repository.mk @@ -0,0 +1,130 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +gb_REPOSITORYDIRNAME := SRCDIR + + +gb_Executable_UREBIN := \ + +gb_Executable_SDK := \ + +gb_Executable_OOO := \ + +gb_Executable_BRAND := \ + +# not installed +gb_Executable_NONE := \ + mkunroll \ + rscdep \ + so_checksum \ + sspretty \ + bmp \ + bmpsum \ + g2g \ + +gb_Library_OOOLIBS :=\ + avmedia \ + basegfx \ + cui \ + drawinglayer \ + editeng \ + fwe \ + fwi \ + fwk \ + fwl \ + fwm \ + lng \ + msfilter \ + msword \ + oox \ + qstart_gtk \ + sax \ + sb \ + sfx \ + sot \ + svl \ + svt \ + svx \ + svxcore \ + sw \ + swd \ + swui \ + textconversiondlgs \ + tk \ + tl \ + utl \ + vbahelper \ + vcl \ + xo \ + xof \ + xcr \ + +gb_Library_PLAINLIBS_URE :=\ + xml2 \ + +gb_Library_PLAINLIBS_OOO :=\ + icuuc \ + + +# => OOOLIB +gb_Library_RTLIBS :=\ + comphelper \ + i18nisolang1 \ + i18nutil \ + ucbhelper \ + +# => URELIB +gb_Library_RTVERLIBS :=\ + cppuhelper \ + salhelper \ + +# => URELIB +gb_Library_STLLIBS :=\ + stl \ + +gb_Library_UNOLIBS_URE := \ + +gb_Library_UNOLIBS_OOO := \ + fsstorage \ + hatchwindowfactory \ + passwordcontainer \ + productregistration \ + vbaswobj \ + + +# => URELIB +gb_Library_UNOVERLIBS :=\ + jvmfwk \ + cppu \ + sal \ + +gb_StaticLibrary_PLAINLIBS :=\ + salcpprt \ + jpeglib \ + zlib \ + +# vim: set noet sw=4 ts=4: -- cgit From 75a677b3a44e365d95b483d60fce3296f184ea41 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 20 Dec 2010 05:43:36 -0600 Subject: simpified repository setup --- Repository.mk | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 6bd044ae0408..a7ba4d28ecb6 100644 --- a/Repository.mk +++ b/Repository.mk @@ -25,19 +25,17 @@ # #************************************************************************* -gb_REPOSITORYDIRNAME := SRCDIR +$(eval $(call gb_Helper_register_repository,SRCDIR)) -gb_Executable_UREBIN := \ +gb_Executable_UREBIN += -gb_Executable_SDK := \ - -gb_Executable_OOO := \ - -gb_Executable_BRAND := \ +gb_Executable_SDK += +gb_Executable_OOO += +gb_Executable_BRAND += # not installed -gb_Executable_NONE := \ +gb_Executable_NONE +=\ mkunroll \ rscdep \ so_checksum \ @@ -46,7 +44,7 @@ gb_Executable_NONE := \ bmpsum \ g2g \ -gb_Library_OOOLIBS :=\ +gb_Library_OOOLIBS +=\ avmedia \ basegfx \ cui \ @@ -83,32 +81,32 @@ gb_Library_OOOLIBS :=\ xof \ xcr \ -gb_Library_PLAINLIBS_URE :=\ +gb_Library_PLAINLIBS_URE +=\ xml2 \ -gb_Library_PLAINLIBS_OOO :=\ +gb_Library_PLAINLIBS_OOO +=\ icuuc \ # => OOOLIB -gb_Library_RTLIBS :=\ +gb_Library_RTLIBS +=\ comphelper \ i18nisolang1 \ i18nutil \ ucbhelper \ # => URELIB -gb_Library_RTVERLIBS :=\ +gb_Library_RTVERLIBS +=\ cppuhelper \ salhelper \ # => URELIB -gb_Library_STLLIBS :=\ +gb_Library_STLLIBS +=\ stl \ -gb_Library_UNOLIBS_URE := \ +gb_Library_UNOLIBS_URE +=\ -gb_Library_UNOLIBS_OOO := \ +gb_Library_UNOLIBS_OOO +=\ fsstorage \ hatchwindowfactory \ passwordcontainer \ @@ -117,12 +115,12 @@ gb_Library_UNOLIBS_OOO := \ # => URELIB -gb_Library_UNOVERLIBS :=\ +gb_Library_UNOVERLIBS +=\ jvmfwk \ cppu \ sal \ -gb_StaticLibrary_PLAINLIBS :=\ +gb_StaticLibrary_PLAINLIBS +=\ salcpprt \ jpeglib \ zlib \ -- cgit From eb57a4465804b24ab3a52046ce33900b6a4de9c3 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 20 Dec 2010 05:54:23 -0600 Subject: simplify repository setup --- Repository.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index a7ba4d28ecb6..c2795e1277e6 100644 --- a/Repository.mk +++ b/Repository.mk @@ -28,14 +28,7 @@ $(eval $(call gb_Helper_register_repository,SRCDIR)) -gb_Executable_UREBIN += - -gb_Executable_SDK += -gb_Executable_OOO += -gb_Executable_BRAND += - -# not installed -gb_Executable_NONE +=\ +$(eval $(call gb_Helper_register_executables,NONE, \ mkunroll \ rscdep \ so_checksum \ @@ -43,6 +36,7 @@ gb_Executable_NONE +=\ bmp \ bmpsum \ g2g \ +)) gb_Library_OOOLIBS +=\ avmedia \ -- cgit From 5acc21e256a0db113829067f6d00f288789f0401 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 20 Dec 2010 06:10:15 -0600 Subject: simplify repository setup --- Repository.mk | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index c2795e1277e6..dba9655badf0 100644 --- a/Repository.mk +++ b/Repository.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ g2g \ )) -gb_Library_OOOLIBS +=\ +$(eval $(call gb_Helper_register_libraries,OOOLIBS, \ avmedia \ basegfx \ cui \ @@ -75,48 +75,50 @@ gb_Library_OOOLIBS +=\ xof \ xcr \ -gb_Library_PLAINLIBS_URE +=\ +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ xml2 \ +)) -gb_Library_PLAINLIBS_OOO +=\ +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ icuuc \ +)) -# => OOOLIB -gb_Library_RTLIBS +=\ +$(eval $(call gb_Helper_register_libraries,RTLIBS, \ comphelper \ i18nisolang1 \ i18nutil \ ucbhelper \ +)) -# => URELIB -gb_Library_RTVERLIBS +=\ +$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ cppuhelper \ salhelper \ +)) -# => URELIB -gb_Library_STLLIBS +=\ +$(eval $(call gb_Helper_register_libraries,STLLIBS, \ stl \ +)) -gb_Library_UNOLIBS_URE +=\ - -gb_Library_UNOLIBS_OOO +=\ +$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ fsstorage \ hatchwindowfactory \ passwordcontainer \ productregistration \ vbaswobj \ +)) -# => URELIB -gb_Library_UNOVERLIBS +=\ - jvmfwk \ +$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ cppu \ + jvmfwk \ sal \ +)) -gb_StaticLibrary_PLAINLIBS +=\ +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ salcpprt \ jpeglib \ zlib \ +)) # vim: set noet sw=4 ts=4: -- cgit From ecbfbaf8c19677068c0267ba3a8c647efc46bb4d Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 20 Dec 2010 08:58:17 -0600 Subject: fix merge errors --- Repository.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index dba9655badf0..2643471b6f38 100644 --- a/Repository.mk +++ b/Repository.mk @@ -74,6 +74,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ xo \ xof \ xcr \ +)) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ xml2 \ -- cgit From 363aae08595ab4568df59a588893c09dbfa55bcb Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sun, 9 Jan 2011 19:24:50 -0600 Subject: add calc related library to the Repository --- Repository.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 2643471b6f38..d77c234a789f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -44,6 +44,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ cui \ drawinglayer \ editeng \ + for \ + forui \ fwe \ fwi \ fwk \ @@ -56,6 +58,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ qstart_gtk \ sax \ sb \ + sc \ + scui \ sfx \ sot \ svl \ @@ -106,6 +110,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ hatchwindowfactory \ passwordcontainer \ productregistration \ + vbaobj \ vbaswobj \ )) -- cgit From 63b390b7f4ac02152a6f8fafa8b97a586a926308 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 10 Jan 2011 18:56:29 -0600 Subject: add missing library for sc. Massage the delivered libraries name. --- Repository.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index d77c234a789f..8964872af6e1 100644 --- a/Repository.mk +++ b/Repository.mk @@ -59,6 +59,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ sax \ sb \ sc \ + scd \ + scfilt \ scui \ sfx \ sot \ -- cgit From d20aada42b5c4e5e0ac82514c21334f6e466c87f Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Fri, 14 Jan 2011 08:05:48 -0600 Subject: add starmath libraries to Repository.mk --- Repository.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 8964872af6e1..28f1af54f9ef 100644 --- a/Repository.mk +++ b/Repository.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ fwk \ fwl \ fwm \ + i18npaper \ lng \ msfilter \ msword \ @@ -63,6 +64,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ scfilt \ scui \ sfx \ + sm \ + smd \ sot \ svl \ svt \ @@ -124,6 +127,7 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ )) $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ + i18npaper \ salcpprt \ jpeglib \ zlib \ -- cgit From 35701ddafd918b48205d0cd48a3ddacb1ffc3ccd Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 17 Mar 2011 13:38:36 +0100 Subject: killing off stl in gbuild --- Repository.mk | 4 ---- 1 file changed, 4 deletions(-) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 80e03cf55e49..123c4184b985 100644 --- a/Repository.mk +++ b/Repository.mk @@ -104,10 +104,6 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ salhelper \ )) -$(eval $(call gb_Helper_register_libraries,STLLIBS, \ - stl \ -)) - $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ fsstorage \ hatchwindowfactory \ -- cgit From 80035e9fb89347d67f430128abcb0c6639a9c55f Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 21 Mar 2011 10:59:56 -0500 Subject: add library declaration for sc gnumake --- Repository.mk | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 146398fd4bc7..fbd6f326b95e 100644 --- a/Repository.mk +++ b/Repository.mk @@ -48,6 +48,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ cui \ drawinglayer \ editeng \ + for \ + forui \ fwe \ fwi \ fwk \ @@ -61,6 +63,10 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ qstart_gtk \ sax \ sb \ + sc \ + scd \ + scfilt \ + scui \ sfx \ sot \ spa \ @@ -113,6 +119,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ hatchwindowfactory \ passwordcontainer \ productregistration \ + vbaobj \ vbaswobj \ msforms \ )) -- cgit From 51c01745ecde4a6e0891dac065575f73c8794b48 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 26 Mar 2011 15:21:25 -0500 Subject: add starmath libraries to Repository.mk --- Repository.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index fbd6f326b95e..516fb36f4f6f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -68,6 +68,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ scfilt \ scui \ sfx \ + sm \ + smd \ sot \ spa \ svl \ -- cgit From cfbf640369a2802a5d6d87ddc1c26ed216418a5f Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 28 Mar 2011 02:28:57 +0200 Subject: register test library --- Repository.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 516fb36f4f6f..0afb79bf8cd8 100644 --- a/Repository.mk +++ b/Repository.mk @@ -97,6 +97,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + test \ cppunit \ icuuc \ rdf \ -- cgit From dbc1d2d9e232c69664707b270cf06f9da58257b8 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 31 Mar 2011 20:59:59 +0200 Subject: adding lomenubar lib --- Repository.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 0afb79bf8cd8..fc5aa93ceb08 100644 --- a/Repository.mk +++ b/Repository.mk @@ -120,11 +120,12 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ fsstorage \ hatchwindowfactory \ + lomenubar \ + msforms \ passwordcontainer \ productregistration \ vbaobj \ vbaswobj \ - msforms \ )) -- cgit From 5baa4c0e3a2e78689a3b921458dcebf561107b03 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 2 Apr 2011 14:56:59 +0200 Subject: convert fileaccess to gbuild --- Repository.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index fc5aa93ceb08..192d21a9a225 100644 --- a/Repository.mk +++ b/Repository.mk @@ -99,6 +99,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ test \ cppunit \ + fileacc \ icuuc \ rdf \ xslt \ -- cgit From c54700d19253ef8222761031d7abc06e019d24d6 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 3 Apr 2011 10:58:02 +0200 Subject: gbuildize unotools --- Repository.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 192d21a9a225..28a4e73465fd 100644 --- a/Repository.mk +++ b/Repository.mk @@ -82,9 +82,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ textconversiondlgs \ tk \ tl \ - utl \ unordf \ unoxml \ + utl \ vbahelper \ vcl \ xcr \ -- cgit From af544c8f8465654c8611ba07af5985e65270f081 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 3 Apr 2011 17:42:50 +0200 Subject: gbuildize forms --- Repository.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 28a4e73465fd..5badf860eadd 100644 --- a/Repository.mk +++ b/Repository.mk @@ -46,10 +46,12 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ avmedia \ basegfx \ cui \ + dbtools \ drawinglayer \ editeng \ for \ forui \ + frm \ fwe \ fwi \ fwk \ @@ -100,6 +102,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ test \ cppunit \ fileacc \ + icui18n \ icuuc \ rdf \ xslt \ -- cgit From adf4bb8fea6059a39a8f779153bf9979b7e65436 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 3 Apr 2011 19:14:07 +0200 Subject: gbuildize drawinglayer --- Repository.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 5badf860eadd..44fe3c6d4c35 100644 --- a/Repository.mk +++ b/Repository.mk @@ -45,6 +45,8 @@ $(eval $(call gb_Helper_register_executables,OOO, \ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ avmedia \ basegfx \ + canvastools \ + cppcanvas \ cui \ dbtools \ drawinglayer \ -- cgit From 9a4fc75113a27a4c71f879d430009a5ddc3ab30d Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 11 Apr 2011 10:07:35 +0200 Subject: gbuildize lotuswordpro --- Repository.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 44fe3c6d4c35..829db4e74aa4 100644 --- a/Repository.mk +++ b/Repository.mk @@ -61,6 +61,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ fwm \ i18npaper \ lng \ + lwpft \ msfilter \ msword \ oox \ @@ -105,6 +106,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ cppunit \ fileacc \ icui18n \ + icule \ icuuc \ rdf \ xslt \ -- cgit From 62b2fea57ebfecd523cdca657a42a6427c3048d5 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 14 Apr 2011 12:38:43 +0200 Subject: gbuildize writerfilter --- Repository.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 829db4e74aa4..c2607466724d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ cppcanvas \ cui \ dbtools \ + doctok \ drawinglayer \ editeng \ for \ @@ -65,7 +66,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ msfilter \ msword \ oox \ + ooxml \ qstart_gtk \ + resourcemodel \ sax \ sb \ sc \ @@ -92,6 +95,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ utl \ vbahelper \ vcl \ + writerfilter \ xcr \ xo \ xof \ @@ -134,6 +138,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ productregistration \ vbaobj \ vbaswobj \ + writerfilter_uno \ )) -- cgit From 1b7717c24244aafbb314dcf4fca2efc901fd1393 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 15 Apr 2011 10:42:17 +0200 Subject: gbuildize chart2 --- Repository.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index c2607466724d..19a59d3b399c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -46,6 +46,10 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ avmedia \ basegfx \ canvastools \ + chartcontroller \ + chartmodel \ + charttools \ + chartview \ cppcanvas \ cui \ dbtools \ -- cgit From 3feaa80ebe2dd98e8f4c7af1f065bc4675bf4182 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 15 Apr 2011 16:14:31 +0200 Subject: declare internal static openssl libs --- Repository.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 19a59d3b399c..cb1e92e6523c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -153,9 +153,11 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ )) $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ + crypto \ jpeglib \ ooopathutils \ salcpprt \ + ssl \ vclmain \ zlib \ )) -- cgit From c2c0f1d51e0beeaee9b527eb25e908d05ef6a33a Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 15 Apr 2011 19:14:08 +0200 Subject: register dynamic libs for openssl as well --- Repository.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index cb1e92e6523c..78608dc4bca4 100644 --- a/Repository.mk +++ b/Repository.mk @@ -112,11 +112,13 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ test \ cppunit \ + crypto \ fileacc \ icui18n \ icule \ icuuc \ rdf \ + ssl \ xslt \ )) -- cgit From 7c5fe761d3904c9459305a5dca80373aa0350794 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 16 Apr 2011 15:37:04 +0200 Subject: remove ssprety --- Repository.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 78608dc4bca4..8552496cbd7c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \ mkunroll \ rscdep \ so_checksum \ - sspretty \ )) $(eval $(call gb_Helper_register_executables,OOO, \ -- cgit From 2f4450666900f99d1c89e75358ab061836c56df2 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 16 Apr 2011 15:51:41 +0200 Subject: introduce toolshelpers static lib to avoid duplicate linking errors --- Repository.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 8552496cbd7c..afae3fef8b83 100644 --- a/Repository.mk +++ b/Repository.mk @@ -159,6 +159,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ ooopathutils \ salcpprt \ ssl \ + toolshelpers \ vclmain \ zlib \ )) -- cgit From 11430c70745621f7b064b1d8ac2f583078932813 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 18 Apr 2011 14:46:56 +0200 Subject: gbuildize dbaccess --- Repository.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index afae3fef8b83..cd74bf167c5e 100644 --- a/Repository.mk +++ b/Repository.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ + adabasui \ avmedia \ basegfx \ canvastools \ @@ -51,7 +52,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ chartview \ cppcanvas \ cui \ + dba \ + dbaxml \ + dbmm \ dbtools \ + dbu \ doctok \ drawinglayer \ editeng \ @@ -78,6 +83,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ scd \ scfilt \ scui \ + sdbt \ sfx \ sm \ smd \ -- cgit From 98d8b2b999dec5cfb47b138f1d2bf3a3789427bb Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 20 Apr 2011 08:59:22 +0200 Subject: gbuildize sd --- Repository.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index cd74bf167c5e..d49cec1269f3 100644 --- a/Repository.mk +++ b/Repository.mk @@ -83,7 +83,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ scd \ scfilt \ scui \ + sd \ sdbt \ + sdd \ + sdfilt \ + sdui \ sfx \ sm \ smd \ -- cgit From ad773c4cc3b1a26bef4df95c0d9d062f062aa995 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 20 Apr 2011 10:35:23 +0200 Subject: gbuildize slideshow --- Repository.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index d49cec1269f3..d2089409c936 100644 --- a/Repository.mk +++ b/Repository.mk @@ -149,8 +149,10 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ hatchwindowfactory \ lomenubar \ msforms \ + OGLTrans \ passwordcontainer \ productregistration \ + slideshow \ vbaobj \ vbaswobj \ writerfilter_uno \ -- cgit From ab77c99818f03b7559f26f8d53b0f1df4203bdf0 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 20 Apr 2011 14:50:07 +0200 Subject: gbuildize reportdesign --- Repository.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index d2089409c936..ee13ef3af390 100644 --- a/Repository.mk +++ b/Repository.mk @@ -77,6 +77,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ ooxml \ qstart_gtk \ resourcemodel \ + rpt \ + rptui \ + rptxml \ sax \ sb \ sc \ -- cgit From b923fa2536cb9605f96022f555f922b4ed24157e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 29 Apr 2011 15:15:16 +0300 Subject: Fix crypto stuff when building on Windows --- Repository.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index ee13ef3af390..3609e71f90a7 100644 --- a/Repository.mk +++ b/Repository.mk @@ -170,6 +170,8 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ crypto \ + libeay32 \ + ssleay32 \ jpeglib \ ooopathutils \ salcpprt \ -- cgit From 7667fa2e3c2ae71d650b639fa7792afec8f25d1d Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Fri, 29 Apr 2011 19:14:29 +0200 Subject: Updates to make vcl building. --- Repository.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 584e63ad96e3..279250ceb982 100755 --- a/Repository.mk +++ b/Repository.mk @@ -148,11 +148,12 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ )) $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ + graphite2_off \ jpeglib \ ooopathutils \ salcpprt \ + vclmain \ zlib \ - graphite \ )) # vim: set noet sw=4 ts=4: -- cgit From 32805760a28fceeb1b17c3d392844180d5b73695 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 30 May 2011 17:53:46 +0300 Subject: The graphite2 library is called graphite2_off --- Repository.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 0afca0dca6ae..7e935f80f9fa 100755 --- a/Repository.mk +++ b/Repository.mk @@ -138,7 +138,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ icule \ icuuc \ icule \ - graphite_dll \ + graphite2_off \ cppunit \ rdf \ ssl \ -- cgit From 240c1266d8a5c3632d5a23bd1fd7cff606f1bd7f Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 30 May 2011 17:54:06 +0300 Subject: chmod -x --- Repository.mk | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 Repository.mk (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk old mode 100755 new mode 100644 -- cgit From ac41a4d5f265d76f09cb0543de097028eb82699b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 13 Jun 2011 23:18:05 +0100 Subject: gbuildize hwpfilter --- Repository.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index 7e935f80f9fa..c167dfc168ef 100644 --- a/Repository.mk +++ b/Repository.mk @@ -71,6 +71,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ fwk \ fwl \ fwm \ + hwp \ i18npaper \ lng \ lwpft \ -- cgit From 5ad60c5d69042a73d7a1632d3c04e15783817db4 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 14 Jun 2011 16:30:20 +0100 Subject: more configure, and scp2 pieces for gtk3 integration --- Repository.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index c167dfc168ef..f01ace1f77b2 100644 --- a/Repository.mk +++ b/Repository.mk @@ -117,6 +117,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ vcl \ vclplug_gen \ vclplug_gtk \ + vclplug_gtk3 \ vclplug_kde \ vclplug_kde4 \ vclplug_svp \ -- cgit