diff options
| -rw-r--r-- | solenv/Module_solenv.mk | 1 | ||||
| -rw-r--r-- | solenv/Package_minor.mk | 33 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 6 |
3 files changed, 34 insertions, 6 deletions
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk index 3fa34ff694d7..d107f9a6d1a9 100644 --- a/solenv/Module_solenv.mk +++ b/solenv/Module_solenv.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Module_Module,solenv)) $(eval $(call gb_Module_add_targets,solenv,\ CustomTarget_versionlist \ Package_inc \ + Package_minor \ )) ifeq ($(GUI),UNX) diff --git a/solenv/Package_minor.mk b/solenv/Package_minor.mk new file mode 100644 index 000000000000..7ea056ae0b88 --- /dev/null +++ b/solenv/Package_minor.mk @@ -0,0 +1,33 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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) 2012 Red Hat, Inc., David Tardon <dtardon@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_Package_Package,solenv_minor_mk,$(SRCDIR)/solenv/inc)) + +$(eval $(call gb_Package_add_file,solenv_minor_mk,inc/$(UPD)minor.mk,minor.mk)) +$(eval $(call gb_Package_add_file,solenv_minor_mk,inc/minormkchanged.flg,minor.mk)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 1eeba4ff311b..9d01c5eff57d 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -50,12 +50,6 @@ EXTNAME*=$(EXTENSIONNAME)_in WRONG_SOURCEVERSION .ENDIF -# Create $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk if needed -%minor.mk : $(SOLARENV)/inc/minor.mk - @@-$(MKDIRHIER) $(SOLARVERSION)/$(INPATH)/inc - @@$(COPY) $(SOLARENV)/inc/minor.mk $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk - @@$(TOUCH) $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg - # Force creation of $(SOLARVERSION)/$(INPATH)/inc/ # $(UPD)minor.mk could be empty as it's contents were already included from minor.mk .INCLUDE : $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk |