add ^M

[dmenu.git] / Makefile

diff --git a/Makefile b/Makefile
index c183779..5871fa7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,10 @@
 
 include config.mk
 
-all: options dmenu dmenu_path
+SRC = dmenu.c draw.c
+OBJ = ${SRC:.c=.o}
+
+all: options dmenu
 
 options:
        @echo dmenu build options:
@@ -11,21 +14,24 @@ options:
        @echo "LDFLAGS  = ${LDFLAGS}"
        @echo "CC       = ${CC}"
 
-dmenu: dmenu.c config.mk
-dmenu_path: dmenu_path.c
+.c.o:
+       @echo CC -c $<
+       @${CC} -c $< ${CFLAGS}
+
+${OBJ}: config.mk
 
-dmenu dmenu_path:
+dmenu: ${OBJ}
        @echo CC -o $@
-       @${CC} -o $@ $< ${CFLAGS} ${LDFLAGS}
+       @${CC} -o $@ ${OBJ} ${LDFLAGS}
 
 clean:
        @echo cleaning
-       @rm -f dmenu dmenu_path dmenu-${VERSION}.tar.gz
+       @rm -f dmenu ${OBJ} dmenu-${VERSION}.tar.gz
 
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}
-       @cp LICENSE Makefile README config.mk dmenu.1 dmenu.c dmenu_path.c dmenu_run dmenu-${VERSION}
+       @cp LICENSE Makefile README config.mk dmenu.1 draw.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
        @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
        @gzip dmenu-${VERSION}.tar
        @rm -rf dmenu-${VERSION}