Mercurial > paster

changeset 49:d8e22b0c0237

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make: fix incorrect rules
author David Demelier <markand@malikania.fr>
date Thu, 12 Mar 2020 20:10:00 +0100
parents fa7125489435
children 520f57836ff3
files Makefile
diffstat 1 files changed, 13 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Fri Feb 14 20:10:00 2020 +0100
+++ b/Makefile	Thu Mar 12 20:10:00 2020 +0100
@@ -46,27 +46,26 @@
                 -DSQLITE_DEFAULT_FOREIGN_KEYS=1
 SQLITE_LIB=     libsqlite3.a
 
-MY_CFLAGS=      -std=c18 \
-                -I. -Iextern \
+MY_CFLAGS=      -std=c11 \
+                -I. \
+                -Iextern \
                 -D_XOPEN_SOURCE=700 \
-                -DSHAREDIR=\"${SHAREDIR}\" -DVARDIR=\"${VARDIR}\" \
-                ${CFLAGS}
-MY_LDFLAGS=     -static -lkcgi -lkcgihtml -lz ${LDFLAGS}
+                -DSHAREDIR=\"${SHAREDIR}\" \
+                -DVARDIR=\"${VARDIR}\"
+MY_LDFLAGS=     -static -lkcgi -lkcgihtml -lz
 
 .SUFFIXES:
-.SUFFIXES: .c .o .in
+.SUFFIXES: .o .c .in
 
 all: pasterd pasterd-clean paster
 
--include ${CORE_DEPS}
--include pasterd.d
--include pasterd-clean.d
+-include ${CORE_DEPS} paster.d pasterd-clean.d
 
 .c.o:
-	${CC} ${MY_CFLAGS} -MMD -Iextern -c $<
+	${CC} ${MY_CFLAGS} -MMD -Iextern ${CFLAGS} -c $<
 
-.c:
-	${CC} ${MY_CFLAGS} $< -o $@ ${CORE_LIB} ${SQLITE_LIB} ${MY_LDFLAGS}
+.o:
+	${CC} $< -o $@ ${CORE_LIB} ${SQLITE_LIB} ${MY_LDFLAGS} ${LDFLAGS}
 
 .in:
 	sed -e "s|@SHAREDIR@|${SHAREDIR}|" \
@@ -80,9 +79,9 @@
 ${CORE_LIB}: ${CORE_OBJS}
 	${AR} -rc $@ ${CORE_OBJS}
 
-pasterd: ${CORE_LIB} ${SQLITE_LIB} pasterd.o pasterd.8
+pasterd.o: ${CORE_LIB} ${SQLITE_LIB} pasterd.8
 
-pasterd-clean: ${CORE_LIB} ${SQLITE_LIB} pasterd-clean.o pasterd-clean.8
+pasterd-clean.o: ${CORE_LIB} ${SQLITE_LIB} pasterd-clean.8
 
 paster: paster.sh paster.1
 	cp paster.sh paster