|
 |
41e9a6a |
diff -up dzen2-0.8.5/config.mk.check_environment dzen2-0.8.5/config.mk
|
|
|
41e9a6a |
--- dzen2-0.8.5/config.mk.check_environment 2007-08-18 08:18:50.000000000 +0200
|
|
|
41e9a6a |
+++ dzen2-0.8.5/config.mk 2007-12-26 13:40:06.000000000 +0100
|
|
|
41e9a6a |
@@ -4,40 +4,41 @@ VERSION = 0.8.5
|
|
|
41e9a6a |
# Customize below to fit your system
|
|
|
41e9a6a |
|
|
|
41e9a6a |
# paths
|
|
|
41e9a6a |
-PREFIX = /usr/local
|
|
|
41e9a6a |
-MANPREFIX = ${PREFIX}/share/man
|
|
|
41e9a6a |
+PREFIX ?= /usr/local
|
|
|
41e9a6a |
+MANPREFIX ?= ${PREFIX}/share/man
|
|
|
41e9a6a |
|
|
|
41e9a6a |
X11INC = /usr/X11R6/include
|
|
|
41e9a6a |
X11LIB = /usr/X11R6/lib
|
|
|
41e9a6a |
INCS = -I. -I/usr/include -I${X11INC}
|
|
|
41e9a6a |
|
|
|
41e9a6a |
# Configure the features you want to be supported
|
|
|
41e9a6a |
-# Only one of the following options has to be uncommented,
|
|
|
41e9a6a |
-# all others must be commented!
|
|
|
41e9a6a |
-#
|
|
|
41e9a6a |
-# Uncomment: Remove # from the beginning of respective lines
|
|
|
41e9a6a |
-# Comment : Add # to the beginning of the respective lines
|
|
|
41e9a6a |
|
|
|
41e9a6a |
-# Option 1: No Xinerama no XPM
|
|
|
41e9a6a |
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
|
|
|
41e9a6a |
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
|
|
|
41e9a6a |
+# Remove the # from the next line to enable Xinerama support
|
|
|
41e9a6a |
+#DZEN_XINERAMA=1
|
|
|
41e9a6a |
+
|
|
|
41e9a6a |
+# Remove the # from the next line to enable Xpm support
|
|
|
41e9a6a |
+#DZEN_XPM=1
|
|
|
41e9a6a |
|
|
|
41e9a6a |
-# Option 2: No Xinerama with XPM
|
|
|
41e9a6a |
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm
|
|
|
41e9a6a |
-#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM
|
|
|
41e9a6a |
-
|
|
|
41e9a6a |
-# Option 3: With Xinerama no XPM
|
|
|
41e9a6a |
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama
|
|
|
41e9a6a |
-#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA
|
|
|
41e9a6a |
-
|
|
|
41e9a6a |
-# Option 4: With Xinerama and XPM
|
|
|
41e9a6a |
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm
|
|
|
41e9a6a |
-#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
|
|
|
41e9a6a |
+# Uncomment: Remove # from the beginning of respective lines
|
|
|
41e9a6a |
+# Comment : Add # to the beginning of the respective lines
|
|
|
41e9a6a |
|
|
|
41e9a6a |
# END of feature configuration
|
|
|
41e9a6a |
|
|
|
41e9a6a |
+CFLAGS ?= -Os
|
|
|
41e9a6a |
+CFLAGS += ${INCS} -DVERSION=\"${VERSION}\"
|
|
|
41e9a6a |
+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
|
|
|
41e9a6a |
+
|
|
|
41e9a6a |
+ifeq ($(DZEN_XINERAMA),1)
|
|
|
41e9a6a |
+LIBS += -lXinerama
|
|
|
41e9a6a |
+CFLAGS += -DDZEN_XINERAMA
|
|
|
41e9a6a |
+endif
|
|
|
41e9a6a |
+
|
|
|
41e9a6a |
+ifeq ($(DZEN_XPM), 1)
|
|
|
41e9a6a |
+LIBS += -lXpm
|
|
|
41e9a6a |
+CFLAGS += -DDZEN_XPM
|
|
|
41e9a6a |
+endif
|
|
|
41e9a6a |
|
|
|
41e9a6a |
-LDFLAGS = ${LIBS}
|
|
|
41e9a6a |
+LDFLAGS = ${CFLAGS} ${LIBS}
|
|
|
41e9a6a |
|
|
|
41e9a6a |
# Solaris, uncomment for Solaris
|
|
|
41e9a6a |
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
|
|
|
41e9a6a |
diff -up dzen2-0.8.5/gadgets/config.mk.check_environment dzen2-0.8.5/gadgets/config.mk
|
|
|
41e9a6a |
--- dzen2-0.8.5/gadgets/config.mk.check_environment 2007-08-18 08:18:50.000000000 +0200
|
|
|
41e9a6a |
+++ dzen2-0.8.5/gadgets/config.mk 2007-12-26 13:39:04.000000000 +0100
|
|
|
41e9a6a |
@@ -1,8 +1,8 @@
|
|
|
41e9a6a |
# Customize below to fit your system
|
|
|
41e9a6a |
|
|
|
41e9a6a |
# paths
|
|
|
41e9a6a |
-PREFIX = /usr/local
|
|
|
41e9a6a |
-MANPREFIX = ${PREFIX}/share/man
|
|
|
41e9a6a |
+PREFIX ?= /usr/local
|
|
|
41e9a6a |
+MANPREFIX ?= ${PREFIX}/share/man
|
|
|
41e9a6a |
|
|
|
41e9a6a |
X11INC = /usr/X11R6/include
|
|
|
41e9a6a |
INCS = -I. -I/usr/include -I${X11INC}
|
|
|
41e9a6a |
@@ -10,8 +10,9 @@ INCS = -I. -I/usr/include -I${X11INC}
|
|
|
41e9a6a |
X11LIB = /usr/X11R6/lib
|
|
|
41e9a6a |
LIBS = -L/usr/lib
|
|
|
41e9a6a |
|
|
|
41e9a6a |
-CFLAGS = -Os ${INCS}
|
|
|
41e9a6a |
-LDFLAGS = ${LIBS}
|
|
|
41e9a6a |
+CFLAGS ?= -Os
|
|
|
41e9a6a |
+CFLAGS += ${INCS}
|
|
|
41e9a6a |
+LDFLAGS = ${CFLAGS} ${LIBS}
|
|
|
41e9a6a |
|
|
|
41e9a6a |
# compiler and linker
|
|
|
41e9a6a |
CC = gcc
|