X-Git-Url: https://git.danieliu.xyz/?p=st.git;a=blobdiff_plain;f=config.mk;h=0cbb002279bb0971d765d1f380e668555210cfe5;hp=4d0a869c73c0a2d9d5e51b83075a4851181ea810;hb=e85b6b64660214121164ea97fb098eaa4935f7db;hpb=645c1b0afccf14a5bcdf754475516554437599ca

diff --git a/config.mk b/config.mk
index 4d0a869..0cbb002 100644
--- a/config.mk
+++ b/config.mk
@@ -1,28 +1,35 @@
 # st version
-VERSION = 0.4
+VERSION = 0.8.2
 
 # 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} \
-       `pkg-config --cflags fontconfig` \
-       `pkg-config --cflags freetype2`
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft \
-       `pkg-config --libs fontconfig`  \
-       `pkg-config --libs freetype2`
+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}\" -D_BSD_SOURCE -D_XOPEN_SOURCE=600
-CFLAGS += -g -std=c99 -pedantic -Wall -Wvariadic-macros -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