fixes to compile cleanly with -Wall and -DPOSIX_SOURCE

changed config.mk, there were problems with solaris


git-svn-id: http://dzen.googlecode.com/svn/trunk@87 f2baff5b-bf2c-0410-a398-912abdc3d8b2

1 files changed, 11 insertions, 15 deletions

diff --git a/config.mk b/config.mk
index d4d9a2b..0efce5e 100644
--- a/config.mk
+++ b/config.mk
@@ -11,30 +11,26 @@ X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 INCS = -I. -I/usr/include -I${X11INC}
 
-# Uncomment this line to use Xinerama.
-# USE_XINERAMA=y
-
-# (ifdef/else/endif might not be portable; if it doesn't work for you,
-# contact the author and we'll work on a better solution.)
-ifdef USE_XINERAMA
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA
-else
+
+# No Xinerama, comment the following two lines for Xinerama
 LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
 CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
-endif
 
-LDFLAGS = ${LIBS}
+# With Xinerama, uncomment the following two lines for Xinerama
+#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama
+#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA
 
-# Debugging
-#CFLAGS = -g -Wall -O0 ${INCS} -DVERSION=\"${VERSION}\" -DPOSIX_SOURCE
-#LDFLAGS = -g ${LIBS}
+LDFLAGS = ${LIBS}
 
-# Solaris
+# Solaris, uncomment for Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
 #LDFLAGS = ${LIBS}
 #CFLAGS += -xtarget=ultra
 
+# Debugging
+#CFLAGS = -g -Wall -O0 ${INCS} -DVERSION=\"${VERSION}\" -DPOSIX_SOURCE
+#LDFLAGS = -g ${LIBS}
+
 # compiler and linker
 CC = cc
 LD = ${CC}