diff --git a/templates/skeletons/makefile.tmplt b/templates/skeletons/makefile.tmplt index 538f50e4fd34bd58c0b120f62c93565fc15d82e8..887feaaf9a20d99c86fc6fc4dfe610b82a51a64f 100644 --- a/templates/skeletons/makefile.tmplt +++ b/templates/skeletons/makefile.tmplt @@ -62,10 +62,9 @@ build/deploymentview_final/Makefile: build/main.aadl @@END_TABLE@@ @@END_INLINE@@ mkdir -p ${PROJECT_CACHE} && mkdir -p ${DATAVIEW_PATH} - @@-- Create dataview-uniq.asn - @@INLINE( )( )(\n)@@ - cat $^ > $@ - @@END_INLINE@@ + @@-- Create dataview-uniq.asn by concatenating all asn1 input files + @@-- Don't use cat, because files need newlines in between + sed -e '$$s/$$/\n/' -s $^ > $@ build/system_config.h: $(wildcard */*/wrappers/*_system_config.h) cat $^ > $@ diff --git a/test/test21/Makefile b/test/test21/Makefile index 3ed66de8c1547510cd79dcbdcaefe95abb659ace..fbdfc6a3365f91ec04735d20504513a7139f1a45 100644 --- a/test/test21/Makefile +++ b/test/test21/Makefile @@ -3,22 +3,17 @@ KAZOO=../../kazoo all: test-parse test-parse: clean - $(KAZOO) --gw \ - -o output \ - --glue \ - --debug && time $(MAKE) -C output dataview + $(KAZOO) --gw -p -o output.pohic --glue --debug + time $(MAKE) -C output.pohic dataview gdb: clean gdb --args $(KAZOO) --gw \ - -o output \ + -o output.pohic \ + -p \ --glue \ - --debug \ - -i InterfaceView.aadl \ - -c DeploymentView.aadl \ - -d DataView.aadl \ - ../common/ocarina_components.aadl && $(MAKE) -C output dataview + --debug clean: - rm -rf output + rm -rf output.pohic .PHONY: clean test-parse gdb