X-Git-Url: https://git.armaanb.net/?p=stagit.git;a=blobdiff_plain;f=Makefile;h=0681a85682a4f6c306bb6a8199748561bd1991b9;hp=eff0f5a3d0a702353168b6aa9110bf58b5d62ddd;hb=HEAD;hpb=824526a656945aeba3c41264f000126f686cabee

diff --git a/Makefile b/Makefile
index eff0f5a..0681a85 100644
--- a/Makefile
+++ b/Makefile
@@ -1,90 +1,117 @@
-include config.mk
+.POSIX:
 
 NAME = stagit
-VERSION = 0.2
+VERSION = 0.9.3
+
+# paths
+PREFIX = /usr/local
+MANPREFIX = ${PREFIX}/man
+DOCPREFIX = ${PREFIX}/share/doc/${NAME}
+SHAREPREFIX = ${PREFIX}/share/${NAME}
+
+LIBCMARK = $(shell pkg-config --silence-errors --libs libcmark-gfm > /dev/null; echo $$?)
+CHROMA = $(shell which chroma > /dev/null; echo $$?)
+LIBGIT_INC = -I/usr/local/include
+LIBS = -L/usr/local/lib `pkg-config --libs libgit2`
+
+ifeq (${CHROMA}, 0)
+	STAGIT_CPPFLAGS := ${STAGIT_CPPFLAGS} -DHAS_CHROMA
+endif
+
+ifeq (${LIBCMARK}, 0)
+	LIBS := ${LIBS} -lcmark-gfm
+	STAGIT_CPPFLAGS := ${STAGIT_CPPFLAGS} -DHAS_CMARK
+endif
+
+# use system flags.
+STAGIT_CFLAGS = ${LIBGIT_INC} ${CFLAGS}
+STAGIT_LDFLAGS = ${LIBS} ${LDFLAGS}
+STAGIT_CPPFLAGS := ${STAGIT_CPPFLAGS} -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE
+
 SRC = \
-	stagit.c\
-	stagit-index.c
+	src/stagit.c\
+	src/stagit-index.c
 COMPATSRC = \
-	strlcat.c\
-	strlcpy.c
+	src/reallocarray.c\
+	src/strlcat.c\
+	src/strlcpy.c\
+	src/cp.c
 BIN = \
 	stagit\
 	stagit-index
 MAN1 = \
-	stagit.1\
-	stagit-index.1
+	man/stagit.1\
+	man/stagit-index.1
 DOC = \
 	LICENSE\
-	README\
-	TODO
-HDR = compat.h
+	README.md
+HDR = src/compat.h
+
+COMPATOBJ = \
+	src/reallocarray.o\
+	src/strlcat.o\
+	src/strlcpy.o\
+	src/cp.o
 
 OBJ = ${SRC:.c=.o} ${COMPATOBJ}
 
-all: $(BIN)
+all: ${BIN}
+
+.o:
+	${CC} -o $@ ${LDFLAGS}
 
 .c.o:
-	${CC} -c ${CFLAGS} $<
-
-dist: $(BIN)
-	rm -rf release/${VERSION}
-	mkdir -p release/${VERSION}
-	cp -f ${MAN1} ${HDR} ${SCRIPTS} ${SRC} ${COMPATSRC} ${DOC} \
-		Makefile config.def.h config.mk \
-		favicon.png logo.png style.css \
-		example.sh \
-		release/${VERSION}/
-	# make tarball
-	rm -f stagit-${VERSION}.tar.gz
-	(cd release/${VERSION}; \
-	tar -czf ../../stagit-${VERSION}.tar.gz .)
+	${CC} -o $@ -c $< ${STAGIT_CFLAGS} ${STAGIT_CPPFLAGS}
 
-${OBJ}: config.h config.mk ${HDR}
+dist:
+	rm -rf ${NAME}-${VERSION}
+	mkdir -p ${NAME}-${VERSION}
+	cp -f ${MAN1} ${HDR} ${SRC} ${COMPATSRC} ${DOC} \
+		Makefile resources/* contrib/* \
+		${NAME}-${VERSION}
+	# make tarball
+	tar -cf - ${NAME}-${VERSION} | \
+		gzip -c > ${NAME}-${VERSION}.tar.gz
+	rm -rf ${NAME}-${VERSION}
 
-config.h:
-	@echo creating $@ from config.def.h
-	@cp config.def.h $@
+${OBJ}: ${HDR}
 
-stagit: stagit.o ${COMPATOBJ}
-	${CC} -o $@ stagit.o ${COMPATOBJ} ${LDFLAGS}
+stagit: src/stagit.o ${COMPATOBJ}
+	${CC} -o $@ src/stagit.o ${COMPATOBJ} ${STAGIT_LDFLAGS}
 
-stagit-index: stagit-index.o ${COMPATOBJ}
-	${CC} -o $@ stagit-index.o ${COMPATOBJ} ${LDFLAGS}
+stagit-index: src/stagit-index.o ${COMPATOBJ}
+	${CC} -o $@ src/stagit-index.o ${COMPATOBJ} ${STAGIT_LDFLAGS}
 
 clean:
-	rm -f ${BIN} ${OBJ}
+	rm -f ${BIN} ${OBJ} ${NAME}-${VERSION}.tar.gz
 
 install: all
 	# installing executable files.
 	mkdir -p ${DESTDIR}${PREFIX}/bin
-	cp -f ${BIN} ${SCRIPTS} ${DESTDIR}${PREFIX}/bin
-	for f in $(BIN) $(SCRIPTS); do chmod 755 ${DESTDIR}${PREFIX}/bin/$$f; done
+	cp -f ${BIN} ${DESTDIR}${PREFIX}/bin
+	for f in ${BIN}; do chmod 755 ${DESTDIR}${PREFIX}/bin/$$f; done
 	# installing example files.
-	mkdir -p ${DESTDIR}${PREFIX}/share/${NAME}
-	cp -f style.css\
-		favicon.png\
-		logo.png\
-		example.sh\
-		README\
-		${DESTDIR}${PREFIX}/share/${NAME}
+	mkdir -p ${DESTDIR}${DOCPREFIX}
+	cp -f contrib/*\
+		README.md\
+		${DESTDIR}${DOCPREFIX}
+	mkdir -p ${DESTDIR}${SHAREPREFIX}
+	cp -f resources/*\
+		${DESTDIR}${SHAREPREFIX}
 	# installing manual pages.
 	mkdir -p ${DESTDIR}${MANPREFIX}/man1
 	cp -f ${MAN1} ${DESTDIR}${MANPREFIX}/man1
-	for m in $(MAN1); do chmod 644 ${DESTDIR}${MANPREFIX}/man1/$$m; done
+	install -Dm644 man/* ${DESTDIR}${MANPREFIX}/man1
 
 uninstall:
-	# removing executable files and scripts.
-	for f in $(BIN) $(SCRIPTS); do rm -f ${DESTDIR}${PREFIX}/bin/$$f; done
+	# removing executable files.
+	for f in ${BIN}; do rm -f ${DESTDIR}${PREFIX}/bin/$$f; done
 	# removing example files.
-	rm -f \
-		${DESTDIR}${PREFIX}/share/${NAME}/style.css\
-		${DESTDIR}${PREFIX}/share/${NAME}/favicon.png\
-		${DESTDIR}${PREFIX}/share/${NAME}/logo.png\
-		${DESTDIR}${PREFIX}/share/${NAME}/example.sh\
-		${DESTDIR}${PREFIX}/share/${NAME}/README
-	-rmdir ${DESTDIR}${PREFIX}/share/${NAME}
+	rm -f ${DESTDIR}${SHAREPREFIX}/*
+	rm -f ${DESTDIR}${DOCPREFIX}/*
+	rmdir ${DESTDIR}${SHAREPREFIX}
+	rmdir ${DESTDIR}${DOCPREFIX}
 	# removing manual pages.
-	for m in $(MAN1); do rm -f ${DESTDIR}${MANPREFIX}/man1/$$m; done
+	for m in ${MAN1}; do rm -f ${DESTDIR}${MANPREFIX}/man1/$$m; done
 
 .PHONY: all clean dist install uninstall