Move the generated vcc_types.h from include/tbl to lib/libvcc

.gitignore

@@ -58,11 +58,11 @@ cscope.*out
 /include/vmod_abi.h
 /include/tbl/vcl_returns.h
 /include/tbl/vrt_stv_var.h
-/include/tbl/vcc_types.h
 /include/vcs_version.h
 /lib/libvcc/vcc_fixed_token.c
 /lib/libvcc/vcc_obj.c
 /lib/libvcc/vcc_token_defs.h
+/lib/libvcc/vcc_types.h
 /lib/libvarnishapi/vsl2rst
 /lib/libvarnishapi/vxp_fixed_token.c
 /lib/libvarnishapi/vxp_tokens.h

include/Makefile.am

@@ -32,7 +32,6 @@ nobase_pkginclude_HEADERS = \
 	tbl/sess_close.h \
 	tbl/steps.h \
 	tbl/symbol_kind.h \
-	tbl/vcc_types.h \
 	tbl/vcl_returns.h \
 	tbl/vcl_states.h \
 	tbl/vhd_fsm.h \
@@ -122,7 +121,6 @@ vcl.h: \
 GEN_H = \
 	tbl/vrt_stv_var.h \
 	tbl/vcl_returns.h \
-	tbl/vcc_types.h \
 	vrt_obj.h
 
 $(GEN_H): vcl.h

lib/libvcc/Makefile.am

@@ -15,6 +15,7 @@ libvcc_a_SOURCES = \
 	vcc_compile.h \
 	vcc_namespace.h \
 	vcc_token_defs.h \
+	vcc_types.h \
 	vcc_acl.c \
 	vcc_action.c \
 	vcc_backend.c \
@@ -56,6 +57,7 @@ vcc_obj.c: \
 GEN_H = \
 	vcc_fixed_token.c \
 	vcc_token_defs.h \
+	vcc_types.h \
 	tbl/vrt_stv_var.h
 
 $(GEN_H): vcc_obj.c

lib/libvcc/generate.py

@@ -786,7 +786,7 @@ fo.write("\n}\n")
 fo.close()
 
 #######################################################################
-ft = open(join(buildroot, "include/tbl/vcc_types.h"), "w")
+ft = open(join(buildroot, "lib/libvcc/vcc_types.h"), "w")
 file_header(ft)
 
 lint_start(ft)

lib/libvcc/vcc_compile.h

@@ -116,7 +116,7 @@ struct type {
 };
 
 #define VCC_TYPE(UC, lc)	extern const struct type UC[1];
-#include "tbl/vcc_types.h"
+#include "vcc_types.h"
 
 /*---------------------------------------------------------------------*/
 

lib/libvcc/vcc_types.c

@@ -224,7 +224,7 @@ VCC_Type(const char *p)
 {
 
 #define VCC_TYPE(UC, lc)	if (!strcmp(p, #UC)) return (UC);
-#include "tbl/vcc_types.h"
+#include "vcc_types.h"
 	return (NULL);
 }
 
@@ -291,5 +291,5 @@ vcc_Type_Init(struct vcc *tl)
 {
 
 #define VCC_TYPE(UC, lc)	vcc_type_init(tl, UC);
-#include "tbl/vcc_types.h"
+#include "vcc_types.h"
 }