]>
Commit | Line | Data |
---|---|---|
71cf65ff | 1 | --- dzen2-0.8.5/config.mk~ 2007-08-18 08:18:50.000000000 +0200 |
2 | +++ dzen2-0.8.5/config.mk 2011-05-30 09:08:07.921566614 +0200 | |
3 | @@ -19,8 +19,8 @@ | |
4 | # Comment : Add # to the beginning of the respective lines | |
5 | ||
6 | # Option 1: No Xinerama no XPM | |
7 | -LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 | |
8 | -CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" | |
9 | +#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 | |
10 | +#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" | |
11 | ||
12 | # Option 2: No Xinerama with XPM | |
13 | #LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm | |
14 | @@ -31,13 +31,13 @@ | |
15 | #CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA | |
16 | ||
17 | # Option 4: With Xinerama and XPM | |
18 | -#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm | |
19 | -#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM | |
20 | +LIBS = -L$(LIBDIR) -lc -L${X11LIB} -lX11 -lXinerama -lXpm | |
21 | +CFLAGS = $(OPTFLAGS) -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM | |
22 | ||
23 | # END of feature configuration | |
24 | ||
25 | ||
26 | -LDFLAGS = ${LIBS} | |
27 | +LDFLAGS = $(OPTFLAGS) $(PLD_LDFLAGS) ${LIBS} | |
28 | ||
29 | # Solaris, uncomment for Solaris | |
30 | #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" | |
31 | --- dzen2-0.8.5/gadgets/config.mk~ 2007-08-18 08:18:50.000000000 +0200 | |
32 | +++ dzen2-0.8.5/gadgets/config.mk 2011-05-30 09:08:59.415317806 +0200 | |
33 | @@ -8,10 +8,10 @@ | |
34 | INCS = -I. -I/usr/include -I${X11INC} | |
35 | ||
36 | X11LIB = /usr/X11R6/lib | |
37 | -LIBS = -L/usr/lib | |
38 | +LIBS = -L$(LIBDIR) | |
39 | ||
40 | -CFLAGS = -Os ${INCS} | |
41 | -LDFLAGS = ${LIBS} | |
42 | +CFLAGS = $(OPTFLAGS) -Os ${INCS} | |
43 | +LDFLAGS = $(OPTFLAGS) $(PLD_LDFLAGS) ${LIBS} | |
44 | ||
45 | # compiler and linker | |
46 | CC = gcc |