instant ^E

[dmenu.git] / Makefile

diff --git a/Makefile b/Makefile
index 6775a10..dd744e1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 include config.mk
 
 
 include config.mk
 

-all: options dmenu dmenu_path config.mk
+all: options dmenu dmenu_path

 
 options:
        @echo dmenu build options:
 
 options:
        @echo dmenu build options:


@@ -12,16 +12,17 @@ options:
        @echo "CC       = ${CC}"
 
 dmenu: dmenu.o draw.o
        @echo "CC       = ${CC}"
 
 dmenu: dmenu.o draw.o

+       @echo CC -o $@
+       @${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
+

 dmenu_path: dmenu_path.o
 dmenu_path: dmenu_path.o

+       @echo CC -o $@
+       @${CC} -o $@ dmenu_path.o ${LDFLAGS}

 
 

-.c.o:
+.c.o: config.mk

        @echo CC -c $<
        @${CC} -c $< ${CFLAGS}
 
        @echo CC -c $<
        @${CC} -c $< ${CFLAGS}
 

-dmenu dmenu_path:
-       @echo CC -o $@
-       @${CC} -o $@ $+ ${LDFLAGS}
-

 clean:
        @echo cleaning
        @rm -f dmenu dmenu.o draw.o dmenu_path dmenu_path.o dmenu-${VERSION}.tar.gz
 clean:
        @echo cleaning
        @rm -f dmenu dmenu.o draw.o dmenu_path dmenu_path.o dmenu-${VERSION}.tar.gz


@@ -29,7 +30,7 @@ clean:
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}
 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 dmenu.c draw.c draw.h dmenu_path.c dmenu_run dmenu-${VERSION}

        @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
        @gzip dmenu-${VERSION}.tar
        @rm -rf dmenu-${VERSION}
        @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
        @gzip dmenu-${VERSION}.tar
        @rm -rf dmenu-${VERSION}