From deda1bb016b035f4387a09df8d81c1fc14eaf189 Mon Sep 17 00:00:00 2001 From: Hiltjo Posthuma Date: Fri, 14 Oct 2022 19:18:10 +0200 Subject: Makefile improvements * Respect system cflags, ldflags, packages can override them all with TABBED_{CFLAGS,LDFLAGS}. Remove -Wall and -Os and -s. * Install README as documentation. * dist: stream directly to a gzipped tarball. * options: remove it. * Add ".POSIX:" * Remove config.mk --- config.mk | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'config.mk') diff --git a/config.mk b/config.mk index e69209e..0c06c2c 100644 --- a/config.mk +++ b/config.mk @@ -1,27 +1,12 @@ -# tabbed version -VERSION = 0.7 - # paths PREFIX = /usr/local MANPREFIX = ${PREFIX}/share/man +DOCPREFIX = ${PREFIX}/share/doc/${NAME} -X11INC = /usr/X11R6/include -X11LIB = /usr/X11R6/lib +# use system flags. +TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/include/freetype2 ${CPPFLAGS} +TABBED_LDFLAGS = -L/usr/X11R6/lib -lX11 /usr/X11R6/lib ${LDFLAGS} +TABBED_CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -# freetype -FREETYPELIBS = -lfontconfig -lXft -FREETYPEINC = /usr/include/freetype2 # OpenBSD (uncomment) -#FREETYPEINC = ${X11INC}/freetype2 - -# includes and libs -INCS = -I. -I/usr/include -I$(X11INC) -I${FREETYPEINC} -LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${FREETYPELIBS} - -# flags -CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} -LDFLAGS = -s ${LIBS} - -# compiler and linker -CC = cc +#TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 ${CPPFLAGS} -- cgit v1.2.3