diff options
Diffstat (limited to 'twain')
| -rw-r--r-- | twain/Makefile | 38 | ||||
| -rw-r--r-- | twain/Module_twain.mk | 36 | ||||
| -rw-r--r-- | twain/Package_inc.mk | 32 | ||||
| -rw-r--r-- | twain/prj/build.lst | 3 | ||||
| -rw-r--r-- | twain/prj/d.lst | 3 | ||||
| -rw-r--r-- | twain/prj/makefile.mk (renamed from twain/util/makefile.mk) | 21 |
6 files changed, 118 insertions, 15 deletions
diff --git a/twain/Makefile b/twain/Makefile new file mode 100644 index 000000000000..5bedaf0b9dcf --- /dev/null +++ b/twain/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(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/twain/Module_twain.mk b/twain/Module_twain.mk new file mode 100644 index 000000000000..f66b41bbddce --- /dev/null +++ b/twain/Module_twain.mk @@ -0,0 +1,36 @@ +# +# 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_Module_Module,twain)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Module_add_targets,twain,\ + Package_inc \ +)) +endif diff --git a/twain/Package_inc.mk b/twain/Package_inc.mk new file mode 100644 index 000000000000..d2c14ed2efc2 --- /dev/null +++ b/twain/Package_inc.mk @@ -0,0 +1,32 @@ +# +# 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_Package_Package,twain_inc,$(SRCDIR)/twain/inc)) + +$(eval $(call gb_Package_add_file,twain_inc,inc/external/twain/twain.h,twain.h)) diff --git a/twain/prj/build.lst b/twain/prj/build.lst index cfeab258dc06..875fc98e15a6 100644 --- a/twain/prj/build.lst +++ b/twain/prj/build.lst @@ -1,3 +1,2 @@ tw twain : solenv NULL -tw twain usr1 - all tw_mkout NULL -tw twain\util nmake - n tw_util NULL +tw twain\prj nmake - all tw_util NULL diff --git a/twain/prj/d.lst b/twain/prj/d.lst index 0827b03d1cd9..e69de29bb2d1 100644 --- a/twain/prj/d.lst +++ b/twain/prj/d.lst @@ -1,3 +0,0 @@ -mkdir: %_DEST%\inc\external -mkdir: %_DEST%\inc\external\twain -..\%__SRC%\inc\twain.h %_DEST%\inc\external\twain\twain.h diff --git a/twain/util/makefile.mk b/twain/prj/makefile.mk index 043de88badb2..85b25665cc83 100644 --- a/twain/util/makefile.mk +++ b/twain/prj/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # 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 @@ -25,15 +25,16 @@ # #************************************************************************* -PRJ := .. -PRJNAME := twain -TARGET := twain +PRJ=.. +TARGET=prj -.INCLUDE: settings.mk -.INCLUDE: target.mk +.INCLUDE : settings.mk -ALLTAR: $(OUT)$/inc$/twain.h +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF -$(OUT)$/inc$/%: $(PRJ)$/inc$/% - - $(MKDIR) $(@:d) - $(COPY) $< $@ +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog |