Unify how we check passwords between different OSes

[slock.git] / config.mk

diff --git a/config.mk b/config.mk
index bc27ece..049305c 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # slock version
 # slock version

-VERSION = 0.3
+VERSION = 1.3

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


@@ -12,17 +12,19 @@ X11LIB = /usr/X11R6/lib
 
 # includes and libs
 INCS = -I. -I/usr/include -I${X11INC}
 
 # includes and libs
 INCS = -I. -I/usr/include -I${X11INC}

-LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11
+LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr

 
 # flags
 
 # flags

-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
-LDFLAGS = ${LIBS}
-#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
-#LDFLAGS = -g ${LIBS}
+CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
+CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+LDFLAGS = -s ${LIBS}
+COMPATSRC = explicit_bzero.c

 
 

-# On *BSD remove -DHAVE_SHADOW_H from CFLAGS
-# On OpenBSD remove -lcrypt from LIBS
+# On *BSD remove -DHAVE_SHADOW_H from CPPFLAGS
+# On OpenBSD and Darwin remove -lcrypt from LIBS
+#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXext -lXrandr
+#CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE
+#COMPATSRC =

 
 # compiler and linker
 CC = cc
 
 # compiler and linker
 CC = cc

-LD = ${CC}