diff options
author | Peter Foley <pefoley2@verizon.net> | 2011-12-17 22:11:57 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2011-12-17 22:11:57 +0100 |
commit | a80a5ab4f6b243b94e89f1720b1c8c58e8611e93 (patch) | |
tree | da5c12318296d14ecb033f1d6ca8b5bfa360708c | |
parent | extensions: move mozilla to RepositoryExternal.mk (diff) | |
download | core-a80a5ab4f6b243b94e89f1720b1c8c58e8611e93.tar.gz core-a80a5ab4f6b243b94e89f1720b1c8c58e8611e93.zip |
extensions: convert plugin to gbuild
-rw-r--r-- | Repository.mk | 11 | ||||
-rw-r--r-- | extensions/Executable_pluginapp.bin.mk | 98 | ||||
-rw-r--r-- | extensions/Library_pl.mk | 154 | ||||
-rw-r--r-- | extensions/Module_extensions.mk | 5 | ||||
-rw-r--r-- | extensions/prj/build.lst | 10 | ||||
-rw-r--r-- | extensions/source/plugin/aqua/makefile.mk | 63 | ||||
-rw-r--r-- | extensions/source/plugin/base/makefile.mk | 65 | ||||
-rw-r--r-- | extensions/source/plugin/pl.component (renamed from extensions/source/plugin/util/pl.component) | 0 | ||||
-rw-r--r-- | extensions/source/plugin/unx/makefile.mk | 104 | ||||
-rw-r--r-- | extensions/source/plugin/util/makefile.mk | 109 | ||||
-rw-r--r-- | extensions/source/plugin/util/makefile.pmk | 48 | ||||
-rw-r--r-- | extensions/source/plugin/win/makefile.mk | 58 | ||||
-rw-r--r-- | postprocess/packcomponents/makefile.mk | 2 |
13 files changed, 270 insertions, 457 deletions
diff --git a/Repository.mk b/Repository.mk index b897665f060a..e065c511684d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -92,6 +92,17 @@ endif endif +ifneq ($(WITH_MOZILLA),NO) +$(eval $(call gb_Helper_register_executables,OOO,\ + nspugin \ + pluginapp.bin \ +)) +$(eval $(call gb_Helper_register_libraries,OOOLIBS, \ + pl \ +)) +endif # WITH_MOZILLA + + $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ PptImporter \ adabas \ diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk new file mode 100644 index 000000000000..4877eddff2b9 --- /dev/null +++ b/extensions/Executable_pluginapp.bin.mk @@ -0,0 +1,98 @@ +# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Peter Foley <pefoley2@verizon.net> +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. +# + +$(eval $(call gb_Executable_Executable,pluginapp.bin)) + +$(eval $(call gb_Executable_set_include,pluginapp.bin,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/extensions/source/plugin/inc) \ +)) + +$(eval $(call gb_Executable_add_api,pluginapp.bin,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Executable_add_exception_objects,pluginapp.bin,\ + extensions/source/plugin/unx/npwrap \ + extensions/source/plugin/unx/npnapi \ + extensions/source/plugin/unx/mediator \ + extensions/source/plugin/unx/plugcon \ +)) + +$(eval $(call gb_Executable_add_linked_libs,pluginapp.bin,\ + sal \ +)) + +ifeq ($(OS),SOLARIS) +$(eval $(call gb_Executable_add_libs,pluginapp.bin,\ + -lXm \ + -lXt \ + -lXext \ + -lX11 \ + -ldl \ +)) +else ifeq ($(filter-out FREEBSD NETBSD OPENBSD DRAGONFLY,$(OS)),) +$(eval $(call gb_Executable_add_libs,pluginapp.bin,\ + -lXt \ + -lXext \ + -lX11 \ +)) +else ifeq ($(OS),AIX) +$(eval $(call gb_Executable_add_libs,pluginapp.bin,\ + -lXpm \ + -lXmu \ + -lXt \ + -lXext \ + -lX11 \ + -ldl \ +)) +else +$(eval $(call gb_Executable_add_libs,pluginapp.bin,\ + -lXt \ + -lXext \ + -lX11 \ + -ldl \ +)) +endif + + +ifeq ($(ENABLE_GTK),TRUE) +$(eval $(call gb_Executable_use_external,pluginapp.bin,gtk)) + +ifeq ($(OS),SOLARIS) +$(eval $(call gb_Executable_set_ldflags,pluginapp.bin,\ + -z nodefs \ +)) +endif + +endif + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk new file mode 100644 index 000000000000..2f6ec5822767 --- /dev/null +++ b/extensions/Library_pl.mk @@ -0,0 +1,154 @@ +# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Peter Foley <pefoley2@verizon.net> +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. +# + +$(eval $(call gb_Library_Library,pl)) + +$(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl)) + +$(eval $(call gb_Library_set_include,pl,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/extensions/source/plugin/inc) \ + -I$(OUTDIR)/inc/mozilla/plugin \ +)) + +$(eval $(call gb_Library_add_api,pl,\ + offapi \ + udkapi \ +)) + +ifneq ($(SOLAR_JAVA),) + +$(eval $(call gb_Library_set_include,pl,\ + $$(INCLUDE) \ + -I$(OUTDIR)/mozilla/java \ + -I$(OUTDIR)/mozilla/nspr \ +)) + +ifeq ($(GUIBASE),aqua) +$(eval $(call gb_Library_set_include,pl,\ + $$(INCLUDE) \ + -I$(OUTDIR)/npsdk \ +)) +endif # GUIBASE=aqua + +endif # SOLAR_JAVA=YES + +ifeq ($(SYSTEM_MOZILLA),YES) +$(eval $(call gb_Library_add_defs,pl,\ + -DSYSTEM_MOZILLA \ +)) +endif # SYSTEM_MOZILLA=YES + +ifeq ($(OS),SOLARIS) +$(eval $(call gb_Library_add_libs,pl,\ + -lsocket \ +)) +endif # OS=SOLARIS + +ifeq ($(GUI),WNT) +$(eval $(call gb_Library_add_linked_libs,pl,\ + version \ + ole32 \ + advapi32 \ +)) + +$(eval $(call gb_Library_add_exception_objects,pl,\ + extensions/source/plugin/win/winmgr \ + extensions/source/plugin/win/sysplug \ +)) +endif # GUI=WNT + +ifeq ($(GUI),UNX) + +ifeq ($(GUIBASE),aqua) + +$(eval $(call gb_Library_add_exception_objects,pl,\ + extensions/source/plugin/aqua/macmgr \ + extensions/source/plugin/sysplug \ +)) + +$(eval $(call gb_Library_set_include,pl,\ + $$(INCLUDE) \ + -I$(realpath $(FRAMEWORKSHOME)/ApplicationServices.framework/Version/Current/Frameworks/QD.framework/Headers) \ + -I$(realpath $(FRAMEWORKSHOME)/Carbon.framework/Versions/Current/Frameworks/HIToolbox.framework/Versions/Current/Headers) \ +)) + +endif # GUIBASE=aqua + +ifeq ($(ENABLE_GTK),TRUE) +$(eval $(call gb_Library_add_defs,pl,\ + -DENABLE_GTK \ +)) + +$(eval $(call gb_Library_use_external,pl,gtk)) +endif # ENABLE_GTK=TRUE + +$(eval $(call gb_Library_add_exception_objects,pl,\ + extensions/source/plugin/unx/nppapi \ + extensions/source/plugin/unx/sysplug \ + extensions/source/plugin/unx/mediator \ + extensions/source/plugin/unx/plugcon \ + extensions/source/plugin/unx/unxmgr \ +)) + +$(eval $(call gb_Library_add_libs,pl,\ + -lX11 \ +)) + +endif # GUI=UNX + +$(eval $(call gb_Library_add_linked_libs,pl,\ + tk \ + vcl \ + svl \ + utl \ + tl \ + ucbhelper \ + cppuhelper \ + cppu \ + sal \ + salhelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,pl,\ + extensions/source/plugin/base/plctrl \ + extensions/source/plugin/base/service \ + extensions/source/plugin/base/xplugin \ + extensions/source/plugin/base/nfuncs \ + extensions/source/plugin/base/manager \ + extensions/source/plugin/base/context \ + extensions/source/plugin/base/evtlstnr \ + extensions/source/plugin/base/plcom \ + extensions/source/plugin/base/multiplx \ + extensions/source/plugin/base/plmodel \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 78830783761b..dd7c3359fb54 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -52,6 +52,7 @@ endif ifneq ($(WITH_MOZILLA),NO) $(eval $(call gb_Module_add_targets,extensions,\ + Library_pl \ Executable_nsplugin \ )) @@ -64,6 +65,10 @@ endif # GUI=WNT ifeq ($(GUI),UNX) +$(eval $(call gb_Module_add_targets,extensions,\ + Executable_pluginapp.bin \ +)) + ifneq ($(ENABLE_GTK),) $(eval $(call gb_Module_add_targets,extensions,\ Library_npsoplugin \ diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst index e6144e5d14ed..d47b82a57f1a 100644 --- a/extensions/prj/build.lst +++ b/extensions/prj/build.lst @@ -3,17 +3,9 @@ ex extensions : officecfg TRANSLATIONS:translations DESKTOP:rdbmaker svx SANE ex extensions usr1 - all ex_mkout NULL ex extensions\inc nmake - all ex_inc NULL ex extensions\inc\ucbhelper get - all ex_incucbh ex_inc NULL -ex extensions\source\plugin\workben get - all ex_plwkb ex_inc NULL -ex extensions\source\plugin\inc\plugin\win get - all ex_piwi ex_inc NULL -ex extensions\source\plugin\inc\plugin\unx get - all ex_piux ex_inc NULL ex extensions\source\activex\msidl nmake - w ex_axmsidl ex_inc NULL ex extensions\source\activex\main nmake - w ex_axmain ex_axmsidl.w ex_inc NULL ex extensions\source\resource nmake - all ex_resrc ex_inc NULL -ex extensions\source\plugin\aqua nmake - u ex_plaqua ex_plbase NULL -ex extensions\source\plugin\base nmake - all ex_plbase ex_inc NULL -ex extensions\source\plugin\win nmake - w ex_plwin ex_plbase ex_inc NULL -ex extensions\source\plugin\unx nmake - u ex_plunx ex_inc NULL -ex extensions\source\plugin\util nmake - all ex_plutil ex_plbase ex_plunx.u ex_plwin.w ex_plaqua.u ex_inc NULL ex extensions\source\macosx\spotlight nmake - u ex_mxspotlight NULL ex extensions\source\bibliography nmake - all ex_bib ex_inc NULL ex extensions\source\xmlextract nmake - all ex_xmlextr ex_inc NULL @@ -21,7 +13,7 @@ ex extensions\source\dbpilots nmake - all ex_dbpilots ex_i ex extensions\source\abpilot nmake - all ex_abpilot ex_inc NULL ex extensions\source\logging nmake - all ex_logging ex_inc NULL ex extensions\source\config\ldap nmake - all ex_ldap ex_inc NULL -ex extensions\util nmake - all ex_util ex_abpilot ex_dbpilots ex_logging ex_ldap ex_bib ex_plutil NULL +ex extensions\util nmake - all ex_util ex_abpilot ex_dbpilots ex_logging ex_ldap ex_bib NULL ex extensions\prj nmake - all ex_prj NULL # Fails at the moment diff --git a/extensions/source/plugin/aqua/makefile.mk b/extensions/source/plugin/aqua/makefile.mk deleted file mode 100644 index 8d1aaa484d28..000000000000 --- a/extensions/source/plugin/aqua/makefile.mk +++ /dev/null @@ -1,63 +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=extensions -TARGET=plaqua - -.INCLUDE : ..$/util$/makefile.pmk - -.IF "$(GUIBASE)"!="aqua" || "$(WITH_MOZILLA)"=="NO" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)." - -.ELSE - -# --- Files -------------------------------------------------------- - -INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin -.IF "$(SOLAR_JAVA)" != "" -INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java -INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr -INCPRE+=-I$(SOLARINCDIR)$/npsdk -CDEFS+=-DOJI -.ENDIF - -.IF "$(GUIBASE)"=="aqua" -CFLAGSCXX+=$(OBJCXXFLAGS) -.ENDIF # "$(GUIBASE)"=="aqua" - -SLOFILES=\ - $(SLO)$/macmgr.obj \ - $(SLO)$/sysplug.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.ENDIF # $(GUIBASE)==aqua diff --git a/extensions/source/plugin/base/makefile.mk b/extensions/source/plugin/base/makefile.mk deleted file mode 100644 index a7e28f8deae5..000000000000 --- a/extensions/source/plugin/base/makefile.mk +++ /dev/null @@ -1,65 +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=extensions -TARGET=plbase -TARGETTYPE=GUI -ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : ..$/util$/makefile.pmk - -INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin -.IF "$(SOLAR_JAVA)" != "" -INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java -INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr -.ENDIF - -.IF "$(WITH_MOZILLA)" != "NO" - -.IF "$(GUIBASE)"=="aqua" -CFLAGSCXX+=$(OBJCXXFLAGS) -.ENDIF # "$(GUIBASE)"=="aqua" - -SLOFILES= \ - $(SLO)$/plctrl.obj \ - $(SLO)$/service.obj \ - $(SLO)$/xplugin.obj \ - $(SLO)$/nfuncs.obj \ - $(SLO)$/manager.obj \ - $(SLO)$/context.obj \ - $(SLO)$/evtlstnr.obj \ - $(SLO)$/plcom.obj \ - $(SLO)$/multiplx.obj \ - $(SLO)$/plmodel.obj - -.ENDIF # $(WITH_MOZILLA) != "NO" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/extensions/source/plugin/util/pl.component b/extensions/source/plugin/pl.component index 4a9d98f7dc7b..4a9d98f7dc7b 100644 --- a/extensions/source/plugin/util/pl.component +++ b/extensions/source/plugin/pl.component diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk deleted file mode 100644 index 9dcdf1ace314..000000000000 --- a/extensions/source/plugin/unx/makefile.mk +++ /dev/null @@ -1,104 +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=extensions -TARGET=plunx -TARGETTYPE=CUI -ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : ..$/util$/makefile.pmk - -.IF "$(GUIBASE)"=="aqua" -dummy: - @echo "Nothing to build for GUIBASE aqua." - -.ELSE - -# --- Files -------------------------------------------------------- - -INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin -.IF "$(SOLAR_JAVA)" != "" -INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java -INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr -CDEFS+=-DOJI -.ENDIF - -.IF "$(WITH_MOZILLA)" != "NO" - -SLOFILES=\ - $(SLO)$/nppapi.obj \ - $(SLO)$/sysplug.obj \ - $(SLO)$/mediator.obj \ - $(SLO)$/plugcon.obj \ - $(SLO)$/unxmgr.obj - -OBJFILES=\ - $(OBJ)$/npwrap.obj \ - $(OBJ)$/npnapi.obj \ - $(OBJ)$/mediator.obj \ - $(OBJ)$/plugcon.obj - -APP1TARGET=pluginapp.bin -APP1OBJS=$(OBJFILES) -APP1STDLIBS= $(SALLIB) - -.IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" -APP1STDLIBS+=-lXm -lXt $(X11LINK_DYNAMIC) -ldl -.ELSE -.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD" || "$(OS)"=="DRAGONFLY" -APP1STDLIBS+= -lXt -lXext -lX11 -.ELIF "$(OS)"=="AIX" -APP1STDLIBS+= -lXpm -lXmu -lXt $(X11LINK_DYNAMIC) -ldl -.ELSE -APP1STDLIBS+= -lXt $(X11LINK_DYNAMIC) -ldl -.ENDIF -.ENDIF - -.IF "$(ENABLE_GTK)" == "TRUE" -# libs for gtk plugin -APP1STDLIBS+=$(PKGCONFIG_LIBS:s/ -lpangoxft-1.0//) -# hack for faked SO environment -.IF "$(PKGCONFIG_ROOT)"!="" -.IF "$(OS)" == "SOLARIS" -# don't ask, it's ugly -DIRECT :=-z nodefs $(DIRECT) -.ENDIF -.ENDIF # "$(PKGCONFIG_ROOT)"!="" -.ENDIF - - -APP1DEF= $(MISC)$/$(TARGET).def - -.ENDIF # $(WITH_MOZILLA) != "NO" - -.ENDIF # $(GUIBASE)==aqua - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk deleted file mode 100644 index 7b7d047a1779..000000000000 --- a/extensions/source/plugin/util/makefile.mk +++ /dev/null @@ -1,109 +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=extensions -TARGET=pl -TARGETTYPE=GUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(WITH_MOZILLA)" != "NO" - -LIB1TARGET = $(SLB)$/plall.lib -LIB1FILES = \ - $(SLB)$/plbase.lib \ - $(SHL1LINKLIB) - -.IF "$(GUI)" == "UNX" -.IF "$(GUIBASE)"=="aqua" -.IF "$(WITH_MOZILLA)"=="YES" -SHL1LINKLIB = $(SLB)$/plaqua.lib -.ENDIF -.ELSE -SHL1LINKLIB = $(SLB)$/plunx.lib -.ENDIF # $(GUIBASE)==aqua -.IF "$(OS)" == "SOLARIS" -SHL1OWNLIBS = -lsocket -.ENDIF # SOLARIS -.ENDIF # UNX - -.IF "$(GUI)" == "WNT" -SHL1LINKLIB = $(SLB)$/plwin.lib -SHL1OWNLIBS = \ - $(VERSIONLIB) \ - $(OLE32LIB) \ - $(ADVAPI32LIB) -.ENDIF # WNT - -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -SHL1IMPLIB= i$(TARGET) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -SHL1LIBS=$(LIB1TARGET) - -SHL1STDLIBS+= \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(SALHELPERLIB) - -.IF "$(GUIBASE)"=="unx" -SHL1STDLIBS+=$(X11LINK_DYNAMIC) -.ENDIF - -SHL1STDLIBS+=$(SHL1OWNLIBS) - -.ENDIF # $(WITH_MOZILLA) != "NO" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - - - -ALLTAR : $(MISC)/pl.component - -$(MISC)/pl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - pl.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt pl.component diff --git a/extensions/source/plugin/util/makefile.pmk b/extensions/source/plugin/util/makefile.pmk deleted file mode 100644 index 0f06ea2a50ce..000000000000 --- a/extensions/source/plugin/util/makefile.pmk +++ /dev/null @@ -1,48 +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. -# -#************************************************************************* -NOUNODOC=true - -.INCLUDE : settings.mk - -.IF "$(SYSTEM_MOZILLA)" == "YES" -CFLAGS+=-DSYSTEM_MOZILLA -PKGCONFIG_MODULES+=$(MOZ_FLAVOUR)-plugin -.ENDIF - -.IF "$(GUIBASE)" == "unx" && "$(ENABLE_GTK)" == "TRUE" -CDEFS+=-DENABLE_GTK -PKGCONFIG_MODULES+=gtk+-2.0 gthread-2.0 -.ENDIF - -.IF "$(GUIBASE)" == "aqua" -CFLAGS += -I$(FRAMEWORKSHOME)/ApplicationServices.framework/Versions/Current/Frameworks/QD.framework/Headers\ - -I$(FRAMEWORKSHOME)/Carbon.framework/Versions/Current/Frameworks/HIToolbox.framework/Versions/Current/Headers -.ENDIF - -.IF "$(PKGCONFIG_MODULES)" != "" -.INCLUDE : pkg_config.mk -.ENDIF diff --git a/extensions/source/plugin/win/makefile.mk b/extensions/source/plugin/win/makefile.mk deleted file mode 100644 index 7f676ac16748..000000000000 --- a/extensions/source/plugin/win/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=extensions -TARGET=plwin -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- -.IF "$(GUI)" == "WNT" - -.INCLUDE : ..$/util$/makefile.pmk - -INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin -.IF "$(SOLAR_JAVA)" != "" -INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java -INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr -CDEFS+=-DOJI -.ENDIF - -# --- Types ------------------------------------- - -.IF "$(WITH_MOZILLA)" != "NO" -SLOFILES = $(SLO)$/winmgr.obj \ - $(SLO)$/sysplug.obj -.ENDIF # $(WITH_MOZILLA) != "NO" - -.ENDIF - -# ------------------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 2ffa9775cc87..c9e7a2df68f6 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -272,7 +272,7 @@ my_components += ldapbe2 .END .IF "$(WITH_MOZILLA)" != "NO" -my_components += pl +my_components += component/extensions/source/plugin/pl .END .IF "$(ENABLE_XMLSEC)" == "YES" |