The style inquisition was here again.

[st.git] / config.mk

diff --git a/config.mk b/config.mk
index 4d76c67..f1757ed 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # st version
 # st version

-VERSION = 0.0
+VERSION = 0.3

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


@@ -11,24 +11,14 @@ 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
-X11LIBS =  -L${X11LIB} -lX11
-
-# glibc
-CPPFLAGS = -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
+INCS = -I. -I/usr/include -I${X11INC} -I/usr/include/freetype2
+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft -lfontconfig

 
 # 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}\"
+CFLAGS += -g -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+LDFLAGS += -g ${LIBS}

 
 # compiler and linker
 
 # compiler and linker

-CC = cc
+CC ?= cc
+