1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
|
--- a/Makefile
+++ b/Makefile
@@ -12,45 +12,44 @@
@echo dzen2 build options:
@echo "CFLAGS = ${CFLAGS}"
@echo "LDFLAGS = ${LDFLAGS}"
- @echo "CC = ${CC}"
+ @echo "CC = $(CC)"
@echo "LD = ${LD}"
.c.o:
@echo CC $<
- @${CC} -c ${CFLAGS} $<
+ $(CC) -c ${CFLAGS} $<
${OBJ}: dzen.h action.h config.mk
dzen2: ${OBJ}
@echo LD $@
- @${LD} -o $@ ${OBJ} ${LDFLAGS}
- @strip $@
+ ${LD} -o $@ ${OBJ} ${LDFLAGS}
@echo "Run ./help for documentation"
clean:
@echo cleaning
- @rm -f dzen2 ${OBJ} dzen2-${VERSION}.tar.gz
+ rm -f dzen2 ${OBJ} dzen2-${VERSION}.tar.gz
dist: clean
@echo creating dist tarball
- @mkdir -p dzen2-${VERSION}
- @mkdir -p dzen2-${VERSION}/gadgets
- @mkdir -p dzen2-${VERSION}/bitmaps
- @cp -R CREDITS LICENSE Makefile INSTALL README.dzen README help config.mk action.h dzen.h ${SRC} dzen2-${VERSION}
- @cp -R gadgets/Makefile gadgets/config.mk gadgets/README.dbar gadgets/textwidth.c gadgets/README.textwidth gadgets/dbar.c gadgets/gdbar.c gadgets/README.gdbar gadgets/gcpubar.c gadgets/README.gcpubar gadgets/kittscanner.sh gadgets/README.kittscanner gadgets/noisyalert.sh dzen2-${VERSION}/gadgets
- @cp -R bitmaps/alert.xbm bitmaps/ball.xbm bitmaps/battery.xbm bitmaps/envelope.xbm bitmaps/volume.xbm bitmaps/pause.xbm bitmaps/play.xbm bitmaps/music.xbm dzen2-${VERSION}/bitmaps
- @tar -cf dzen2-${VERSION}.tar dzen2-${VERSION}
- @gzip dzen2-${VERSION}.tar
- @rm -rf dzen2-${VERSION}
+ mkdir -p dzen2-${VERSION}
+ mkdir -p dzen2-${VERSION}/gadgets
+ mkdir -p dzen2-${VERSION}/bitmaps
+ cp -R CREDITS LICENSE Makefile INSTALL README.dzen README help config.mk action.h dzen.h ${SRC} dzen2-${VERSION}
+ cp -R gadgets/Makefile gadgets/config.mk gadgets/README.dbar gadgets/textwidth.c gadgets/README.textwidth gadgets/dbar.c gadgets/gdbar.c gadgets/README.gdbar gadgets/gcpubar.c gadgets/README.gcpubar gadgets/kittscanner.sh gadgets/README.kittscanner gadgets/noisyalert.sh dzen2-${VERSION}/gadgets
+ cp -R bitmaps/alert.xbm bitmaps/ball.xbm bitmaps/battery.xbm bitmaps/envelope.xbm bitmaps/volume.xbm bitmaps/pause.xbm bitmaps/play.xbm bitmaps/music.xbm dzen2-${VERSION}/bitmaps
+ tar -cf dzen2-${VERSION}.tar dzen2-${VERSION}
+ gzip dzen2-${VERSION}.tar
+ rm -rf dzen2-${VERSION}
install: all
@echo installing executable file to ${DESTDIR}${PREFIX}/bin
- @mkdir -p ${DESTDIR}${PREFIX}/bin
- @cp -f dzen2 ${DESTDIR}${PREFIX}/bin
- @chmod 755 ${DESTDIR}${PREFIX}/bin/dzen2
+ mkdir -p ${DESTDIR}${PREFIX}/bin
+ cp -f dzen2 ${DESTDIR}${PREFIX}/bin
+ chmod 755 ${DESTDIR}${PREFIX}/bin/dzen2
uninstall:
@echo removing executable file from ${DESTDIR}${PREFIX}/bin
- @rm -f ${DESTDIR}${PREFIX}/bin/dzen2
+ rm -f ${DESTDIR}${PREFIX}/bin/dzen2
.PHONY: all options clean dist install uninstall
--- a/config.mk
+++ b/config.mk
@@ -4,7 +4,7 @@
# Customize below to fit your system
# paths
-PREFIX = /usr/local
+PREFIX = /usr
MANPREFIX = ${PREFIX}/share/man
X11INC = /usr/X11R6/include
@@ -18,61 +18,12 @@
# Uncomment: Remove # from the beginning of respective lines
# Comment : Add # to the beginning of the respective lines
-## Option 1: No Xinerama no XPM no XFT
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\"
-
-
-## Option 2: No Xinerama with XPM
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm
-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM
-
-
-# Option 3: With Xinerama no XPM
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama
-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA
-
-
-## Option 4: With Xinerama and XPM
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm
-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
-
-
-## Option 5: With XFT
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs xft`
-CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XFT `pkg-config --cflags xft`
-
-
-## Option 6: With XPM and XFT
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm `pkg-config --libs xft`
-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`
-
-
-## Option 7: With Xinerama and XFT
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama `pkg-config --libs xft`
-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XFT `pkg-config --cflags xft`
-
-
-## Option 8: With Xinerama and XPM and XFT
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft`
-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`
-
-
+LIBS = -lX11
+CFLAGS += -Wall ${INCS} -DVERSION=\"${VERSION}\"
# END of feature configuration
-
-LDFLAGS = ${LIBS}
-
-# Solaris, uncomment for Solaris
-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
-#CFLAGS += -xtarget=ultra
-
-# Debugging
-#CFLAGS = ${INCS} -DVERSION=\"${VERSION}\" -std=gnu89 -pedantic -Wall -W -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wdisabled-optimization -O2 -pipe -DDZEN_XFT `pkg-config --cflags xft`
-#LDFLAGS = ${LIBS}
+LDFLAGS += ${LIBS}
# compiler and linker
-CC = gcc
-LD = ${CC}
+LD = $(CC)
--- a/gadgets/Makefile
+++ b/gadgets/Makefile
@@ -12,61 +12,57 @@
@echo dzen2 gadgets build options:
@echo "CFLAGS = ${CFLAGS}"
@echo "LDFLAGS = ${LDFLAGS}"
- @echo "CC = ${CC}"
+ @echo "CC = $(CC)"
@echo "LD = ${LD}"
.c.o:
@echo CC $<
- @${CC} -c ${CFLAGS} $<
+ $(CC) -c ${CFLAGS} $<
${OBJ}: dbar.h config.mk
dbar: ${OBJ}
@echo LD $@
- @${LD} -o $@ dbar-main.o dbar.o ${LDFLAGS}
- @strip $@
+ ${LD} -o $@ dbar-main.o dbar.o ${LDFLAGS}
gdbar: ${OBJ}
@echo LD $@
# @${LD} -o $@ gdbar.o dbar.o ${LDFLAGS} -L${X11LIB} -lX11
- @${LD} -o $@ gdbar.o dbar.o ${LDFLAGS}
- @strip $@
+ ${LD} -o $@ gdbar.o dbar.o ${LDFLAGS}
gcpubar: ${OBJ}
@echo LD $@
# @${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS} -L${X11LIB}
- @${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS}
- @strip $@
+ ${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS}
textwidth: ${OBJ}
@echo LD $@
- @${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
- @strip $@
+ ${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
clean:
@echo cleaning
- @rm -f ${OBJ} dbar
- @rm -f ${OBJ} gdbar
- @rm -f ${OBJ} gcpubar
- @rm -f ${OBJ} textwidth
+ rm -f ${OBJ} dbar
+ rm -f ${OBJ} gdbar
+ rm -f ${OBJ} gcpubar
+ rm -f ${OBJ} textwidth
install: all
@echo installing executable file to ${DESTDIR}${PREFIX}/bin
- @mkdir -p ${DESTDIR}${PREFIX}/bin
- @cp -f dbar ${DESTDIR}${PREFIX}/bin
- @chmod 755 ${DESTDIR}${PREFIX}/bin/dbar
- @cp -f gdbar ${DESTDIR}${PREFIX}/bin
- @chmod 755 ${DESTDIR}${PREFIX}/bin/gdbar
- @cp -f gcpubar ${DESTDIR}${PREFIX}/bin
- @chmod 755 ${DESTDIR}${PREFIX}/bin/gcpubar
- @cp -f textwidth ${DESTDIR}${PREFIX}/bin
- @chmod 755 ${DESTDIR}${PREFIX}/bin/textwidth
+ mkdir -p ${DESTDIR}${PREFIX}/bin
+ cp -f dbar ${DESTDIR}${PREFIX}/bin
+ chmod 755 ${DESTDIR}${PREFIX}/bin/dbar
+ cp -f gdbar ${DESTDIR}${PREFIX}/bin
+ chmod 755 ${DESTDIR}${PREFIX}/bin/gdbar
+ cp -f gcpubar ${DESTDIR}${PREFIX}/bin
+ chmod 755 ${DESTDIR}${PREFIX}/bin/gcpubar
+ cp -f textwidth ${DESTDIR}${PREFIX}/bin
+ chmod 755 ${DESTDIR}${PREFIX}/bin/textwidth
uninstall:
@echo removing executable file from ${DESTDIR}${PREFIX}/bin
- @rm -f ${DESTDIR}${PREFIX}/bin/dbar
- @rm -f ${DESTDIR}${PREFIX}/bin/gdbar
- @rm -f ${DESTDIR}${PREFIX}/bin/gcpubar
- @rm -f ${DESTDIR}${PREFIX}/bin/textwidth
+ rm -f ${DESTDIR}${PREFIX}/bin/dbar
+ rm -f ${DESTDIR}${PREFIX}/bin/gdbar
+ rm -f ${DESTDIR}${PREFIX}/bin/gcpubar
+ rm -f ${DESTDIR}${PREFIX}/bin/textwidth
.PHONY: all options clean install uninstall
--- a/gadgets/config.mk
+++ b/gadgets/config.mk
@@ -1,7 +1,7 @@
# Customize below to fit your system
# paths
-PREFIX = /usr/local
+PREFIX = /usr
MANPREFIX = ${PREFIX}/share/man
X11INC = /usr/X11R6/include
@@ -10,9 +10,8 @@
X11LIB = /usr/X11R6/lib
LIBS = -L/usr/lib
-CFLAGS = -Os ${INCS}
-LDFLAGS = ${LIBS}
+CFLAGS += ${INCS}
+LDFLAGS += ${LIBS}
# compiler and linker
-CC = gcc
LD = ${CC}
|
GitWeb