cleaned up

[dmenu.git] / Makefile

diff --git a/Makefile b/Makefile
index 2f1cada..90f178b 100644 (file)
--- 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}