Lines 1-5
Link Here
|
1 |
--- config.mk.orig 2009-07-14 20:07:55.000000000 +0200 |
1 |
--- config.mk.orig 2010-05-29 19:10:33.000000000 +0200 |
2 |
+++ config.mk 2009-07-20 13:29:40.000000000 +0200 |
2 |
+++ config.mk 2010-05-29 19:14:06.000000000 +0200 |
3 |
@@ -4,11 +4,11 @@ |
3 |
@@ -4,11 +4,11 @@ |
4 |
# Customize below to fit your system |
4 |
# Customize below to fit your system |
5 |
|
5 |
|
Lines 14-36
Link Here
|
14 |
+X11INC = $(LOCALBASE)/include |
14 |
+X11INC = $(LOCALBASE)/include |
15 |
+X11LIB = $(LOCALBASE)/lib |
15 |
+X11LIB = $(LOCALBASE)/lib |
16 |
|
16 |
|
17 |
# Xinerama, un-comment if you want it |
17 |
# Xinerama |
18 |
XINERAMALIBS = -L${X11LIB} -lXinerama |
18 |
XINERAMALIBS = -L${X11LIB} -lXinerama |
19 |
@@ -19,15 +19,15 @@ |
19 |
@@ -19,10 +19,10 @@ |
20 |
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS} |
20 |
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS} |
21 |
|
21 |
|
22 |
# flags |
22 |
# flags |
23 |
-CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} |
23 |
-CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} |
|
|
24 |
-CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} |
24 |
+CPPFLAGS+= -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} |
25 |
+CPPFLAGS+= -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} |
25 |
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} |
26 |
+CFLAGS+= -g -std=c99 ${INCS} ${CPPFLAGS} |
26 |
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} |
27 |
#CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} |
27 |
+CFLAGS+= -std=c99 ${INCS} ${CPPFLAGS} |
28 |
-LDFLAGS = -g ${LIBS} |
28 |
#LDFLAGS = -g ${LIBS} |
29 |
+LDFLAGS+= -g ${LIBS} |
29 |
-LDFLAGS = -s ${LIBS} |
30 |
#LDFLAGS = -s ${LIBS} |
30 |
+LDFLAGS+= ${LIBS} |
|
|
31 |
|
31 |
|
32 |
# Solaris |
32 |
# Solaris |
33 |
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" |
33 |
@@ -30,4 +30,4 @@ |
34 |
#LDFLAGS = ${LIBS} |
34 |
#LDFLAGS = ${LIBS} |
35 |
|
35 |
|
36 |
# compiler and linker |
36 |
# compiler and linker |