From dd489bdf741c027c020a7e240fff3d4517c588dd Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Wed, 18 Aug 2021 16:11:21 +0000 Subject: [PATCH] Bump template and commits --- src/l1/dynarray | 2 +- src/l1/llist | 2 +- template/Makefile | 23 +++++++++++------------ template/config.mk | 1 + template/sources.mk | 2 ++ 5 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 template/sources.mk diff --git a/src/l1/dynarray b/src/l1/dynarray index 4ff8170..dd649c2 160000 --- a/src/l1/dynarray +++ b/src/l1/dynarray @@ -1 +1 @@ -Subproject commit 4ff817029be3e6c972c702c691cb5cd9ad7f684d +Subproject commit dd649c2ffc26cbc58c207a41b617083c42001ebf diff --git a/src/l1/llist b/src/l1/llist index b0fe2f6..3e3495e 160000 --- a/src/l1/llist +++ b/src/l1/llist @@ -1 +1 @@ -Subproject commit b0fe2f65f2aeaa10959837663ffc967bd9950c14 +Subproject commit 3e3495e0cba145c9225f6c66aeb95d474297978f diff --git a/template/Makefile b/template/Makefile index fd4a163..65daddd 100644 --- a/template/Makefile +++ b/template/Makefile @@ -1,18 +1,15 @@ include config.mk +include sources.mk ifeq (${CC},clang) - -CFLAGS :=\ +CFLAGS =\ -std=c99\ -Weverything\ -Wno-padded\ -Wno-disabled-macro-expansion\ - -pedantic\ - ${CFLAGS} - + -pedantic else ifeq (${CC},gcc) - -CFLAGS :=\ +CFLAGS =\ -std=c99\ -Wall\ -Wextra\ @@ -29,13 +26,15 @@ CFLAGS :=\ -Wshadow\ -Wunsafe-loop-optimizations\ -Wparentheses\ - -pedantic\ - ${CFLAGS} - + -pedantic +endif + +ifeq (${DEBUG},1) +CFLAGS += -g +else +CFLAGS += -O2 endif -SRC = template.c -HDR = template.h OBJ = ${SRC:.c=.o} all: ${OBJ} diff --git a/template/config.mk b/template/config.mk index b0c82b8..1d8b56f 100644 --- a/template/config.mk +++ b/template/config.mk @@ -1,3 +1,4 @@ VERSION = 0.0 PREFIX = /usr/local CC = clang +DEBUG = 1 diff --git a/template/sources.mk b/template/sources.mk new file mode 100644 index 0000000..957dd46 --- /dev/null +++ b/template/sources.mk @@ -0,0 +1,2 @@ +SRC = template.c +HDR = template.h