do not put things directly into $(WORKDIR)

chart2/AllLangResTarget_chartcontroller.mk

@@ -49,7 +49,7 @@ $(eval $(call gb_SrsTarget_set_include,chart2/res,\
     -I$(SRCDIR)/chart2/source/controller/inc \
     -I$(SRCDIR)/chart2/source/controller/main \
     -I$(SRCDIR)/chart2/source/inc \
-    -I$(WORKDIR)/inc/chart2 \
+    -I$(call gb_SrsTemplateTarget_get_include_dir,chart2) \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,chart2/res,\

dbaccess/AllLangResTarget_dbu.mk

@@ -45,7 +45,7 @@ $(eval $(call gb_SrsTarget_use_packages,dbaccess/dbu,\
 
 $(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\
     $$(INCLUDE) \
-    -I$(WORKDIR)/inc/dbaccess \
+	-I$(call gb_SrsTemplateTarget_get_include_dir,dbaccess) \
     -I$(SRCDIR)/dbaccess/inc \
     -I$(SRCDIR)/dbaccess/source/ui/inc \
 ))

dbaccess/AllLangResTarget_dbui.mk

@@ -44,7 +44,7 @@ $(eval $(call gb_SrsTarget_use_package,dbaccess/dbui,\
 
 $(eval $(call gb_SrsTarget_set_include,dbaccess/dbui,\
 	$$(INCLUDE) \
-	-I$(WORKDIR)/inc/dbaccess \
+	-I$(call gb_SrsTemplateTarget_get_include_dir,dbaccess) \
 	-I$(SRCDIR)/dbaccess/source/ui/inc \
 	-I$(SRCDIR)/dbaccess/source/ui/dlg \
 	-I$(SRCDIR)/dbaccess/inc \

dbaccess/Library_dbu.mk

@@ -32,7 +32,7 @@ $(eval $(call gb_Library_set_include,dbu,\
     -I$(SRCDIR)/dbaccess/inc \
     -I$(SRCDIR)/dbaccess/source/inc \
     -I$(SRCDIR)/dbaccess/source/ui/inc \
-    -I$(WORKDIR)/inc/dbaccess \
+    -I$(call gb_SrsTemplateTarget_get_include_dir,dbaccess) \
 ))
 
 $(eval $(call gb_Library_use_api,dbu,\
@@ -290,14 +290,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
 ))
 endif
 
-$(foreach object,\
-    dbaccess/source/ui/dlg/ConnectionHelper \
-    dbaccess/source/ui/dlg/ConnectionPage \
-    dbaccess/source/ui/dlg/ConnectionPageSetup \
-    dbaccess/source/ui/dlg/DBSetupConnectionPages \
-    dbaccess/source/ui/dlg/detailpages \
-    dbaccess/source/ui/dlg/tablespage \
-    dbaccess/source/ui/dlg/TextConnectionHelper \
-	,$(eval $(call gb_CxxObject_get_target,$(object)) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc))
+$(call gb_Library_get_headers_target,dbu) : $(call gb_SrsTemplateTarget_get_include_dir,dbaccess)/AutoControls.hrc
 
 # vim: set noet sw=4 ts=4:

sd/AllLangResTarget_sd.mk

@@ -50,7 +50,7 @@ $(eval $(call gb_SrsTarget_set_include,sd/res,\
     -I$(SRCDIR)/sd/inc \
     -I$(SRCDIR)/sd/source/ui/inc \
     -I$(SRCDIR)/sd/source/ui/slidesorter/inc \
-    -I$(WORKDIR)/inc/sd \
+    -I$(call gb_SrsTemplateTarget_get_include_dir,sd) \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,sd/res,\

solenv/gbuild/TargetLocations.mk

@@ -124,7 +124,8 @@ gb_SrsPartMergeTarget_get_target = $(WORKDIR)/SrsPartMergeTarget/$(1)
 gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
 gb_SrsTarget_get_external_headers_target = $(WORKDIR)/ExternalHeaders/SrsTarget/$(1)
 gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
-gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/inc/$(firstword $(subst /, ,$(1)))/$(subst _tmpl,,$(notdir $(1)))
+gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1)))/$(subst _tmpl,,$(notdir $(1)))
+gb_SrsTemplateTarget_get_include_dir = $(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1)))
 gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
 gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
 gb_UnoApiHeadersTarget_get_bootstrap_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap

svx/AllLangResTarget_svx.mk

@@ -48,7 +48,7 @@ $(eval $(call gb_SrsTarget_use_packages,svx/res,\
 
 $(eval $(call gb_SrsTarget_set_include,svx/res,\
     $$(INCLUDE) \
-    -I$(WORKDIR)/inc/svx \
+    -I$(call gb_SrsTemplateTarget_get_include_dir,svx) \
     -I$(SRCDIR)/svx/source/inc \
     -I$(SRCDIR)/svx/source/dialog \
     -I$(SRCDIR)/svx/inc/ \

svx/Package_globlmn_hrc.mk

@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Package_Package,svx_globlmn_hrc,$(WORKDIR)/inc/svx))
+$(eval $(call gb_Package_Package,svx_globlmn_hrc,$(call gb_SrsTemplateTarget_get_include_dir,svx)))
 
 $(eval $(call gb_Package_add_file,svx_globlmn_hrc,inc/svx/globlmn.hrc,globlmn.hrc))