cngf-pf

commit 476b4b812b975521885e11bf39810f44295c2dac
parent 9f3947dfb50b3757b433ba0516ae486795be91ad
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Wed, 14 Jul 2021 09:43:23 +0200

Makefile: simplify according to quinq feedback

Diffstat:
M
Makefile
 | 
52
++++++++++++++++++++--------------------------------

1 file changed, 20 insertions(+), 32 deletions(-)
diff --git a/Makefile b/Makefile
@@ -12,58 +12,46 @@ BIN = \
 	cngf-pf\
 	deborah\
 	max_depth_simple_shear\
-	shear_flux
-SRC = ${BIN:=.c} arrays.c fluid.c simulation.c
+	shear_flux\
+
+SRC = \
+	arrays.c\
+	fluid.c\
+	simulation.c\
+
 HDR = \
 	arg.h\
 	arrays.h\
 	fluid.h\
-	simulation.h
+	simulation.h\
 
 LIBS = -lm
 
-CNGFPFCFLAGS = ${CFLAGS} ${INCS} -DVERSION=\"${VERSION}\"
-CNGFPFLDFLAGS = ${LDFLAGS} ${LIBS}
-CNGFPFCPPFLAGS = ${CPPFLAGS}
+CNGFPF_CFLAGS = ${CFLAGS} ${INCS} -DVERSION=\"${VERSION}\"
+CNGFPF_LDFLAGS = ${LDFLAGS}
+CNGFPF_LIBS = ${LIBS}
 
 MAN1 = ${BIN:=.1}
 DOC = \
 	README.md\
-	LICENSE
+	LICENSE\
 
 all: ${BIN}
 
-${BIN}: ${@:=.o}
-
 OBJ = ${SRC:.c=.o}
 
 ${OBJ}: ${HDR}
 
-.o:
-	${CC} -o $@ $< ${CNGFPFLDFLAGS}
-
-.c.o:
-	${CC} ${CNGFPFCFLAGS} ${CNGFPFCPPFLAGS} -o $@ -c $<
-
-cngf-pf: cngf-pf.o arrays.o fluid.o simulation.o
-	${CC}\
-		cngf-pf.o arrays.o fluid.o simulation.o\
-		-o $@ ${CNGFPFLDFLAGS}
-
-deborah: deborah.o arrays.o fluid.o simulation.o
-	${CC}\
-		deborah.o arrays.o fluid.o simulation.o\
-		-o $@ ${CNGFPFLDFLAGS}
+cngf-pf: cngf-pf.o
+max_depth_simple_shear: max_depth_simple_shear.o
+shear_flux: shear_flux.o
+deborah: deborah.o
 
-max_depth_simple_shear: max_depth_simple_shear.o arrays.o fluid.o simulation.o
-	${CC}\
-		max_depth_simple_shear.o arrays.o fluid.o simulation.o\
-		-o $@ ${CNGFPFLDFLAGS}
+${BIN}: ${OBJ}
+	${CC} ${CNGFPF_LDFLAGS} -o $@ ${@:=.o} ${OBJ} ${CNGFPF_LIBS}
 
-shear_flux: shear_flux.o
-	${CC}\
-		shear_flux.o\
-		-o $@ ${CNGFPFLDFLAGS}
+.c.o:
+	${CC} ${CNGFPF_CFLAGS} -o $@ -c $<
 
 dist:
 	rm -rf "${NAME}-${VERSION}"