pinosaur
/
st.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bump version to 0.8
[st.git]
/
config.mk
diff --git
a/config.mk
b/config.mk
index
4f273cd
..
b2eac10
100644
(file)
--- a/
config.mk
+++ b/
config.mk
@@
-1,23
+1,28
@@
# st version
# st version
-VERSION = 0.
2.1-tip
+VERSION = 0.
8
# 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 -L${X11LIB} -lX11 -lutil -lXext
+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 += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS += -s ${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
+