helpcompiler: remove Package_inc

Change-Id: Iddafa9068edcc20135c08ed205b8fb7fb5382eba

13 files changed, 14 insertions, 37 deletions

diff --git a/helpcompiler/Executable_helpindexer.mk b/helpcompiler/Executable_helpindexer.mk
index b3caa8e07e26..5fee9f7a64f4 100644
--- a/helpcompiler/Executable_helpindexer.mk
+++ b/helpcompiler/Executable_helpindexer.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Executable_Executable,HelpIndexer))
 
-$(eval $(call gb_Executable_use_package,HelpIndexer,\
-    helpcompiler_inc \
-))
-
 $(eval $(call gb_Executable_use_libraries,HelpIndexer,\
     sal \
-    helplinker \
+	helplinker \
 ))
 
 $(eval $(call gb_Executable_use_externals,HelpIndexer,\
diff --git a/helpcompiler/Executable_helplinker.mk b/helpcompiler/Executable_helplinker.mk
index 2aac463fdb2f..2825aadf3b2e 100644
--- a/helpcompiler/Executable_helplinker.mk
+++ b/helpcompiler/Executable_helplinker.mk
@@ -9,8 +9,9 @@
 
 $(eval $(call gb_Executable_Executable,HelpLinker))
 
-$(eval $(call gb_Executable_use_package,HelpLinker,\
-    helpcompiler_inc \
+$(eval $(call gb_Executable_set_include,HelpLinker,\
+	-I$(SRCDIR)/helpcompiler/inc \
+	$$(INCLUDE) \
 ))
 
 $(eval $(call gb_Executable_use_libraries,HelpLinker,\
diff --git a/helpcompiler/Library_helplinker.mk b/helpcompiler/Library_helplinker.mk
index 4487d95f370f..80c2d189438e 100644
--- a/helpcompiler/Library_helplinker.mk
+++ b/helpcompiler/Library_helplinker.mk
@@ -9,8 +9,9 @@
 
 $(eval $(call gb_Library_Library,helplinker))
 
-$(eval $(call gb_Library_use_package,helplinker,\
-    helpcompiler_inc\
+$(eval $(call gb_Library_set_include,helplinker,\
+	-I$(SRCDIR)/helpcompiler/inc \
+	$$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_defs,helplinker,\
diff --git a/helpcompiler/Module_helpcompiler.mk b/helpcompiler/Module_helpcompiler.mk
index d6ec0651ed08..f4e0923a50db 100644
--- a/helpcompiler/Module_helpcompiler.mk
+++ b/helpcompiler/Module_helpcompiler.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_Module_add_targets,helpcompiler,\
     Executable_helpindexer \
     Executable_helplinker \
     Library_helplinker \
-    Package_inc \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/helpcompiler/Package_inc.mk b/helpcompiler/Package_inc.mk
deleted file mode 100644
index e532d951a0fc..000000000000
--- a/helpcompiler/Package_inc.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# 
-
-$(eval $(call gb_Package_Package,helpcompiler_inc,$(SRCDIR)/helpcompiler))
-
-$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/dllapi.h,inc/dllapi.h))
-$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/compilehelp.hxx,inc/compilehelp.hxx))
-$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/HelpCompiler.hxx,inc/HelpCompiler.hxx))
-$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/HelpIndexer.hxx,inc/HelpIndexer.hxx))
-$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/HelpLinker.hxx,inc/HelpLinker.hxx))
-$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/HelpSearch.hxx,inc/HelpSearch.hxx))
-$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/BasCodeTagger.hxx,inc/BasCodeTagger.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/helpcompiler/source/BasCodeTagger.cxx b/helpcompiler/source/BasCodeTagger.cxx
index fdc81db83c67..d394e1aad531 100644
--- a/helpcompiler/source/BasCodeTagger.cxx
+++ b/helpcompiler/source/BasCodeTagger.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <helpcompiler/BasCodeTagger.hxx>
+#include <BasCodeTagger.hxx>
 
 LibXmlTreeWalker::LibXmlTreeWalker( xmlDocPtr doc )
 {
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 628560508910..1abcfbac6d3c 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include <helpcompiler/HelpCompiler.hxx>
-#include <helpcompiler/BasCodeTagger.hxx>
+#include <HelpCompiler.hxx>
+#include <BasCodeTagger.hxx>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
index e122feeb62ea..b50b2ce301f3 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <helpcompiler/HelpCompiler.hxx>
-#include <helpcompiler/HelpLinker.hxx>
+#include <HelpCompiler.hxx>
+#include <HelpLinker.hxx>
 
 #include <map>
 
diff --git a/helpcompiler/source/HelpLinker_main.cxx b/helpcompiler/source/HelpLinker_main.cxx
index 8542a761f5df..83906830b21c 100644
--- a/helpcompiler/source/HelpLinker_main.cxx
+++ b/helpcompiler/source/HelpLinker_main.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <helpcompiler/HelpCompiler.hxx>
-#include <helpcompiler/HelpLinker.hxx>
+#include <HelpCompiler.hxx>
+#include <HelpLinker.hxx>
 #include <iostream>
 #include <sal/main.h>
 
diff --git a/helpcompiler/inc/HelpIndexer.hxx b/include/helpcompiler/HelpIndexer.hxx
index 4be40eb827ce..4be40eb827ce 100644
--- a/helpcompiler/inc/HelpIndexer.hxx
+++ b/include/helpcompiler/HelpIndexer.hxx
diff --git a/helpcompiler/inc/HelpSearch.hxx b/include/helpcompiler/HelpSearch.hxx
index a28af890ceb7..a28af890ceb7 100644
--- a/helpcompiler/inc/HelpSearch.hxx
+++ b/include/helpcompiler/HelpSearch.hxx
diff --git a/helpcompiler/inc/compilehelp.hxx b/include/helpcompiler/compilehelp.hxx
index 4ef706d32388..4ef706d32388 100644
--- a/helpcompiler/inc/compilehelp.hxx
+++ b/include/helpcompiler/compilehelp.hxx
diff --git a/helpcompiler/inc/dllapi.h b/include/helpcompiler/dllapi.h
index c82395272134..c82395272134 100644
--- a/helpcompiler/inc/dllapi.h
+++ b/include/helpcompiler/dllapi.h