X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=config.mk;h=88355c714f4aadc43644726c029235f65ed74b7a;hb=502911e55442a89602bd5681763f68250bff330b;hp=5983bcbd4a167c113a2b25ecdfe5075bd61099f2;hpb=1987ae4bacf58c588bbc967434be4e39125c37f9;p=st.git

diff --git a/config.mk b/config.mk
index 5983bcb..88355c7 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # st version
-VERSION = 0.0
+VERSION = 0.4
 
 # Customize below to fit your system
 
@@ -10,24 +10,19 @@ MANPREFIX = ${PREFIX}/share/man
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
-# Xinerama, comment if you don't want it
-XINERAMALIBS = -L${X11LIB} -lXinerama
-XINERAMAFLAGS = -DXINERAMA
-
 # includes and libs
-INCS = -I. -I/usr/include -I${X11INC}
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
+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)
 
 # flags
-CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-CFLAGS = -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
-#CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} ${CPPFLAGS}
-#LDFLAGS = -g ${LIBS}
-
-# Solaris
-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
+CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_XOPEN_SOURCE=600
+CFLAGS += -g -std=c99 -pedantic -Wall -Wvariadic-macros -Os ${INCS} ${CPPFLAGS}
+LDFLAGS += -g ${LIBS}
 
 # compiler and linker
-CC = cc
+CC ?= cc
+