tMakefile: simplify according to quinq feedback - granular - granular dynamics … | |
git clone git://src.adamsgaard.dk/granular | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit a27c1b04e4068db47900c00de2824bf06edb6a1b | |
parent a5fe1ca3497c9c3d6fae8e77e481045888da84ab | |
Author: Anders Damsgaard <[email protected]> | |
Date: Wed, 14 Jul 2021 08:08:41 +0200 | |
Makefile: simplify according to quinq feedback | |
Diffstat: | |
M Makefile | 50 ++++++++++++-----------------… | |
1 file changed, 19 insertions(+), 31 deletions(-) | |
--- | |
diff --git a/Makefile b/Makefile | |
t@@ -13,9 +13,10 @@ BIN = \ | |
granular2vtu\ | |
granularenergy\ | |
granulargrain\ | |
- granularpacking | |
+ granularpacking\ | |
+ | |
SCRIPTS = \ | |
- granular2img | |
+ granular2img\ | |
SRC = \ | |
arrays.c\ | |
t@@ -24,7 +25,8 @@ SRC = \ | |
grains.c\ | |
packing.c\ | |
simulation.c\ | |
- util.c | |
+ util.c\ | |
+ | |
HDR = \ | |
arg.h\ | |
arrays.h\ | |
t@@ -34,13 +36,13 @@ HDR = \ | |
granular.h\ | |
packing.h\ | |
simulation.h\ | |
- util.h | |
+ util.h\ | |
LIBS = -lm | |
GRANULAR_CFLAGS = ${CFLAGS} ${INCS} -DVERSION=\"${VERSION}\" | |
-GRANULAR_LDFLAGS = ${LDFLAGS} ${LIBS} | |
-GRANULAR_CPPFLAGS = ${CPPFLAGS} | |
+GRANULAR_LDFLAGS = ${LDFLAGS} | |
+GRANULAR_LIBS = ${LIBS} | |
MAN1 = ${BIN:=.1}\ | |
${SCRIPTS:=.1} | |
t@@ -53,32 +55,21 @@ DOC = \ | |
all: ${BIN} | |
-${BIN}: ${@:=.o} | |
- | |
OBJ = ${SRC:.c=.o} | |
${OBJ}: ${HDR} | |
-.o: | |
- ${CC} -o $@ $< ${GRANULAR_LDFLAGS} | |
- | |
-.c.o: | |
- ${CC} ${GRANULAR_CFLAGS} ${GRANULAR_CPPFLAGS} -o $@ -c $< | |
- | |
-granular: granular.o ${OBJ} | |
- ${CC} granular.o ${OBJ} -o $@ ${GRANULAR_LDFLAGS} | |
- | |
-granular2vtu: granular2vtu.o ${OBJ} | |
- ${CC} granular2vtu.o ${OBJ} -o $@ ${GRANULAR_LDFLAGS} | |
- | |
-granularenergy: granularenergy.o ${OBJ} | |
- ${CC} granularenergy.o ${OBJ} -o $@ ${GRANULAR_LDFLAGS} | |
+granular: granular.o | |
+granular2vtu: granular2vtu.o | |
+granularenergy: granularenergy.o | |
+granulargrain: granulargrain.o | |
+granularpacking: granularpacking.o | |
-granulargrain: granulargrain.o ${OBJ} | |
- ${CC} granulargrain.o ${OBJ} -o $@ ${GRANULAR_LDFLAGS} | |
+${BIN}: ${OBJ} | |
+ ${CC} ${GRANULAR_LDFLAGS} -o $@ ${@:=.o} ${OBJ} ${GRANULAR_LIBS} | |
-granularpacking: granularpacking.o ${OBJ} | |
- ${CC} granularpacking.o ${OBJ} -o $@ ${GRANULAR_LDFLAGS} | |
+.c.o: | |
+ ${CC} ${GRANULAR_CFLAGS} -o $@ -c $< | |
dist: | |
rm -rf "${NAME}-${VERSION}" | |
t@@ -117,10 +108,7 @@ uninstall: | |
for f in ${MAN1}; do rm -f ${DESTDIR}${MANPREFIX}/man1/$$f; done | |
for f in ${MAN5}; do rm -f ${DESTDIR}${MANPREFIX}/man5/$$f; done | |
-test: ${BIN} | |
- make -C test/ | |
- | |
clean: | |
- rm -f ${BIN} ${OBJ} ${BIN:=.o} test/*.txt | |
+ rm -f ${BIN} ${OBJ} ${BIN:=.o} | |
-.PHONY: all install uninstall test clean dist | |
+.PHONY: all install uninstall clean dist |