diff options
Diffstat (limited to 'sot')
-rw-r--r-- | sot/Library_sot.mk | 105 | ||||
-rw-r--r-- | sot/Makefile (renamed from sot/inc/makefile.mk) | 26 | ||||
-rw-r--r-- | sot/Module_sot.mk (renamed from sot/source/unoolestorage/makefile.mk) | 33 | ||||
-rw-r--r-- | sot/Package_inc.mk | 42 | ||||
-rw-r--r-- | sot/prj/build.lst | 10 | ||||
-rw-r--r-- | sot/prj/d.lst | 15 | ||||
-rw-r--r-- | sot/prj/makefile.mk (renamed from sot/util/makefile.pmk) | 15 | ||||
-rw-r--r-- | sot/source/base/makefile.mk | 58 | ||||
-rw-r--r-- | sot/source/sdstor/makefile.mk | 64 | ||||
-rw-r--r-- | sot/util/makefile.mk | 89 |
10 files changed, 175 insertions, 282 deletions
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk new file mode 100644 index 000000000000..c5d8677bf2ca --- /dev/null +++ b/sot/Library_sot.mk @@ -0,0 +1,105 @@ +#************************************************************************* +# +# 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 +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,sot)) + +$(eval $(call gb_Library_add_package_headers,sot,sot_inc)) + +$(eval $(call gb_Library_add_precompiled_header,sot,$(SRCDIR)/sot/inc/pch/precompiled_sot)) + +$(eval $(call gb_Library_set_componentfile,sot,sot/util/sot)) + +$(eval $(call gb_Library_set_include,sot,\ + -I$(SRCDIR)/sot/inc \ + -I$(SRCDIR)/sot/inc/pch \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,sot,\ + $$(DEFS) \ + -DSOT_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,sot,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ + tl \ + ucbhelper \ + utl \ +)) + +$(eval $(call gb_Library_add_exception_objects,sot,\ + sot/source/unoolestorage/xolesimplestorage \ + sot/source/unoolestorage/xolesimplestorage \ + sot/source/unoolestorage/register \ + sot/source/base/formats \ + sot/source/base/object \ + sot/source/base/exchange \ + sot/source/base/filelist \ + sot/source/base/factory \ + sot/source/sdstor/stgio \ + sot/source/sdstor/stgavl \ + sot/source/sdstor/stgio \ + sot/source/sdstor/storage \ + sot/source/sdstor/stgavl \ + sot/source/sdstor/ucbstorage \ + sot/source/sdstor/storinfo \ + sot/source/sdstor/stg \ + sot/source/sdstor/stgcache \ + sot/source/sdstor/stgelem \ + sot/source/sdstor/stgstrms \ + sot/source/sdstor/stgstrms \ + sot/source/sdstor/stgelem \ + sot/source/sdstor/stgcache \ + sot/source/sdstor/stgole \ + sot/source/sdstor/unostorageholder \ + sot/source/sdstor/stgdir \ + sot/source/sdstor/stgole \ + sot/source/sdstor/stgdir \ + sot/source/sdstor/unostorageholder \ + )) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,sot,\ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,sot,\ + kernel32 \ + msvcrt \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/sot/inc/makefile.mk b/sot/Makefile index bc31cd07e06b..a79aff831024 100644 --- a/sot/inc/makefile.mk +++ b/sot/Makefile @@ -24,25 +24,15 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ=.. -PRJNAME=sot -TARGET=inc +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif -# --- Settings ----------------------------------------------------- +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +# vim: set noet sw=4 ts=4: diff --git a/sot/source/unoolestorage/makefile.mk b/sot/Module_sot.mk index d88f72f14e51..95e5d2898b28 100644 --- a/sot/source/unoolestorage/makefile.mk +++ b/sot/Module_sot.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2009 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,38 +14,21 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ=..$/.. +$(eval $(call gb_Module_Module,sot)) -PRJNAME=sot -TARGET=unoolestorage - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/xolesimplestorage.obj \ - $(SLO)$/register.obj - -EXCEPTIONSFILES= \ - $(SLO)$/xolesimplestorage.obj \ - $(SLO)$/register.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk +$(eval $(call gb_Module_add_targets,sot,\ + Package_inc \ + Library_sot \ +)) diff --git a/sot/Package_inc.mk b/sot/Package_inc.mk new file mode 100644 index 000000000000..1b664c263184 --- /dev/null +++ b/sot/Package_inc.mk @@ -0,0 +1,42 @@ +#************************************************************************* +# +# 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 +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,sot_inc,$(SRCDIR)/sot/inc)) +$(eval $(call gb_Package_add_file,sot_inc,inc/sot/absdev.hxx,sot/absdev.hxx)) +$(eval $(call gb_Package_add_file,sot_inc,inc/sot/agg.hxx,sot/agg.hxx)) +$(eval $(call gb_Package_add_file,sot_inc,inc/sot/clsids.hxx,sot/clsids.hxx)) +$(eval $(call gb_Package_add_file,sot_inc,inc/sot/exchange.hxx,sot/exchange.hxx)) +$(eval $(call gb_Package_add_file,sot_inc,inc/sot/factory.hxx,sot/factory.hxx)) +$(eval $(call gb_Package_add_file,sot_inc,inc/sot/filelist.hxx,sot/filelist.hxx)) +$(eval $(call gb_Package_add_file,sot_inc,inc/sot/formats.hxx,sot/formats.hxx)) +$(eval $(call gb_Package_add_file,sot_inc,inc/sot/object.hxx,sot/object.hxx)) +$(eval $(call gb_Package_add_file,sot_inc,inc/sot/sotdata.hxx,sot/sotdata.hxx)) +$(eval $(call gb_Package_add_file,sot_inc,inc/sot/sotdllapi.h,sot/sotdllapi.h)) +$(eval $(call gb_Package_add_file,sot_inc,inc/sot/sotref.hxx,sot/sotref.hxx)) +$(eval $(call gb_Package_add_file,sot_inc,inc/sot/stg.hxx,sot/stg.hxx)) +$(eval $(call gb_Package_add_file,sot_inc,inc/sot/storage.hxx,sot/storage.hxx)) +$(eval $(call gb_Package_add_file,sot_inc,inc/sot/storinfo.hxx,sot/storinfo.hxx)) diff --git a/sot/prj/build.lst b/sot/prj/build.lst deleted file mode 100644 index 9d6e785898a5..000000000000 --- a/sot/prj/build.lst +++ /dev/null @@ -1,10 +0,0 @@ -to sot : LIBXSLT:libxslt tools ucbhelper unotools NULL -to sot usr1 - all sot_mkout NULL -to sot\inc nmake - all sot_inc NULL -to sot\prj get - all sot_prj NULL -to sot\source\base nmake - all sot_base sot_inc NULL -to sot\source\sdstor nmake - all sot_sdst sot_inc NULL -to sot\source\unoolestorage nmake - all sot_unoolestor sot_inc NULL -to sot\util nmake - all sot_ut sot_base sot_sdst sot_unoolestor NULL - -# to sot\qa\complex\olesimplestorage nmake - all sot_complex sot_ut NULL diff --git a/sot/prj/d.lst b/sot/prj/d.lst deleted file mode 100644 index ec3166bbea1a..000000000000 --- a/sot/prj/d.lst +++ /dev/null @@ -1,15 +0,0 @@ -mkdir: %_DEST%\inc%_EXT%\sot -..\inc\sot/*.hxx %_DEST%\inc%_EXT%\sot\*.hxx -..\inc\sot\*.h %_DEST%\inc%_EXT%\sot\*.h - -..\%__SRC%\lib\sot.lib %_DEST%\lib%_EXT%\sot.lib -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% -..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT% -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib -..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a -..\%__SRC%\slb\sot.lib %_DEST%\lib%_EXT%\xsot.lib -..\%__SRC%\bin\sot?????.dll %_DEST%\bin%_EXT%\sot?????.dll -..\%__SRC%\bin\sot?????.sym %_DEST%\bin%_EXT%\sot?????.sym -..\%__SRC%\misc\sot?????.map %_DEST%\bin%_EXT%\sot?????.map -..\%__SRC%\misc\sot.component %_DEST%\xml%_EXT%\sot.component diff --git a/sot/util/makefile.pmk b/sot/prj/makefile.mk index 2d79b8068815..c73a3d944bbf 100644 --- a/sot/util/makefile.pmk +++ b/sot/prj/makefile.mk @@ -25,7 +25,16 @@ # #************************************************************************* -# define SOT_DLLIMPLEMENTATION (see @ = sotdllapi.h) -CDEFS += -DSOT_DLLIMPLEMENTATION +PRJ=.. +TARGET=prj -VISIBILITY_HIDDEN=TRUE +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) diff --git a/sot/source/base/makefile.mk b/sot/source/base/makefile.mk deleted file mode 100644 index 861b7cc5969b..000000000000 --- a/sot/source/base/makefile.mk +++ /dev/null @@ -1,58 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sot -TARGET=base - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(COM)"=="GCC" -NOOPTFILES= \ - $(SLO)$/exchange.obj -.ENDIF # GCC - -SLOFILES= \ - $(SLO)$/factory.obj \ - $(SLO)$/object.obj \ - $(SLO)$/exchange.obj \ - $(SLO)$/filelist.obj \ - $(SLO)$/formats.obj - -EXCEPTIONSFILES= \ - $(SLO)$/formats.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sot/source/sdstor/makefile.mk b/sot/source/sdstor/makefile.mk deleted file mode 100644 index f5c6d81548c9..000000000000 --- a/sot/source/sdstor/makefile.mk +++ /dev/null @@ -1,64 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sot -TARGET=sdstor - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=true - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/unostorageholder.obj \ - $(SLO)$/ucbstorage.obj \ - $(SLO)$/stg.obj \ - $(SLO)$/stgcache.obj \ - $(SLO)$/stgstrms.obj \ - $(SLO)$/stgelem.obj \ - $(SLO)$/stgio.obj \ - $(SLO)$/stgole.obj \ - $(SLO)$/stgdir.obj \ - $(SLO)$/stgavl.obj \ - $(SLO)$/storinfo.obj \ - $(SLO)$/storage.obj - -EXCEPTIONSFILES= \ - $(SLO)$/unostorageholder.obj\ - $(SLO)$/ucbstorage.obj\ - $(SLO)$/storage.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sot/util/makefile.mk b/sot/util/makefile.mk deleted file mode 100644 index 453dbddc5857..000000000000 --- a/sot/util/makefile.mk +++ /dev/null @@ -1,89 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=sot -TARGET=sot - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET).lib -.IF "$(GUI)$(COM)"=="WNTGCC" -LIB1ARCHIV= $(LB)$/lib$(TARGET)$(DLLPOSTFIX)_static.a -.ELSE -LIB1ARCHIV= $(LB)$/lib$(TARGET)$(DLLPOSTFIX).a -.ENDIF -LIB1FILES= $(SLB)$/base.lib \ - $(SLB)$/sdstor.lib \ - $(SLB)$/unoolestorage.lib - -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -SHL1IMPLIB= $(TARGET) -SHL1USE_EXPORTS=name -SHL1LIBS= $(SLB)$/$(TARGET).lib - -SHL1STDLIBS=$(TOOLSLIB) $(SALLIB) $(UNOTOOLSLIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(UCBHELPERLIB) $(CPPULIB) - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME =$(SHL1TARGET) -DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt \ - $(PRJ)$/inc$/sot/absdev.hxx \ - $(PRJ)$/inc$/sot/agg.hxx \ - $(PRJ)$/inc$/sot$/exchange.hxx \ - $(PRJ)$/inc$/sot$/factory.hxx \ - $(PRJ)$/inc$/sot$/object.hxx \ - $(PRJ)$/inc$/sot$/sotdata.hxx \ - $(PRJ)$/inc$/sot$/sotref.hxx \ - $(PRJ)$/inc$/sot/stg.hxx \ - $(PRJ)$/inc$/sot$/storage.hxx \ - $(PRJ)$/inc$/sot/storinfo.hxx -DEFLIB1NAME =$(TARGET) -DEF1DES =StarObjectsTools - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -$(MISC)$/$(SHL1TARGET).flt: makefile.mk - @echo ------------------------------ - @echo Making: $@ - $(TYPE) sot.flt > $@ - - -ALLTAR : $(MISC)/sot.component - -$(MISC)/sot.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - sot.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt sot.component |