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
|
Description: Build gadgets
Author: Petr Rockai <mornfall@debian.org>
Origin: vendor
Bug-Debian: http://bugs.debian.org/458906
Forwarded: no
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: dzen2/Makefile
===================================================================
--- dzen2.orig/Makefile 2013-04-20 14:23:26.640915047 -0400
+++ dzen2/Makefile 2013-04-20 14:23:26.632914850 -0400
@@ -6,7 +6,10 @@
SRC = draw.c main.c util.c action.c
OBJ = ${SRC:.c=.o}
-all: options dzen2
+all: options dzen2 gadgets-all
+
+gadgets-%:
+ $(MAKE) -C gadgets $(*)
options:
@echo dzen2 build options:
@@ -27,7 +30,7 @@
@strip $@
@echo "Run ./help for documentation"
-clean:
+clean: gadgets-clean
@echo cleaning
@rm -f dzen2 ${OBJ} dzen2-${VERSION}.tar.gz
@@ -43,7 +46,7 @@
@gzip dzen2-${VERSION}.tar
@rm -rf dzen2-${VERSION}
-install: all
+install: all gadgets-install
@echo installing executable file to ${DESTDIR}${PREFIX}/bin
@mkdir -p ${DESTDIR}${PREFIX}/bin
@cp -f dzen2 ${DESTDIR}${PREFIX}/bin
Index: dzen2/gadgets/Makefile
===================================================================
--- dzen2.orig/gadgets/Makefile 2013-04-20 14:23:26.640915047 -0400
+++ dzen2/gadgets/Makefile 2013-04-20 14:23:40.809265035 -0400
@@ -5,8 +5,9 @@
SRC = dbar.c dbar-main.c gdbar.c gcpubar.c textwidth.c
OBJ = ${SRC:.c=.o}
+PROGS = dbar gdbar gcpubar textwidth
-all: options dbar gdbar gcpubar textwidth
+all: options $(PROGS)
options:
@echo dzen2 gadgets build options:
@@ -53,14 +54,10 @@
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
+ for prog in $(PROGS); do \
+ cp -f $${prog} ${DESTDIR}${PREFIX}/bin/dzen2-$${prog} && \
+ chmod 755 ${DESTDIR}${PREFIX}/bin/dzen2-$${prog}; \
+ done
uninstall:
@echo removing executable file from ${DESTDIR}${PREFIX}/bin
|
