[Libreoffice-commits] .: solenv/inc solenv/Module_solenv.mk solenv/Package_minor.mk

[David Tardon]

 solenv/Module_solenv.mk |    1 +
 solenv/Package_minor.mk |   33 +++++++++++++++++++++++++++++++++
 solenv/inc/settings.mk  |    6 ------
 3 files changed, 34 insertions(+), 6 deletions(-)

New commits:
commit 41cf973f84f42c0605fdd9e8c5f307be888c2f89
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 15:06:11 2012 +0200

    $(OUTDIR)/inc/*minor.mk is created my gbuild now
    
    Actually I think it should be removed entirely, because dmake already
    includes minor.mk directly from solenv, but I do not want to pry into it
    right now...
    
    Change-Id: I51520642f4796d722cb2131e91e9e92a82920531

diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index 3fa34ff..d107f9a 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 0000000..7ea056a
--- /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 at 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 1eeba4f..9d01c5e 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