blob: 71c4cae13af0ec074405cf3fb89ed1b6d4c1ca19 (
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
|
diff -up aewm-1.3.12/Makefile.orig aewm-1.3.12/Makefile
--- aewm-1.3.12/Makefile.orig 2007-12-27 11:15:32.000000000 -0700
+++ aewm-1.3.12/Makefile 2013-07-24 14:35:48.000000000 -0600
@@ -3,15 +3,15 @@
# Set this to the location where you want to install
DESTDIR =
-XROOT = /usr/X11R6
+XROOT = /usr
# Uncomment to enable Shape extension support
-#OPT_WMFLAGS += -DSHAPE
-#OPT_WMLIB += -lXext
+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 `pkg-config --cflags xft`
+OPT_WMLIB += `pkg-config --libs xft` -lXext
# Uncomment for debugging (abandon all hope, ye who enter here)
#OPT_WMFLAGS += -DDEBUG
@@ -21,7 +21,7 @@ CC = gcc
CFLAGS = -g -O2 -Wall
BINDIR = $(DESTDIR)$(XROOT)/bin
-MANDIR = $(DESTDIR)$(XROOT)/man/man1
+MANDIR = $(DESTDIR)$(XROOT)/share/man/man1
CFGDIR = $(DESTDIR)/etc/X11/aewm
PLAINOBJ = aesession.o parser.o
@@ -46,7 +46,7 @@ aepanel: $(CLIENTOBJ) menu.o parser.o
X11FLAGS = -I$(XROOT)/include
WMFLAGS = $(X11FLAGS) $(OPT_WMFLAGS)
-GTKFLAGS = `pkg-config --cflags gtk+-2.0`
+GTKFLAGS = $(WMFLAGS) `pkg-config --cflags gtk+-2.0`
$(PLAINOBJ): %.o: %.c
$(CC) $(CFLAGS) -c $< -o $@
@@ -62,7 +62,7 @@ $(GTKOBJ): %.o: %.c
X11LIB = -L$(XROOT)/lib -lX11
WMLIB = $(X11LIB) $(OPT_WMLIB)
-GTKLIB = `pkg-config --libs gtk+-2.0`
+GTKLIB = $(WMLIB) `pkg-config --libs gtk+-2.0`
$(PLAINBIN): %: %.o
$(CC) $^ -o $@
|