move addins out of offapi again

11 files changed, 61 insertions, 14 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 11c0d3739724..4747164b09e6 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1131,16 +1131,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\
 	UniqueCellFormatRangesEnumeration \
 	VolatileResult \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet/addin,\
-	XAnalysis \
-	XCompatibilityNames \
-	XDateFunctions \
-	XMiscFunctions \
-))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet/addin,\
-	Analysis \
-	DateFunctions \
-))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/style,\
 	CellStyle \
 	CharacterProperties \
diff --git a/scaddins/InternalUnoApi_scaddins.mk b/scaddins/InternalUnoApi_scaddins.mk
new file mode 100644
index 000000000000..ad796648fdfb
--- /dev/null
+++ b/scaddins/InternalUnoApi_scaddins.mk
@@ -0,0 +1,54 @@
+# -*- 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_InternalUnoApi_InternalUnoApi,scaddins))
+
+$(eval $(call gb_InternalUnoApi_add_api,scaddins,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_InternalUnoApi_add_api_dependencies,scaddins,offapi,\
+    udkapi \
+))
+
+$(eval $(call gb_InternalUnoApi_set_include,scaddins,\
+    -I$(SRCDIR)/scaddins/idl \
+    -I$(OUTDIR)/idl \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_InternalUnoApi_add_idlfiles,scaddins,scaddins/idl/com/sun/star/sheet/addin,\
+    Analysis \
+    DateFunctions \
+    XAnalysis \
+    XCompatibilityNames \
+    XDateFunctions \
+    XMiscFunctions \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk
index 1e016657c4a4..42038e74b74b 100644
--- a/scaddins/Library_analysis.mk
+++ b/scaddins/Library_analysis.mk
@@ -35,8 +35,9 @@ $(eval $(call gb_Library_set_include,analysis,\
     -I$(realpath $(SRCDIR)/scaddins/source/analysis) \
 ))
 
-$(eval $(call gb_Library_add_api,analysis,\
-    offapi \
+$(eval $(call gb_Library_add_internal_comprehensive_api,analysis,\
+	offapi \
+	scaddins \
     udkapi \
 ))
 
diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk
index 2cbf0e56bdbd..ca3fad8978bf 100644
--- a/scaddins/Library_date.mk
+++ b/scaddins/Library_date.mk
@@ -35,8 +35,9 @@ $(eval $(call gb_Library_set_include,date,\
     -I$(realpath $(SRCDIR)/scaddins/source/datefunc) \
 ))
 
-$(eval $(call gb_Library_add_api,date,\
-    offapi \
+$(eval $(call gb_Library_add_internal_comprehensive_api,date,\
+	offapi \
+	scaddins \
     udkapi \
 ))
 
diff --git a/scaddins/Module_scaddins.mk b/scaddins/Module_scaddins.mk
index 8d1e7c7c7981..2e0bb1969129 100644
--- a/scaddins/Module_scaddins.mk
+++ b/scaddins/Module_scaddins.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Module_Module,scaddins))
 $(eval $(call gb_Module_add_targets,scaddins,\
     AllLangResTarget_analysis \
     AllLangResTarget_date \
+	InternalUnoApi_scaddins \
     Library_analysis \
     Library_date \
 ))
diff --git a/offapi/com/sun/star/sheet/addin/Analysis.idl b/scaddins/idl/com/sun/star/sheet/addin/Analysis.idl
index 2e1ad523e615..2e1ad523e615 100644
--- a/offapi/com/sun/star/sheet/addin/Analysis.idl
+++ b/scaddins/idl/com/sun/star/sheet/addin/Analysis.idl
diff --git a/offapi/com/sun/star/sheet/addin/DateFunctions.idl b/scaddins/idl/com/sun/star/sheet/addin/DateFunctions.idl
index 5411284b94f9..5411284b94f9 100644
--- a/offapi/com/sun/star/sheet/addin/DateFunctions.idl
+++ b/scaddins/idl/com/sun/star/sheet/addin/DateFunctions.idl
diff --git a/offapi/com/sun/star/sheet/addin/XAnalysis.idl b/scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl
index 1cb001851aaf..1cb001851aaf 100644
--- a/offapi/com/sun/star/sheet/addin/XAnalysis.idl
+++ b/scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl
diff --git a/offapi/com/sun/star/sheet/addin/XCompatibilityNames.idl b/scaddins/idl/com/sun/star/sheet/addin/XCompatibilityNames.idl
index fade59e835b3..fade59e835b3 100644
--- a/offapi/com/sun/star/sheet/addin/XCompatibilityNames.idl
+++ b/scaddins/idl/com/sun/star/sheet/addin/XCompatibilityNames.idl
diff --git a/offapi/com/sun/star/sheet/addin/XDateFunctions.idl b/scaddins/idl/com/sun/star/sheet/addin/XDateFunctions.idl
index 773a1ff67f57..773a1ff67f57 100644
--- a/offapi/com/sun/star/sheet/addin/XDateFunctions.idl
+++ b/scaddins/idl/com/sun/star/sheet/addin/XDateFunctions.idl
diff --git a/offapi/com/sun/star/sheet/addin/XMiscFunctions.idl b/scaddins/idl/com/sun/star/sheet/addin/XMiscFunctions.idl
index dd5189cc401f..dd5189cc401f 100644
--- a/offapi/com/sun/star/sheet/addin/XMiscFunctions.idl
+++ b/scaddins/idl/com/sun/star/sheet/addin/XMiscFunctions.idl