connectivity: remove Package_generated

This one is ugly, the Yacc generated header is used in lots of places;
the dependencies are already right because using the header requires
using the dbtools library which builds the YaccTarget, so just yet
another include path has to be added.

Change-Id: I031fde80ac326551d4719533305b1ae35351ca43

10 files changed, 8 insertions, 31 deletions

diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk
index 6056e260f3ea..4f71c148d61d 100644
--- a/connectivity/Library_calc.mk
+++ b/connectivity/Library_calc.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_Library_set_include,calc,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
+	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
 ))
 
 $(eval $(call gb_Library_use_libraries,calc,\
diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
index 62c563296f96..c19731d6e917 100644
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_Library_set_include,dbase,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
+	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
 ))
 
 $(eval $(call gb_Library_use_libraries,dbase,\
diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk
index 3add37a7fa5c..a4135812ed7a 100644
--- a/connectivity/Library_evoab.mk
+++ b/connectivity/Library_evoab.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_Library_Library,evoab))
 $(eval $(call gb_Library_set_include,evoab,\
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
+	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
 ))
 
 $(eval $(call gb_Library_use_externals,evoab,\
diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index ffdf14125475..765b13bf9998 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -10,10 +10,6 @@
 
 $(eval $(call gb_Library_Library,file))
 
-$(eval $(call gb_Library_use_packages,file,\
-	connectivity_generated \
-))
-
 $(eval $(call gb_Library_add_defs,file,\
 	-DOOO_DLLIMPLEMENTATION_FILE \
 ))
@@ -24,6 +20,7 @@ $(eval $(call gb_Library_set_include,file,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
+	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
 ))
 
 $(eval $(call gb_Library_use_external,file,boost_headers))
diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk
index ecea162504fe..3916d1665ffc 100644
--- a/connectivity/Library_flat.mk
+++ b/connectivity/Library_flat.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Library_set_include,flat,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
+	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
 ))
 
 $(eval $(call gb_Library_use_libraries,flat,\
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index 6af6826035a1..9222bc5694eb 100644
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -12,10 +12,6 @@ $(eval $(call gb_Library_Library,jdbc))
 
 $(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc))
 
-$(eval $(call gb_Library_use_packages,jdbc,\
-	connectivity_generated \
-))
-
 $(eval $(call gb_Library_use_external,jdbc,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,jdbc))
@@ -24,6 +20,7 @@ $(eval $(call gb_Library_set_include,jdbc,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
+	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
 ))
 
 $(eval $(call gb_Library_use_libraries,jdbc,\
diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk
index 19cf4f982653..4041049f28a0 100644
--- a/connectivity/Library_mork.mk
+++ b/connectivity/Library_mork.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_Library_Library,mork))
 
 $(eval $(call gb_Library_set_componentfile,mork,connectivity/source/drivers/mork/mork))
 
-$(eval $(call gb_Library_use_packages,mork,\
-	connectivity_generated \
-))
-
 $(eval $(call gb_Library_add_defs,mork,\
 	-DLO_DLLIMPLEMENTATION_MORK \
 ))
@@ -22,6 +18,7 @@ $(eval $(call gb_Library_add_defs,mork,\
 $(eval $(call gb_Library_set_include,mork,\
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
+	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,mork,\
diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk
index 9819cfa6e7bd..2db582373582 100644
--- a/connectivity/Library_odbcbase.mk
+++ b/connectivity/Library_odbcbase.mk
@@ -12,16 +12,13 @@ $(eval $(call gb_Library_Library,odbcbase))
 
 $(eval $(call gb_Library_set_warnings_not_errors,odbcbase))
 
-$(eval $(call gb_Library_use_packages,odbcbase,\
-	connectivity_generated \
-))
-
 $(eval $(call gb_Library_use_sdk_api,odbcbase))
 
 $(eval $(call gb_Library_set_include,odbcbase,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
+	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
 ))
 
 $(eval $(call gb_Library_add_defs,odbcbase,\
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index b10575a1bd18..da4f5c91c1fe 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 		Library_odbc \
 		Library_odbcbase) \
 	Library_sdbc2 \
-	Package_generated \
 ))
 
 ifneq ($(SOLAR_JAVA),)
diff --git a/connectivity/Package_generated.mk b/connectivity/Package_generated.mk
deleted file mode 100644
index 7d6fd8e96753..000000000000
--- a/connectivity/Package_generated.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(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: