From aee561af31453735d88854020699b2eaecf943a0 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sun, 18 Sep 2011 11:23:59 -0400 Subject: convert sane to gbuild --- sane/Makefile | 38 ++++++++++++++++++++++++++++++++++++++ sane/Module_sane.mk | 34 ++++++++++++++++++++++++++++++++++ sane/Package_inc.mk | 32 ++++++++++++++++++++++++++++++++ sane/prj/build.lst | 3 +-- sane/prj/d.lst | 3 --- sane/prj/makefile.mk | 40 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 145 insertions(+), 5 deletions(-) create mode 100644 sane/Makefile create mode 100644 sane/Module_sane.mk create mode 100644 sane/Package_inc.mk create mode 100644 sane/prj/makefile.mk (limited to 'sane') diff --git a/sane/Makefile b/sane/Makefile new file mode 100644 index 000000000000..5bedaf0b9dcf --- /dev/null +++ b/sane/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 +# +# 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/sane/Module_sane.mk b/sane/Module_sane.mk new file mode 100644 index 000000000000..f77ea2e19e7a --- /dev/null +++ b/sane/Module_sane.mk @@ -0,0 +1,34 @@ +# +# 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 +# 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,sane)) + +$(eval $(call gb_Module_add_targets,sane,\ + Package_inc \ +)) diff --git a/sane/Package_inc.mk b/sane/Package_inc.mk new file mode 100644 index 000000000000..f5816d81465e --- /dev/null +++ b/sane/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 +# 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,sane_inc,$(SRCDIR)/sane/inc)) + +$(eval $(call gb_Package_add_file,sane_inc,inc/external/sane/sane.h,sane.h)) diff --git a/sane/prj/build.lst b/sane/prj/build.lst index c1c6fb90bfdc..a6576ebadacd 100644 --- a/sane/prj/build.lst +++ b/sane/prj/build.lst @@ -1,3 +1,2 @@ sa sane : solenv NULL -sa sane usr1 - all sa_mkout NULL -sa sane\prj get - all sa_prj NULL +sa sane\prj nmake - all sa_prj NULL diff --git a/sane/prj/d.lst b/sane/prj/d.lst index f59282160ddb..e69de29bb2d1 100644 --- a/sane/prj/d.lst +++ b/sane/prj/d.lst @@ -1,3 +0,0 @@ -mkdir: %_DEST%\inc\external -mkdir: %_DEST%\inc\external\sane -..\inc\sane.h %_DEST%\inc\external\sane\sane.h diff --git a/sane/prj/makefile.mk b/sane/prj/makefile.mk new file mode 100644 index 000000000000..85b25665cc83 --- /dev/null +++ b/sane/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog -- cgit