diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | src/Makefile | 6 |
2 files changed, 9 insertions, 6 deletions
@@ -9,9 +9,12 @@ all: +$(MAKE) -C src all clean: - +$(MAKE) -C lib clean +$(MAKE) -C src clean +clean-all: + +$(MAKE) -C lib clean + +$(MAKE) -C src clean-all + docs: doxygen Doxyfile @@ -21,17 +24,15 @@ help: @echo "Available targets:" @echo " - all : builds all" @echo " - ecgen : builds the main binary" - @echo " - gp2c : generates the .c and .h files from gp code" @echo " - docs : generate doxygen docs" @echo " - clean : cleans up after a build" - @echo " - clean-gp : cleans up after gp2c generation" @echo " - clean-all : cleans all" @echo " - format : run clang-format on source files" @echo " - help : print this help" .PHONY: all docs help -ifeq (, $(filter all clean docs help, $(MAKECMDGOALS))) +ifeq (, $(filter all clean clean-all docs help, $(MAKECMDGOALS))) # Just pass all targets to a Makefile in src $(MAKECMDGOALS): +$(MAKE) -C src $@ diff --git a/src/Makefile b/src/Makefile index be6bdb9..40843c6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -23,12 +23,12 @@ ECGEN_OBJ = $(patsubst %.c,%.o, $(ECGEN_SRC)) ECONVERT_SRC = econvert.c $(wildcard */*.c) ECONVERT_OBJ = $(patsubst %.c,%.o, $(ECONVERT_SRC)) -SRC = $(ECGEN_SRC) $(ECONVERT_SRC) +SRC = $(wildcard *.c) $(wildcard */*.c) HDR = $(wildcard */*.h) #### -all: ecgen +all: ecgen econvert ecgen: ecgen.o $(ECGEN_OBJ) $(CC) $(CFLAGS) $(INCLUDES) -o $@ $^ $(LDFLAGS) $(LIBS) @@ -44,6 +44,8 @@ econvert: econvert.o $(ECONVERT_OBJ) #### clean-all: clean + rm ../ecgen + rm ../econvert clean: find . -type f -name '*.o' -exec rm {} + |