Comment default CC assignment

[st.git] / config.mk

diff --git a/config.mk b/config.mk
index eca6028..46457f7 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # st version
 # st version

-VERSION = 0.0
+VERSION = 0.5

 
 # Customize below to fit your system
 
 
 # Customize below to fit your system
 


@@ -11,22 +11,18 @@ X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
 # includes and libs
 X11LIB = /usr/X11R6/lib
 
 # includes and libs

-INCS = -I. -I/usr/include -I${X11INC}
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
-
-# glibc
-CPPFLAGS = -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
+INCS = -I. -I/usr/include -I${X11INC} \
+       `pkg-config --cflags fontconfig` \
+       `pkg-config --cflags freetype2`
+LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXext -lXft \
+       `pkg-config --libs fontconfig`  \
+       `pkg-config --libs freetype2`

 
 # flags
 
 # flags

-#CPPFLAGS = -DVERSION=\"${VERSION}\"
-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
 
 # compiler and linker

-CC = cc
+# CC = cc
+