summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2019-06-22 12:34:48 +0200
committerLuboš Luňák <l.lunak@collabora.com>2019-09-23 10:47:25 +0200
commit42af04bf2493508b481b3d6a32c71bd03fa7191b (patch)
treeb5e650d9d7b5b052bf7863434bf5c3668c4478c5 /connectivity
parente2372c4bef2180ab8cbb04128accf6ab40654448 (diff)
do not require $(SRCDIR) in every gb_Library_set_precompiled_header
Change-Id: I7b3a22584bb2e4d501f509ffcd80929feed23a4c Reviewed-on: https://gerrit.libreoffice.org/79360 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/Library_ado.mk2
-rw-r--r--connectivity/Library_calc.mk2
-rw-r--r--connectivity/Library_dbase.mk2
-rw-r--r--connectivity/Library_dbpool2.mk2
-rw-r--r--connectivity/Library_dbtools.mk2
-rw-r--r--connectivity/Library_file.mk2
-rw-r--r--connectivity/Library_firebird_sdbc.mk2
-rw-r--r--connectivity/Library_flat.mk2
-rw-r--r--connectivity/Library_mysql_jdbc.mk2
-rw-r--r--connectivity/Library_odbc.mk2
-rw-r--r--connectivity/Library_postgresql-sdbc-impl.mk2
11 files changed, 11 insertions, 11 deletions
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index 10d1d4f5f38c..f371c2780f8c 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_set_include,ado,\
$(eval $(call gb_Library_use_external,ado,boost_headers))
-$(eval $(call gb_Library_set_precompiled_header,ado,$(SRCDIR)/connectivity/inc/pch/precompiled_ado))
+$(eval $(call gb_Library_set_precompiled_header,ado,connectivity/inc/pch/precompiled_ado))
$(eval $(call gb_Library_use_sdk_api,ado))
diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk
index 5f734f8c2401..1741d01ee519 100644
--- a/connectivity/Library_calc.mk
+++ b/connectivity/Library_calc.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Library_set_include,calc,\
-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
))
-$(eval $(call gb_Library_set_precompiled_header,calc,$(SRCDIR)/connectivity/inc/pch/precompiled_calc))
+$(eval $(call gb_Library_set_precompiled_header,calc,connectivity/inc/pch/precompiled_calc))
$(eval $(call gb_Library_use_libraries,calc,\
cppu \
diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
index 8dcc9c43c50c..6f897391ebf9 100644
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Library_set_include,dbase,\
-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
))
-$(eval $(call gb_Library_set_precompiled_header,dbase,$(SRCDIR)/connectivity/inc/pch/precompiled_dbase))
+$(eval $(call gb_Library_set_precompiled_header,dbase,connectivity/inc/pch/precompiled_dbase))
$(eval $(call gb_Library_use_libraries,dbase,\
cppu \
diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk
index 38b3cd197f01..d4c60675f855 100644
--- a/connectivity/Library_dbpool2.mk
+++ b/connectivity/Library_dbpool2.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_Library_set_include,dbpool2,\
-I$(SRCDIR)/connectivity/source/inc \
))
-$(eval $(call gb_Library_set_precompiled_header,dbpool2,$(SRCDIR)/connectivity/inc/pch/precompiled_dbpool2))
+$(eval $(call gb_Library_set_precompiled_header,dbpool2,connectivity/inc/pch/precompiled_dbpool2))
$(eval $(call gb_Library_use_sdk_api,dbpool2))
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 79723037a5db..d91cdfc553fe 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Library_set_include,dbtools,\
-I$(SRCDIR)/connectivity/source/inc \
))
-#$(eval $(call gb_Library_set_precompiled_header,dbtools,$(SRCDIR)/connectivity/inc/pch/precompiled_dbtools))
+#$(eval $(call gb_Library_set_precompiled_header,dbtools,connectivity/inc/pch/precompiled_dbtools))
$(eval $(call gb_Library_use_external,dbtools,boost_headers))
diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index e6ff6bcfa29d..2ed564a2e7f7 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,file,\
-DOOO_DLLIMPLEMENTATION_FILE \
))
-$(eval $(call gb_Library_set_precompiled_header,file,$(SRCDIR)/connectivity/inc/pch/precompiled_file))
+$(eval $(call gb_Library_set_precompiled_header,file,connectivity/inc/pch/precompiled_file))
$(eval $(call gb_Library_set_include,file,\
$$(INCLUDE) \
diff --git a/connectivity/Library_firebird_sdbc.mk b/connectivity/Library_firebird_sdbc.mk
index e7aae8595604..2c6eb559b033 100644
--- a/connectivity/Library_firebird_sdbc.mk
+++ b/connectivity/Library_firebird_sdbc.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Library_set_include,firebird_sdbc,\
-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
))
-$(eval $(call gb_Library_set_precompiled_header,firebird_sdbc,$(SRCDIR)/connectivity/inc/pch/precompiled_firebird_sdbc))
+$(eval $(call gb_Library_set_precompiled_header,firebird_sdbc,connectivity/inc/pch/precompiled_firebird_sdbc))
$(eval $(call gb_Library_use_libraries,firebird_sdbc, \
comphelper \
diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk
index dd986cd6e6d8..c37b6ae5ed37 100644
--- a/connectivity/Library_flat.mk
+++ b/connectivity/Library_flat.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Library_use_external,flat,boost_headers))
$(eval $(call gb_Library_use_sdk_api,flat))
-$(eval $(call gb_Library_set_precompiled_header,flat,$(SRCDIR)/connectivity/inc/pch/precompiled_flat))
+$(eval $(call gb_Library_set_precompiled_header,flat,connectivity/inc/pch/precompiled_flat))
$(eval $(call gb_Library_set_include,flat,\
$$(INCLUDE) \
diff --git a/connectivity/Library_mysql_jdbc.mk b/connectivity/Library_mysql_jdbc.mk
index 3e92a7e19622..0a4c60e60196 100644
--- a/connectivity/Library_mysql_jdbc.mk
+++ b/connectivity/Library_mysql_jdbc.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Library_set_include,mysql_jdbc,\
-I$(SRCDIR)/connectivity/source/inc \
))
-$(eval $(call gb_Library_set_precompiled_header,mysql_jdbc,$(SRCDIR)/connectivity/inc/pch/precompiled_mysql))
+$(eval $(call gb_Library_set_precompiled_header,mysql_jdbc,connectivity/inc/pch/precompiled_mysql))
$(eval $(call gb_Library_use_libraries,mysql_jdbc,\
cppu \
diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk
index 179b6443939c..1d1c82cf174c 100644
--- a/connectivity/Library_odbc.mk
+++ b/connectivity/Library_odbc.mk
@@ -27,7 +27,7 @@ $(eval $(call gb_Library_add_defs,odbc,\
-DSQL_WCHART_CONVERT) \
))
-$(eval $(call gb_Library_set_precompiled_header,odbc,$(SRCDIR)/connectivity/inc/pch/precompiled_odbc))
+$(eval $(call gb_Library_set_precompiled_header,odbc,connectivity/inc/pch/precompiled_odbc))
$(eval $(call gb_Library_use_externals,odbc,\
boost_headers \
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index 6927bbe457e2..c372f3f0c6f6 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_Library_add_defs,postgresql-sdbc-impl,\
-DPQ_SDBC_MICRO=2 \
))
-$(eval $(call gb_Library_set_precompiled_header,postgresql-sdbc-impl,$(SRCDIR)/connectivity/inc/pch/precompiled_postgresql-sdbc-impl))
+$(eval $(call gb_Library_set_precompiled_header,postgresql-sdbc-impl,connectivity/inc/pch/precompiled_postgresql-sdbc-impl))
$(eval $(call gb_Library_use_sdk_api,postgresql-sdbc-impl))