use package instead of explicit include path

Change-Id: I11048d24b21549aa3ae79995a2c252c00e56d771

codemaker/Executable_cppumaker.mk

@@ -26,11 +26,6 @@
 
 $(eval $(call gb_Executable_Executable,cppumaker))
 
-$(eval $(call gb_Executable_set_include,cppumaker,\
-    -I$(SRCDIR)/codemaker/inc \
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,cppumaker,\
     reg \
     sal \

codemaker/Executable_javamaker.mk

@@ -26,11 +26,6 @@
 
 $(eval $(call gb_Executable_Executable,javamaker))
 
-$(eval $(call gb_Executable_set_include,javamaker,\
-    -I$(SRCDIR)/codemaker/inc \
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,javamaker,\
     reg \
     sal \

codemaker/StaticLibrary_codemaker.mk

@@ -28,14 +28,10 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker))
 
 $(eval $(call gb_StaticLibrary_use_packages,codemaker,\
+	codemaker_inc \
 	sal_generated \
 ))
 
-$(eval $(call gb_StaticLibrary_set_include,codemaker,\
-    -I$(SRCDIR)/codemaker/inc \
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker,\
 	codemaker/source/codemaker/dependencies \
 	codemaker/source/codemaker/exceptiontree \

codemaker/StaticLibrary_codemaker_cpp.mk

@@ -27,9 +27,8 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_cpp))
 
-$(eval $(call gb_StaticLibrary_set_include,codemaker_cpp,\
-    -I$(SRCDIR)/codemaker/inc \
-    $$(INCLUDE) \
+$(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\
+    codemaker_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_cpp,\

codemaker/StaticLibrary_codemaker_java.mk

@@ -27,9 +27,8 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_java))
 
-$(eval $(call gb_StaticLibrary_set_include,codemaker_java,\
-    -I$(SRCDIR)/codemaker/inc \
-    $$(INCLUDE) \
+$(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\
+    codemaker_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\