From 0326a6b837a7e5bb490360a7cdb0225947cee166 Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Sat, 5 Oct 2019 23:04:09 +0200
Subject: Makefile: simplify, remove config.mk

---
 Makefile  | 18 ++++++++++++++----
 config.mk | 29 -----------------------------
 2 files changed, 14 insertions(+), 33 deletions(-)
 delete mode 100644 config.mk

diff --git a/Makefile b/Makefile
index 6f31fda..d043cb5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,20 @@
 .POSIX:
 
-include config.mk
-
 NAME = sfeed
 VERSION = 0.9.13
 
+# paths
+PREFIX = /usr/local
+MANPREFIX = ${PREFIX}/man
+DOCPREFIX = ${PREFIX}/share/doc/${NAME}
+
+RANLIB = ranlib
+
+# use system flags.
+SFEED_CFLAGS = ${CFLAGS}
+SFEED_LDFLAGS = ${LDFLAGS}
+SFEED_CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_BSD_SOURCE
+
 BIN = \
 	sfeed\
 	sfeed_atom\
@@ -61,7 +71,7 @@ ${BIN}: ${LIB} ${@:=.o}
 
 OBJ = ${SRC:.c=.o} ${LIBXMLOBJ} ${LIBUTILOBJ} ${COMPATOBJ}
 
-${OBJ}: config.mk ${HDR}
+${OBJ}: ${HDR}
 
 .o:
 	${CC} ${SFEED_LDFLAGS} -o $@ $< ${LIB}
@@ -82,7 +92,7 @@ dist:
 	mkdir -p "${NAME}-${VERSION}"
 	cp -f ${MAN1} ${MAN5} ${DOC} ${HDR} \
 		${SRC} ${LIBXMLSRC} ${LIBUTILSRC} ${COMPATSRC} ${SCRIPTS} \
-		Makefile config.mk \
+		Makefile \
 		sfeedrc.example style.css \
 		"${NAME}-${VERSION}"
 	# make tarball
diff --git a/config.mk b/config.mk
deleted file mode 100644
index da98920..0000000
--- a/config.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# customize below to fit your system
-
-# paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/man
-DOCPREFIX = ${PREFIX}/share/doc/sfeed
-
-# compiler and linker
-CC = cc
-AR = ar
-RANLIB = ranlib
-
-# use system flags.
-SFEED_CFLAGS = ${CFLAGS}
-SFEED_LDFLAGS = ${LDFLAGS}
-SFEED_CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_BSD_SOURCE
-
-# debug
-#SFEED_CFLAGS = -fstack-protector-all -O0 -g -std=c99 -Wall -Wextra -pedantic \
-#               -Wno-unused-parameter
-#SFEED_LDFLAGS =
-
-# optimized
-#SFEED_CFLAGS = -O2 -std=c99
-#SFEED_LDFLAGS = -s
-
-# optimized static
-#SFEED_CFLAGS = -static -O2 -std=c99
-#SFEED_LDFLAGS = -static -s
-- 
cgit v1.2.3