summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-04-09 10:08:01 +0200
committerDavid Tardon <dtardon@redhat.com>2012-04-09 10:09:23 +0200
commit2753a9904ce4caeeacca5eb2987319dc179c428b (patch)
tree1bc15c73f25aad2a4b87f6fe4223fd4cb4b56357 /dbaccess
parent6de739282998cecb83029bb1f53c8698d3515eee (diff)
do not put things directly into $(WORKDIR)
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/AllLangResTarget_dbu.mk2
-rw-r--r--dbaccess/AllLangResTarget_dbui.mk2
-rw-r--r--dbaccess/Library_dbu.mk12
3 files changed, 4 insertions, 12 deletions
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index a8e17f88bbad..1e353af39275 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/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 \
))
diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk
index c22b4d1e3652..fe37557c1637 100644
--- a/dbaccess/AllLangResTarget_dbui.mk
+++ b/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 \
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 727568e1704f..44d75b582faa 100644
--- a/dbaccess/Library_dbu.mk
+++ b/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: