X-Git-Url: https://git.armaanb.net/?p=stagit.git;a=blobdiff_plain;f=Makefile;h=fbe5c86c5542e5c6482a2c5889dfa3e7a392a642;hp=c0acb10b336b514285236603f3f6e618b1fc68fe;hb=b0d3a4f50b346f540db0fd3f20c30bd78344eb2a;hpb=06b73aa8f76fe73d27eaca98e6e814428b0eac09

diff --git a/Makefile b/Makefile
index c0acb10..fbe5c86 100644
--- a/Makefile
+++ b/Makefile
@@ -18,27 +18,27 @@ STAGIT_LDFLAGS = ${LIBGIT_LIB} ${LDFLAGS}
 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 = \
-	reallocarray.c\
-	strlcat.c\
-	strlcpy.c
+	src/reallocarray.c\
+	src/strlcat.c\
+	src/strlcpy.c
 BIN = \
 	stagit\
 	stagit-index
 MAN1 = \
-	stagit.1\
-	stagit-index.1
+	man/stagit.1\
+	man/stagit-index.1
 DOC = \
 	LICENSE\
 	README
-HDR = compat.h
+HDR = src/compat.h
 
 COMPATOBJ = \
-	reallocarray.o\
-	strlcat.o\
-	strlcpy.o
+	src/reallocarray.o\
+	src/strlcat.o\
+	src/strlcpy.o
 
 OBJ = ${SRC:.c=.o} ${COMPATOBJ}
 
@@ -54,8 +54,7 @@ dist:
 	rm -rf ${NAME}-${VERSION}
 	mkdir -p ${NAME}-${VERSION}
 	cp -f ${MAN1} ${HDR} ${SRC} ${COMPATSRC} ${DOC} \
-		Makefile favicon.png logo.png style.min.css syntax.css highlight.py \
-		example_create.sh example_post-receive.sh \
+		Makefile resources/* src/highlight.py contrib/* \
 		${NAME}-${VERSION}
 	# make tarball
 	tar -cf - ${NAME}-${VERSION} | \
@@ -64,12 +63,12 @@ dist:
 
 ${OBJ}: ${HDR}
 
-stagit: stagit.o ${COMPATOBJ} requirements.txt
+stagit: src/stagit.o ${COMPATOBJ} requirements.txt
 	pip3 install -r requirements.txt
-	${CC} -o $@ stagit.o ${COMPATOBJ} ${STAGIT_LDFLAGS}
+	${CC} -o $@ src/stagit.o ${COMPATOBJ} ${STAGIT_LDFLAGS}
 
-stagit-index: stagit-index.o ${COMPATOBJ}
-	${CC} -o $@ stagit-index.o ${COMPATOBJ} ${STAGIT_LDFLAGS}
+stagit-index: src/stagit-index.o ${COMPATOBJ}
+	${CC} -o $@ src/stagit-index.o ${COMPATOBJ} ${STAGIT_LDFLAGS}
 
 clean:
 	rm -f ${BIN} ${OBJ} ${NAME}-${VERSION}.tar.gz
@@ -81,36 +80,27 @@ install: all
 	for f in ${BIN}; do chmod 755 ${DESTDIR}${PREFIX}/bin/$$f; done
 	# installing example files.
 	mkdir -p ${DESTDIR}${DOCPREFIX}
-	cp -f favicon.png\
-		logo.png\
-		example_create.sh\
-		example_post-receive.sh\
+	cp -f resources/*.png\
+		contrib/*\
 		README\
 		${DESTDIR}${DOCPREFIX}
 	mkdir -p ${DESTDIR}${SHAREPREFIX}
-	cp -f style.min.css\
-		syntax.css\
-		highlight.py\
+	cp -f resources/*\
+		src/highlight.py\
 		${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.
 	for f in ${BIN}; do rm -f ${DESTDIR}${PREFIX}/bin/$$f; done
 	# removing example files.
-	rm -f \
-		${DESTDIR}${SHAREPREFIX}/style.min.css\
-		${DESTDIR}${SHAREPREFIX}/syntax.css\
-		${DESTDIR}${SHAREPREFIX}/highlight.py\
-		${DESTDIR}${DOCPREFIX}/favicon.png\
-		${DESTDIR}${DOCPREFIX}/logo.png\
-		${DESTDIR}${DOCPREFIX}/example_create.sh\
-		${DESTDIR}${DOCPREFIX}/example_post-receive.sh\
-		${DESTDIR}${DOCPREFIX}/README
-	-rmdir ${DESTDIR}${DOCPREFIX}
+	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