iMakefile improvements - stagit-gemini - Stagit for gemini protocol Openbsd Err thinkerwim.openbsd.amsterdam 70 hgit clone git://thinkerwim.org/stagit-gemini.git URL:git://thinkerwim.org/stagit-gemini.git thinkerwim.org 70 1Log /git/stagit-gemini/log.gph thinkerwim.org 70 1Files /git/stagit-gemini/files.gph thinkerwim.org 70 1Refs /git/stagit-gemini/refs.gph thinkerwim.org 70 1README /git/stagit-gemini/file/README.gph thinkerwim.org 70 1LICENSE /git/stagit-gemini/file/LICENSE.gph thinkerwim.org 70 i--- Err thinkerwim.openbsd.amsterdam 70 1commit 9fcf880188ff2b8b8645f124cc497ea72451dc92 /git/stagit-gemini/commit/9fcf880188ff2b8b8645f124cc497ea72451dc92.gph thinkerwim.org 70 1parent 3a1f4248d1501107f9f252e507509b822af7b9f8 /git/stagit-gemini/commit/3a1f4248d1501107f9f252e507509b822af7b9f8.gph thinkerwim.org 70 hAuthor: Hiltjo Posthuma URL:mailto:hiltjo@codemadness.org thinkerwim.org 70 iDate: Sun, 22 Dec 2019 12:47:29 +0100 Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iMakefile improvements Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- remove double -c in .c.o target. Err thinkerwim.openbsd.amsterdam 70 i- remove config.mk abstraction. Err thinkerwim.openbsd.amsterdam 70 i- change LIBS and INCS to LIBGIT_INC and LIBGIT_LIB. Err thinkerwim.openbsd.amsterdam 70 i- use system cflags and ldflags, but allow the same override rules for porters. Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iDiffstat: Err thinkerwim.openbsd.amsterdam 70 i M Makefile | 27 ++++++++++++++++++++------- Err thinkerwim.openbsd.amsterdam 70 i D config.mk | 30 ------------------------------ Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i2 files changed, 20 insertions(+), 37 deletions(-) Err thinkerwim.openbsd.amsterdam 70 i--- Err thinkerwim.openbsd.amsterdam 70 1diff --git a/Makefile b/Makefile /git/stagit-gemini/file/Makefile.gph thinkerwim.org 70 i@@ -1,8 +1,21 @@ Err thinkerwim.openbsd.amsterdam 70 i-include config.mk Err thinkerwim.openbsd.amsterdam 70 i+.POSIX: Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i NAME = stagit-gopher Err thinkerwim.openbsd.amsterdam 70 i VERSION = 0.9.2 Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i+# paths Err thinkerwim.openbsd.amsterdam 70 i+PREFIX = /usr/local Err thinkerwim.openbsd.amsterdam 70 i+MANPREFIX = ${PREFIX}/man Err thinkerwim.openbsd.amsterdam 70 i+DOCPREFIX = ${PREFIX}/share/doc/${NAME} Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+LIBGIT_INC = -I/usr/local/include Err thinkerwim.openbsd.amsterdam 70 i+LIBGIT_LIB = -L/usr/local/lib -lgit2 Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+# use system flags. Err thinkerwim.openbsd.amsterdam 70 i+STAGIT_CFLAGS = ${LIBGIT_INC} ${CFLAGS} Err thinkerwim.openbsd.amsterdam 70 i+STAGIT_LDFLAGS = ${LIBGIT_LIB} ${LDFLAGS} Err thinkerwim.openbsd.amsterdam 70 i+STAGIT_CPPFLAGS = -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i SRC = \ Err thinkerwim.openbsd.amsterdam 70 i stagit-gopher.c\ Err thinkerwim.openbsd.amsterdam 70 i stagit-gopher-index.c Err thinkerwim.openbsd.amsterdam 70 i@@ -29,16 +42,16 @@ OBJ = ${SRC:.c=.o} ${COMPATOBJ} Err thinkerwim.openbsd.amsterdam 70 i all: ${BIN} Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i .o: Err thinkerwim.openbsd.amsterdam 70 i- ${CC} ${LDFLAGS} -o $@ ${LIBS} Err thinkerwim.openbsd.amsterdam 70 i+ ${CC} -o $@ ${LDFLAGS} Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i .c.o: Err thinkerwim.openbsd.amsterdam 70 i- ${CC} -c ${CFLAGS} ${CPPFLAGS} -o $@ -c $< Err thinkerwim.openbsd.amsterdam 70 i+ ${CC} -o $@ -c $< ${STAGIT_CFLAGS} ${STAGIT_CPPFLAGS} Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i dist: Err thinkerwim.openbsd.amsterdam 70 i rm -rf ${NAME}-${VERSION} Err thinkerwim.openbsd.amsterdam 70 i mkdir -p ${NAME}-${VERSION} Err thinkerwim.openbsd.amsterdam 70 i cp -f ${MAN1} ${HDR} ${SRC} ${COMPATSRC} ${DOC} \ Err thinkerwim.openbsd.amsterdam 70 i- Makefile config.mk \ Err thinkerwim.openbsd.amsterdam 70 i+ Makefile \ Err thinkerwim.openbsd.amsterdam 70 i example_create.sh example_post-receive.sh \ Err thinkerwim.openbsd.amsterdam 70 i ${NAME}-${VERSION} Err thinkerwim.openbsd.amsterdam 70 i # make tarball Err thinkerwim.openbsd.amsterdam 70 i@@ -46,13 +59,13 @@ dist: Err thinkerwim.openbsd.amsterdam 70 i gzip -c > ${NAME}-${VERSION}.tar.gz Err thinkerwim.openbsd.amsterdam 70 i rm -rf ${NAME}-${VERSION} Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i-${OBJ}: config.mk ${HDR} Err thinkerwim.openbsd.amsterdam 70 i+${OBJ}: ${HDR} Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i stagit-gopher: stagit-gopher.o ${COMPATOBJ} Err thinkerwim.openbsd.amsterdam 70 i- ${CC} -o $@ stagit-gopher.o ${COMPATOBJ} ${LDFLAGS} Err thinkerwim.openbsd.amsterdam 70 i+ ${CC} -o $@ stagit-gopher.o ${COMPATOBJ} ${STAGIT_LDFLAGS} Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i stagit-gopher-index: stagit-gopher-index.o ${COMPATOBJ} Err thinkerwim.openbsd.amsterdam 70 i- ${CC} -o $@ stagit-gopher-index.o ${COMPATOBJ} ${LDFLAGS} Err thinkerwim.openbsd.amsterdam 70 i+ ${CC} -o $@ stagit-gopher-index.o ${COMPATOBJ} ${STAGIT_LDFLAGS} Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i clean: Err thinkerwim.openbsd.amsterdam 70 i rm -f ${BIN} ${OBJ} ${NAME}-${VERSION}.tar.gz Err thinkerwim.openbsd.amsterdam 70 1diff --git a/config.mk b/config.mk /git/stagit-gemini/file/config.mk.gph thinkerwim.org 70 i@@ -1,30 +0,0 @@ Err thinkerwim.openbsd.amsterdam 70 i-# customize below to fit your system Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i-# paths Err thinkerwim.openbsd.amsterdam 70 i-PREFIX = /usr/local Err thinkerwim.openbsd.amsterdam 70 i-MANPREFIX = ${PREFIX}/man Err thinkerwim.openbsd.amsterdam 70 i-DOCPREFIX = ${PREFIX}/share/doc/stagit-gopher Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i-# compiler and linker Err thinkerwim.openbsd.amsterdam 70 i-#CC = cc Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i-GITINC = /usr/local/include Err thinkerwim.openbsd.amsterdam 70 i-GITLIB = /usr/local/lib Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i-# includes and libs Err thinkerwim.openbsd.amsterdam 70 i-INCS = -I${GITINC} Err thinkerwim.openbsd.amsterdam 70 i-LIBS = -L${GITLIB} -lgit2 Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i-# debug Err thinkerwim.openbsd.amsterdam 70 i-#CFLAGS = -fstack-protector-all -O0 -g -std=c99 -Wall -Wextra -pedantic ${INCS} Err thinkerwim.openbsd.amsterdam 70 i-#LDFLAGS = ${LIBS} Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i-# optimized Err thinkerwim.openbsd.amsterdam 70 i-CFLAGS = -O2 -std=c99 ${INCS} Err thinkerwim.openbsd.amsterdam 70 i-LDFLAGS = -s ${LIBS} Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i-# optimized static Err thinkerwim.openbsd.amsterdam 70 i-#CFLAGS = -static -O2 -std=c99 ${INCS} Err thinkerwim.openbsd.amsterdam 70 i-#LDFLAGS = -static -s ${LIBS} Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i-CPPFLAGS = -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE ${INCS} Err thinkerwim.openbsd.amsterdam 70 .