about summary refs log tree commit diff
path: root/Makefile
diff options
context:
space:
mode:
authorConnor Lane Smith <cls@lubutu.com>2010-06-24 17:44:35 +0100
committerConnor Lane Smith <cls@lubutu.com>2010-06-24 17:44:35 +0100
commit4508fd2c4ee3171bdc1bffb7e53ecda8290292ef (patch)
treee86bbdfc4e1cc93fe5906ef204bf970d389c3df2 /Makefile
parentremoved colors from dc (diff)
downloaddmenu-4508fd2c4ee3171bdc1bffb7e53ecda8290292ef.tar.gz
dmenu-4508fd2c4ee3171bdc1bffb7e53ecda8290292ef.tar.bz2
dmenu-4508fd2c4ee3171bdc1bffb7e53ecda8290292ef.zip
moved draw.c to libdraw.a
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index da5344b..90f178b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 include config.mk
 
-SRC = dinput.c dmenu.c draw.c
+SRC = dinput.c dmenu.c
 OBJ = ${SRC:.c=.o}
 
 all: options dinput dmenu
@@ -18,28 +18,28 @@ options:
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: config.h config.mk draw.h
+${OBJ}: config.h config.mk draw/libdraw.a
 
 config.h:
 	@echo creating $@ from config.def.h
 	@cp config.def.h $@
 
-dinput: dinput.o draw.o
+.o:
 	@echo CC -o $@
-	@${CC} -o $@ $+ ${LDFLAGS}
+	@${CC} -o $@ $< ${LDFLAGS}
 
-dmenu: dmenu.o draw.o
-	@echo CC -o $@
-	@${CC} -o $@ $+ ${LDFLAGS}
+draw/libdraw.a:
+	@cd draw && make
 
 clean:
 	@echo cleaning
 	@rm -f dinput dmenu ${OBJ} dmenu-${VERSION}.tar.gz
+	@cd draw && make clean
 
 dist: clean
 	@echo creating dist tarball
 	@mkdir -p dmenu-${VERSION}
-	@cp -R LICENSE Makefile README config.mk dmenu.1 config.def.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
+	@cp -R LICENSE Makefile README config.mk dmenu.1 config.def.h dmenu_path dmenu_run draw ${SRC} dmenu-${VERSION}
 	@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
 	@gzip dmenu-${VERSION}.tar
 	@rm -rf dmenu-${VERSION}