diff options
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | extensions/AllLangResTarget_san.mk | 44 | ||||
| -rw-r--r-- | extensions/Library_scn.mk | 74 | ||||
| -rw-r--r-- | extensions/Module_extensions.mk | 2 | ||||
| -rw-r--r-- | extensions/prj/build.lst | 1 | ||||
| -rw-r--r-- | extensions/source/scanner/exports.dxp | 1 | ||||
| -rw-r--r-- | extensions/source/scanner/makefile.mk | 104 | ||||
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 2 |
8 files changed, 122 insertions, 107 deletions
diff --git a/Repository.mk b/Repository.mk index 49117f8983f3..65cb29fcbf55 100644 --- a/Repository.mk +++ b/Repository.mk @@ -194,6 +194,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ sc \ scd \ scfilt \ + scn \ scui \ sd \ sdbt \ diff --git a/extensions/AllLangResTarget_san.mk b/extensions/AllLangResTarget_san.mk new file mode 100644 index 000000000000..a866cc9020d3 --- /dev/null +++ b/extensions/AllLangResTarget_san.mk @@ -0,0 +1,44 @@ +# -*- 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. +# +# Major Contributor(s): +# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ] +# +# All Rights Reserved. +# +# 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_AllLangResTarget_AllLangResTarget,san)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,san,extensions/source/scanner)) + +$(eval $(call gb_AllLangResTarget_add_srs,san,\ + scn/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,scn/res)) + +$(eval $(call gb_SrsTarget_add_files,scn/res,\ + extensions/source/scanner/grid.src \ + extensions/source/scanner/sanedlg.src \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk new file mode 100644 index 000000000000..6a165d553100 --- /dev/null +++ b/extensions/Library_scn.mk @@ -0,0 +1,74 @@ + +# -*- 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. +# +# Major Contributor(s): +# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ] +# +# All Rights Reserved. +# +# 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,scn)) + +$(eval $(call gb_Library_set_componentfile,scn,extensions/source/scanner/scn)) + +$(eval $(call gb_Library_add_api,scn,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,scn,\ + svt \ + vcl \ + tl \ + comphelper \ + cppuhelper \ + cppu \ + sal \ +)) + +$(eval $(call gb_Library_add_exception_objects,scn,\ + extensions/source/scanner/scnserv \ + extensions/source/scanner/scanner \ +)) + +ifeq ($(GUI),WNT) +$(eval $(call gb_Library_add_exception_objects,scn,\ + extensions/source/scanner/scanwin \ +)) +else +ifeq ($(GUI),UNX) +$(eval $(call gb_Library_add_exception_objects,scn,\ + extensions/source/scanner/grid \ + extensions/source/scanner/sane \ + extensions/source/scanner/sanedlg \ + extensions/source/scanner/scanunx \ +)) +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,scn,\ + dl \ +)) +endif +endif +endif + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 21a30ab6d044..fbbb8cc4d1cd 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -27,9 +27,11 @@ $(eval $(call gb_Module_Module,extensions)) $(eval $(call gb_Module_add_targets,extensions,\ + AllLangResTarget_san \ AllLangResTarget_upd \ AllLangResTarget_updchk \ Configuration_updchk \ + Library_scn \ Library_updatecheckui \ Library_updatefeed \ Library_updchk \ diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst index 44f22e90beb5..2a9f47c4fca5 100644 --- a/extensions/prj/build.lst +++ b/extensions/prj/build.lst @@ -15,7 +15,6 @@ ex extensions\source\plugin\win nmake - w ex_plwin ex_plba 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\scanner nmake - all ex_scan ex_resrc ex_inc NULL ex extensions\source\bibliography nmake - all ex_bib ex_inc NULL ex extensions\source\xmlextract nmake - all ex_xmlextr ex_inc NULL ex extensions\source\propctrlr nmake - all ex_propctrlr ex_bib ex_inc NULL diff --git a/extensions/source/scanner/exports.dxp b/extensions/source/scanner/exports.dxp deleted file mode 100644 index 70033078921a..000000000000 --- a/extensions/source/scanner/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk deleted file mode 100644 index 60d1900f0b6b..000000000000 --- a/extensions/source/scanner/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=scn -ENABLE_EXCEPTIONS=TRUE -PACKAGE=com$/sun$/star$/scanner -USE_DEFFILE=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/scnserv.obj \ - $(SLO)$/scanner.obj - -.IF "$(GUI)"=="WNT" -SLOFILES+=\ - $(SLO)$/scanwin.obj -.ENDIF - -.IF "$(GUI)"=="UNX" -SLOFILES+=\ - $(SLO)$/sane.obj \ - $(SLO)$/sanedlg.obj \ - $(SLO)$/scanunx.obj \ - $(SLO)$/grid.obj - -.ENDIF - -SRS1NAME=$(TARGET) -SRC1FILES=\ - sanedlg.src \ - grid.src - -RESLIB1NAME=san -RESLIB1IMAGES=$(PRJ)$/source$/scanner -RESLIB1SRSFILES= $(SRS)$/scn.srs -RESLIB1DEPN= sanedlg.src sanedlg.hrc grid.src grid.hrc - -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -SHL1STDLIBS=\ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(COMPHELPERLIB) \ - $(SALLIB) \ - $(ONELIB) \ - $(TOOLSLIB) \ - $(VCLLIB) \ - $(SVTOOLLIB) - -.IF "$(GUI)"=="UNX" && "$(OS)"!="FREEBSD" && \ - "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY" -SHL1STDLIBS+=$(SVTOOLLIB) -ldl -.ENDIF - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1IMPLIB=i$(TARGET) -SHL1LIBS=$(SLB)$/$(TARGET).lib -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/scn.component - -$(MISC)/scn.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - scn.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt scn.component diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 9850d3f1647a..d2496ea342dc 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -173,6 +173,7 @@ my_components += \ component/desktop/source/migration/services/migrationoo3 \ component/desktop/source/offacc/offacc \ component/desktop/source/splash/spl \ + component/extensions/source/scanner/scn \ component/extensions/source/update/check/updchk.uno \ component/extensions/source/update/feed/updatefeed \ component/extensions/source/update/ui/updchk \ @@ -182,7 +183,6 @@ my_components += \ log \ pcr \ res \ - scn \ syssh \ tvhlp1 \ ucpchelp1 \ |