aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorHiltjo Posthuma <hiltjo@codemadness.org>2015-05-04 21:54:46 +0200
committerAnselm R Garbe <garbeam@gmail.com>2015-06-27 21:47:10 +0200
commit4b1fecd44e8376594c418663351fcb30c4e841de (patch)
tree78db12fd7024bff8afb3c3bd8851c009837f5a34 /Makefile
parent13a529ce63364544bdc851dfd5d3aa2ef8740914 (diff)
Use libdraw: add Xft and fallback-fonts support to graphics lib
- libdraw, util: add drw.{c,h}, util.{c,h} and update code. - libdraw: fix drw_rect(): use w and h parameter. - libdraw: print errstr if last character in string was ":" (sbase). - libdraw: drw_clr_free() allow valid free(NULL). - config.def.h: set default font to monospace. - cleanup() on exit. - LICENSE: update license string for dmenu -v to 2015. - LICENSE: add myself to LICENSE
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 8 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 0f7dfbd..4a412ee 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
3 3
4include config.mk 4include config.mk
5 5
6SRC = dmenu.c draw.c stest.c 6SRC = drw.c dmenu.c stest.c util.c
7OBJ = ${SRC:.c=.o} 7OBJ = ${SRC:.c=.o}
8 8
9all: options dmenu stest 9all: options dmenu stest
@@ -15,18 +15,18 @@ options:
15 @echo "CC = ${CC}" 15 @echo "CC = ${CC}"
16 16
17.c.o: 17.c.o:
18 @echo CC -c $< 18 @echo CC $<
19 @${CC} -c $< ${CFLAGS} 19 @${CC} -c ${CFLAGS} $<
20 20
21config.h: 21config.h:
22 @echo creating $@ from config.def.h 22 @echo creating $@ from config.def.h
23 @cp config.def.h $@ 23 @cp config.def.h $@
24 24
25${OBJ}: config.h config.mk draw.h 25${OBJ}: config.h config.mk drw.h
26 26
27dmenu: dmenu.o draw.o 27dmenu: dmenu.o drw.o util.o
28 @echo CC -o $@ 28 @echo CC -o $@
29 @${CC} -o $@ dmenu.o draw.o ${LDFLAGS} 29 @${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS}
30 30
31stest: stest.o 31stest: stest.o
32 @echo CC -o $@ 32 @echo CC -o $@
@@ -39,7 +39,8 @@ clean:
39dist: clean 39dist: clean
40 @echo creating dist tarball 40 @echo creating dist tarball
41 @mkdir -p dmenu-${VERSION} 41 @mkdir -p dmenu-${VERSION}
42 @cp LICENSE Makefile README config.mk dmenu.1 draw.h dmenu_path dmenu_run stest.1 ${SRC} dmenu-${VERSION} 42 @cp LICENSE Makefile README config.mk dmenu.1 drw.h util.h dmenu_path \
43 dmenu_run stest.1 ${SRC} dmenu-${VERSION}
43 @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION} 44 @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
44 @gzip dmenu-${VERSION}.tar 45 @gzip dmenu-${VERSION}.tar
45 @rm -rf dmenu-${VERSION} 46 @rm -rf dmenu-${VERSION}