Move key-matching functions into x.c

[st.git] / config.mk

diff --git a/config.mk b/config.mk
index 4d76c67..0aceec4 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,34 +1,28 @@
 # st version
 # st version

-VERSION = 0.0
+VERSION = 0.7

 
 # Customize below to fit your system
 
 # paths
 PREFIX = /usr/local
 
 # 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
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
 # includes and libs

-INCS = -I. -I/usr/include -I${X11INC}
-LIBS = -L/usr/lib -lc
-X11LIBS =  -L${X11LIB} -lX11
-
-# glibc
-CPPFLAGS = -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
+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
 
 # flags

-#CPPFLAGS = -DVERSION=\"${VERSION}\"
-CFLAGS = -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
-X11LDFLAGS = ${X11LIBS}
-#CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} ${CPPFLAGS}
-#LDFLAGS = -g ${LIBS}
-
-# Solaris
-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
+CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
+STCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
+STLDFLAGS = $(LIBS) $(LDFLAGS)

 
 # compiler and linker
 
 # compiler and linker

-CC = cc
+# CC = c99
+