X-Git-Url: https://git.armaanb.net/?p=st.git;a=blobdiff_plain;f=config.mk;h=3d236f0a2dbd217689010df2a3ecc6010e0fb113;hp=ecc5c833989b5fbb4d50aaa6f528acc0c3ff7395;hb=HEAD;hpb=4682cc9596a5c82325882bdf1313728de95467d2

diff --git a/config.mk b/config.mk
index ecc5c83..3d236f0 100644
--- a/config.mk
+++ b/config.mk
@@ -1,28 +1,37 @@
 # st version
-VERSION = 0.3
+VERSION = 0.8.4
 
 # 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
 
+PKG_CONFIG = pkg-config
+
 # includes and libs
-INCS = -I. -I/usr/include -I${X11INC} \
-       $(shell pkg-config --cflags fontconfig) \
-       $(shell pkg-config --cflags freetype2)
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft \
-       $(shell pkg-config --libs fontconfig)  \
-       $(shell pkg-config --libs freetype2)
+INCS = -I$(X11INC) \
+       `$(PKG_CONFIG) --cflags fontconfig` \
+       `$(PKG_CONFIG) --cflags freetype2` \
+       `$(PKG_CONFIG) --cflags harfbuzz`
+LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
+       `$(PKG_CONFIG) --libs fontconfig` \
+       `$(PKG_CONFIG) --libs freetype2` \
+       `$(PKG_CONFIG) --libs harfbuzz`
 
 # flags
-CPPFLAGS = -DVERSION=\"${VERSION}\"
-CFLAGS += -g -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS += -g ${LIBS}
+STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
+STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
+STLDFLAGS = $(LIBS) $(LDFLAGS)
 
-# compiler and linker
-CC ?= cc
+# 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 = c99