sqlbison.hxx must be delivered, because it is used by another header from inc

10 files changed, 65 insertions, 8 deletions

diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk
index 8fe95bbba221..cb997fa42d92 100644
--- a/connectivity/Library_calc.mk
+++ b/connectivity/Library_calc.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_Library_Library,calc))
 
+$(eval $(call gb_Library_add_package_headers,calc,\
+	connectivity_generated \
+))
+
 $(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc))
 
 $(eval $(call gb_Library_add_api,calc,\
@@ -38,7 +42,6 @@ $(eval $(call gb_Library_set_include,calc,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
-	-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,calc,\
diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
index 11c9432db8d6..c125fd1ff52d 100644
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_Library_Library,dbase))
 
+$(eval $(call gb_Library_add_package_headers,calc,\
+	connectivity_generated \
+))
+
 $(eval $(call gb_Library_set_componentfile,dbase,connectivity/source/drivers/dbase/dbase))
 
 $(eval $(call gb_Library_add_api,dbase,\
@@ -38,7 +42,6 @@ $(eval $(call gb_Library_set_include,dbase,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
-	-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,dbase,\
diff --git a/connectivity/Library_evoab2.mk b/connectivity/Library_evoab2.mk
index 31d5eabcba32..149783857bf7 100644
--- a/connectivity/Library_evoab2.mk
+++ b/connectivity/Library_evoab2.mk
@@ -27,8 +27,11 @@
 
 $(eval $(call gb_Library_Library,evoab2))
 
+$(eval $(call gb_Library_add_package_headers,calc,\
+	connectivity_generated \
+))
+
 $(eval $(call gb_Library_set_include,evoab2,\
-	-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
 ))
diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index 727b5ce1ffb9..52272315a375 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_Library_Library,file))
 
+$(eval $(call gb_Library_add_package_headers,calc,\
+	connectivity_generated \
+))
+
 $(eval $(call gb_Library_add_defs,file,\
 	-DOOO_DLLIMPLEMENTATION_FILE \
 ))
@@ -35,7 +39,6 @@ $(eval $(call gb_Library_set_include,file,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
-	-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
 ))
 
 $(eval $(call gb_Library_add_api,file,\
diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk
index 6dbd862ed249..362ae7d82b9d 100644
--- a/connectivity/Library_flat.mk
+++ b/connectivity/Library_flat.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_Library_Library,flat))
 
+$(eval $(call gb_Library_add_package_headers,calc,\
+	connectivity_generated \
+))
+
 $(eval $(call gb_Library_set_componentfile,flat,connectivity/source/drivers/flat/flat))
 
 $(eval $(call gb_Library_add_api,flat,\
@@ -38,7 +42,6 @@ $(eval $(call gb_Library_set_include,flat,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
-	-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,flat,\
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index d244ec6d2ad6..8a6be25c512a 100644
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_Library_Library,jdbc))
 
+$(eval $(call gb_Library_add_package_headers,calc,\
+	connectivity_generated \
+))
+
 $(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc))
 
 $(eval $(call gb_Library_add_api,jdbc,\
@@ -38,7 +42,6 @@ $(eval $(call gb_Library_set_include,jdbc,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
-	-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,jdbc,\
diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk
index 8c18217b0189..7d5adf5e6e95 100644
--- a/connectivity/Library_mozabdrv.mk
+++ b/connectivity/Library_mozabdrv.mk
@@ -27,8 +27,11 @@
 
 $(eval $(call gb_Library_Library,mozabdrv))
 
+$(eval $(call gb_Library_add_package_headers,calc,\
+	connectivity_generated \
+))
+
 $(eval $(call gb_Library_set_include,mozabdrv,\
-	-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
 	-I$(SRCDIR)/connectivity/source/drivers/mozab/bootstrap \
 	-I$(SRCDIR)/connectivity/source/drivers/mozab/mozillasrc \
 	-I$(SRCDIR)/connectivity/source/drivers/mozab \
diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk
index b328545a0098..02f741c1c8ef 100644
--- a/connectivity/Library_odbcbase.mk
+++ b/connectivity/Library_odbcbase.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_Library_Library,odbcbase))
 
+$(eval $(call gb_Library_add_package_headers,calc,\
+	connectivity_generated \
+))
+
 $(eval $(call gb_Library_add_api,odbcbase,\
 	offapi \
 	udkapi \
@@ -36,7 +40,6 @@ $(eval $(call gb_Library_set_include,odbcbase,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
-	-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
 ))
 
 $(eval $(call gb_Library_add_defs,odbcbase,\
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index a6287a51d359..53790247ed22 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 	Library_file \
 	Library_flat \
 	Library_dbase \
+	Package_generated \
 ))
 
 ifneq ($(SOLAR_JAVA),)
diff --git a/connectivity/Package_generated.mk b/connectivity/Package_generated.mk
new file mode 100644
index 000000000000..904c6c687514
--- /dev/null
+++ b/connectivity/Package_generated.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,connectivity_generated,$(WORKDIR)/YaccTarget/connectivity))
+
+$(eval $(call gb_Package_add_file,connectivity_generated,inc/sqlbison.hxx,source/parse/sqlbison.hxx))
+
+# vim: set noet sw=4 ts=4: