applied Martin Hurton's scan() patch with slight modifications

[dwm.git] / config.mk

diff --git a/config.mk b/config.mk
index b3c8cf7..9e4636a 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,4 +1,7 @@
-# Customize to fit your system
+# dwm version
+VERSION = 5.2
+
+# Customize below to fit your system

 
 # paths
 PREFIX = /usr/local
 
 # paths
 PREFIX = /usr/local


@@ -7,21 +10,22 @@ MANPREFIX = ${PREFIX}/share/man
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 

-# includes and libs
-INCS = -I/usr/lib -I${X11INC}
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+# Xinerama, comment if you don't want it
+XINERAMALIBS = -L${X11LIB} -lXinerama
+XINERAMAFLAGS = -DXINERAMA

 
 

-# dwm version
-VERSION = 0.6
-
-# default config.h
-CONFIG = config.h
+# includes and libs
+INCS = -I. -I/usr/include -I${X11INC}
+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}

 
 # flags
 
 # flags

-CFLAGS = -O3 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIG}\"
-LDFLAGS = ${LIBS}
-#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIG}\"
-#LDFLAGS = -g ${LIBS}
+CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+LDFLAGS = -s ${LIBS}
+
+# Solaris
+#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+#LDFLAGS = ${LIBS}

 
 

-# compiler
+# compiler and linker

 CC = cc
 CC = cc