tMakefile: fix build instructions and rename local flags - granular - granular … | |
git clone git://src.adamsgaard.dk/granular | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 126211efa113da8c8651ed99d5de9efa9f691b73 | |
parent a2970453f73bbaedddd1e48e427c1825b67fe990 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Thu, 18 Mar 2021 07:21:18 +0100 | |
Makefile: fix build instructions and rename local flags | |
Diffstat: | |
M Makefile | 18 +++++++++--------- | |
1 file changed, 9 insertions(+), 9 deletions(-) | |
--- | |
diff --git a/Makefile b/Makefile | |
t@@ -10,7 +10,7 @@ DOCPREFIX = ${PREFIX}/share/doc/${NAME} | |
BIN = \ | |
granular | |
-SRC = ${BIN:=.c} arrays.c grain.c simulation.c | |
+SRC = ${BIN:=.c} arrays.c grain.c simulation.c util.c | |
HDR = \ | |
arg.h\ | |
arrays.h\ | |
t@@ -20,9 +20,9 @@ HDR = \ | |
LIBS = -lm | |
-CNGFPFCFLAGS = ${CFLAGS} ${INCS} -DVERSION=\"${VERSION}\" | |
-CNGFPFLDFLAGS = ${LDFLAGS} ${LIBS} | |
-CNGFPFCPPFLAGS = ${CPPFLAGS} | |
+GRANULAR_CFLAGS = ${CFLAGS} ${INCS} -DVERSION=\"${VERSION}\" | |
+GRANULAR_LDFLAGS = ${LDFLAGS} ${LIBS} | |
+GRANULAR_CPPFLAGS = ${CPPFLAGS} | |
MAN1 = ${BIN:=.1} | |
MAN5 = ${NAME:=.5} | |
t@@ -39,15 +39,15 @@ OBJ = ${SRC:.c=.o} | |
${OBJ}: ${HDR} | |
.o: | |
- ${CC} -o $@ $< ${CNGFPFLDFLAGS} | |
+ ${CC} -o $@ $< ${GRANULAR_LDFLAGS} | |
.c.o: | |
- ${CC} ${CNGFPFCFLAGS} ${CNGFPFCPPFLAGS} -o $@ -c $< | |
+ ${CC} ${GRANULAR_CFLAGS} ${GRANULAR_CPPFLAGS} -o $@ -c $< | |
-granular: granular.o arrays.o grain.o simulation.o | |
+granular: granular.o arrays.o grain.o simulation.o util.o | |
${CC}\ | |
- cngf-pf.o arrays.o fluid.o simulation.o\ | |
- -o $@ ${CNGFPFLDFLAGS} | |
+ granular.o arrays.o grain.o simulation.o util.o\ | |
+ -o $@ ${GRANULAR_LDFLAGS} | |
dist: | |
rm -rf "${NAME}-${VERSION}" |