X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=config.mk;h=e676105ba783a5d68dd2485b7f135430c5755019;hb=d7bf023b2f2d41cb6983bb3ce2c6d1bf049150b3;hp=5729e59a442bb10c206b833874d3f887f2ed121a;hpb=6de1ba6e7437919a137dfc5b925f5504085f4311;p=st.git diff --git a/config.mk b/config.mk index 5729e59..e676105 100644 --- a/config.mk +++ b/config.mk @@ -1,23 +1,33 @@ # st version -VERSION = 0.2-tip +VERSION = 0.8.1 # Customize below to fit your system # paths PREFIX = /usr/local -MANPREFIX = ${PREFIX}/share/man +MANPREFIX = $(PREFIX)/share/man X11INC = /usr/X11R6/include X11LIB = /usr/X11R6/lib # includes and libs -INCS = -I. -I/usr/include -I${X11INC} -LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil +INCS = -I$(X11INC) \ + `pkg-config --cflags fontconfig` \ + `pkg-config --cflags freetype2` +LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \ + `pkg-config --libs fontconfig` \ + `pkg-config --libs freetype2` # flags -CPPFLAGS = -DVERSION=\"${VERSION}\" -CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} -LDFLAGS += -s ${LIBS} +CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 +STCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS) +STLDFLAGS = $(LIBS) $(LDFLAGS) + +# OpenBSD: +#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE +#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \ +# `pkg-config --libs fontconfig` \ +# `pkg-config --libs freetype2` # compiler and linker -CC ?= cc +# CC = c99