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

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,\

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,\

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,\

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))

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,\

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,\

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,\

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,\

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),)

connectivity/Package_generated.mk

-# -*- 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:

dbaccess/Library_dba.mk

@@ -9,14 +9,11 @@
 
 $(eval $(call gb_Library_Library,dba))
 
-$(eval $(call gb_Library_use_packages,dba,\
-	connectivity_generated \
-))
-
 $(eval $(call gb_Library_set_include,dba,\
     $$(INCLUDE) \
 	-I$(SRCDIR)/dbaccess/source/inc \
 	-I$(SRCDIR)/dbaccess/source/core/inc \
+	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
 ))
 
 $(eval $(call gb_Library_add_defs,dba,\

dbaccess/Library_dbu.mk

@@ -15,6 +15,7 @@ $(eval $(call gb_Library_set_include,dbu,\
     -I$(SRCDIR)/dbaccess/source/inc \
     -I$(SRCDIR)/dbaccess/source/ui/inc \
     -I$(call gb_SrsTemplateTarget_get_include_dir,dbaccess) \
+	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
 ))
 
 $(eval $(call gb_Library_set_precompiled_header,dbu,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbu))

forms/Library_frm.mk

@@ -13,6 +13,7 @@ $(eval $(call gb_Library_set_include,frm,\
     $$(INCLUDE) \
     -I$(SRCDIR)/forms/source/inc \
     -I$(SRCDIR)/forms/source/solar/inc \
+	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
 ))
 
 $(eval $(call gb_Library_use_api,frm,\

svx/Library_svxcore.mk

@@ -38,6 +38,7 @@ $(eval $(call gb_Library_set_include,svxcore,\
     -I$(SRCDIR)/svx/source/inc \
     $$(INCLUDE) \
     -I$(WORKDIR)/SdiTarget/svx/sdi \
+	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
 ))
 
 $(eval $(call gb_Library_set_precompiled_header,svxcore,$(SRCDIR)/svx/inc/pch/precompiled_svxcore))