From aff447db5d43588eea4ce37495e74fe796133cad Mon Sep 17 00:00:00 2001
From: Erik Jaegervall <erik.jaegervall@se.bosch.com>
Date: Tue, 3 Dec 2024 15:59:41 +0100
Subject: [PATCH] Remove chapter

Signed-off-by: Erik Jaegervall <erik.jaegervall@se.bosch.com>
---
 Makefile                           | 23 +++++++++++++++++++----
 docs-gen/content/catalog/_index.md |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 9b1201b0..d4c566ae 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,22 @@ optional_targets: clean protobuf ttl
 
 TOOLSDIR?=./vss-tools
 VSS_VERSION ?= 0.0
-COMMON_ARGS=-u ./spec/units.yaml --strict
+#COMMON_ARGS=-u ./spec/units.yaml --strict
+COMMON_ARGS=-u ./spec/units.yaml
 COMMON_VSPEC_ARG=-s ./spec/VehicleSignalSpecification.vspec
-
+#COMMON_VSPEC_ARG=-s ./spec/ServerSignalSpecification.vspec
+TYPETREE = none
+ifeq ($(TYPETREE), none)
+  TYPETREE_ARG =
+else
+  TYPETREE_ARG =  -t ./spec/${TYPETREE} --types-output vss-datatypes
+endif
+NEWKEY = none
+ifeq ($(NEWKEY), none)
+  NEWKEY_ARG =
+else
+  NEWKEY_ARG = -e $(NEWKEY)
+endif
 json:
 	vspec export json ${COMMON_ARGS} ${COMMON_VSPEC_ARG} -o vss.json
 
@@ -36,7 +49,8 @@ franca:
 	vspec export franca --franca-vss-version $(VSS_VERSION) ${COMMON_ARGS} ${COMMON_VSPEC_ARG} -o vss.fidl
 
 yaml:
-	vspec export yaml ${COMMON_ARGS} ${COMMON_VSPEC_ARG} -o vss.yaml
+	vspec export yaml ${TYPETREE_ARG}.yaml ${COMMON_ARGS} ${COMMON_VSPEC_ARG} ${NEWKEY_ARG} -o vss.yaml
+#	vspec export yaml ${COMMON_ARGS} ${COMMON_VSPEC_ARG} -o vss.yaml
 
 csv:
 	vspec export csv ${COMMON_ARGS} ${COMMON_VSPEC_ARG} -o vss.csv
@@ -51,7 +65,8 @@ overlays:
 	vspec export json ${COMMON_ARGS} -l overlays/extensions/OBD.vspec ${COMMON_VSPEC_ARG} -o vss_obd.json
 
 binary:
-	vspec export binary ${COMMON_ARGS} ${COMMON_VSPEC_ARG} -o vss.binary
+#	vspec export binary ${COMMON_ARGS} ${COMMON_VSPEC_ARG} ${NEWKEY_ARG} -o vss.binary
+	vspec export binary ${TYPETREE_ARG}.binary ${COMMON_ARGS} ${COMMON_VSPEC_ARG} ${NEWKEY_ARG} -o vss.binary
 
 protobuf:
 	vspec export protobuf ${COMMON_ARGS} ${COMMON_VSPEC_ARG} -o vss.proto
diff --git a/docs-gen/content/catalog/_index.md b/docs-gen/content/catalog/_index.md
index 18e8639f..4f66c49e 100644
--- a/docs-gen/content/catalog/_index.md
+++ b/docs-gen/content/catalog/_index.md
@@ -1,7 +1,7 @@
 ---
 title: VSS Catalog
 weight: 25
-chapter: true
+chapter: false
 ---
 
 The source for the COVESA VSS Catalog can be found in `*.vspec` files in the [COVESA VSS Repository](https://github.com/COVESA/vehicle_signal_specification).