blob: a08aa2760ed4641a965381d5da941b92747f73f9 (
plain)
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
|
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,12 @@
XROOT = /usr/X11R6
# Uncomment to enable Shape extension support
-#OPT_WMFLAGS += -DSHAPE
+OPT_WMFLAGS += -DSHAPE
#OPT_WMLIB += -lXext
# Uncomment to add Xft support
-#OPT_WMFLAGS += -DXFT `pkg-config --cflags xft`
-#OPT_WMLIB += `pkg-config --libs xft` -lXext
+OPT_WMFLAGS += -DXFT $(shell $(PKG_CONFIG) --cflags xft xext)
+OPT_WMLIB += $(shell $(PKG_CONFIG) --libs xft xext)
# Uncomment for debugging (abandon all hope, ye who enter here)
#OPT_WMFLAGS += -DDEBUG
@@ -46,7 +46,7 @@
X11FLAGS = -I$(XROOT)/include
WMFLAGS = $(X11FLAGS) $(OPT_WMFLAGS)
-GTKFLAGS = `pkg-config --cflags gtk+-2.0`
+GTKFLAGS = $(shell $(PKG_CONFIG) --cflags gtk+-2.0)
$(PLAINOBJ): %.o: %.c
$(CC) $(CFLAGS) -c $< -o $@
@@ -60,37 +60,36 @@
$(GTKOBJ): %.o: %.c
$(CC) $(CFLAGS) $(GTKFLAGS) -c $< -o $@
-X11LIB = -L$(XROOT)/lib -lX11
+X11LIB = $(shell $(PKG_CONFIG) --libs x11)
WMLIB = $(X11LIB) $(OPT_WMLIB)
-GTKLIB = `pkg-config --libs gtk+-2.0`
+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0)
$(PLAINBIN): %: %.o
- $(CC) $^ -o $@
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
$(X11BIN): %: %.o
- $(CC) $^ $(X11LIB) -o $@
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(X11LIB) -o $@
$(WMBIN): %:
- $(CC) $^ $(WMLIB) -o $@
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WMLIB) -o $@
$(GTKBIN): %: %.o
- $(CC) $^ $(GTKLIB) -o $@
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(GTKLIB) $(X11LIB) -o $@
AEMAN = aewm.1x aeclients.1x
AERC = aewmrc clientsrc
install: all
mkdir -p $(BINDIR) $(MANDIR) $(CFGDIR)
- install -s $(ALLBIN) $(BINDIR)
+ install $(ALLBIN) $(BINDIR)
for i in $(AEMAN); do \
install -m 644 doc/$$i $(MANDIR); \
- gzip -9 $(MANDIR)/$$i; \
done
for i in $(AERC); do \
install -m 644 doc/$$i.ex $(CFGDIR)/$$i; \
done
for i in $(PLAINBIN) $(X11BIN) $(GTKBIN); do \
- ln -sf aeclients.1x.gz $(MANDIR)/$$i.1x.gz; \
+ ln -sf aeclients.1x $(MANDIR)/$$i.1x; \
done
clean:
--- a/doc/aewmrc.ex
+++ b/doc/aewmrc.ex
@@ -3,7 +3,7 @@
# Titlebar font. "fixed" is the default.
-font "lucidasans-10"
+font "fixed"
# Window colors
--- a/doc/clientsrc.ex
+++ b/doc/clientsrc.ex
@@ -10,4 +10,4 @@
cmd "Gaim" "gaim"
end
-cmd "Logout" "skill aesession"
+cmd "Logout" "pkill aesession"
|
