From 48e48dfdd4273736e0455fb5b134f29517309b9e Mon Sep 17 00:00:00 2001 From: Richard Eoin Meadows Date: Sun, 3 Aug 2014 10:08:46 +0100 Subject: [PATCH] Moved verification makefileness up to the main makefile --- firmware/Makefile | 16 +++++++++++++++- firmware/tools/verification/Makefile | 8 -------- 2 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 firmware/tools/verification/Makefile diff --git a/firmware/Makefile b/firmware/Makefile index 4a13e41..db2f5a5 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -27,6 +27,7 @@ # print-symlinks DEVICE= Prints any symlinks to a given device # etags Generates an ETAGS file for the project # emacs Launches emacs for this project +# verification Runs the ctypesgen needs for verif. scripts # clean Removes generated files # # This makefile is intended to be run from the root of the project. @@ -154,7 +155,7 @@ TAGFILES = $(SOURCES) $(shell $(CAT) $(OBJECTS:.o=.d) \ # Default target # # -all: $(TARGET).elf etags +all: $(TARGET).elf etags verification # Rule for generating object and dependancy files from source files. # @@ -245,6 +246,19 @@ etags: $(TAGFILES) emacs: @emacs $(TAGFILES) Makefile config.mk README.md +# Makes the verification tool +# +verification: tools/verification/verification_tc.py + +# Ctypesgen for verification tool +# +%.py: %.c + @echo "Generating Python Wrappers...." + @echo + tools/verification/ctypesgen/ctypesgen.py -o $@ \ + --cpp="$(CC) -E -DCTYPESGEN $(CPPFLAGS) $(CFLAGS) \ + $(addprefix -I,$(INCLUDE_PATH))" $< + # Removes everything in the output directory # # diff --git a/firmware/tools/verification/Makefile b/firmware/tools/verification/Makefile deleted file mode 100644 index 4cfd6e8..0000000 --- a/firmware/tools/verification/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Makefile for verification tests - -all: verification_tc.py - -%.py: %.c - @echo "Generating Python Wrappers...." - @echo - ctypesgen/ctypesgen.py -o $@ --cpp="gcc -E -DCTYPESGEN" $<