helpcompiler: remove Package_inc

Change-Id: Iddafa9068edcc20135c08ed205b8fb7fb5382eba

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,\

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,\

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,\

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:

helpcompiler/Package_inc.mk

@@ -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:

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 )
 {

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>

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>
 

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>