X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=Makefile;h=90f178b44e907d8d05685954e78ba618cbb1ff86;hb=7afd296c40a2e8af9477add1c3d02a7c4b444747;hp=2f1cada08d0b92e1b8fca30a9366153bd30aec91;hpb=595e7976601fc77acf12015d3f5f6843e2cdd706;p=dmenu.git

diff --git a/Makefile b/Makefile
index 2f1cada..90f178b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@
 
 include config.mk
 
-SRC = dinput.c dmenu.c draw.c
+SRC = dinput.c dmenu.c
 OBJ = ${SRC:.c=.o}
 
-all: options draw.o dinput dmenu
+all: options dinput dmenu
 
 options:
 	@echo dmenu build options:
@@ -18,7 +18,7 @@ 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
@@ -26,16 +26,20 @@ config.h:
 
 .o:
 	@echo CC -o $@
-	@${CC} -o $@ $< draw.o ${LDFLAGS}
+	@${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}