cache option in config.mk

[dmenu.git] / Makefile

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

-all: options dmenu
+all: options dmenu dmenu_path

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


@@ -11,22 +11,26 @@ options:
        @echo "LDFLAGS  = ${LDFLAGS}"
        @echo "CC       = ${CC}"
 
        @echo "LDFLAGS  = ${LDFLAGS}"
        @echo "CC       = ${CC}"
 

-dmenu.o: dmenu.c config.mk
-       @echo CC $<
-       @${CC} -c ${CFLAGS} $<
+dmenu: dmenu.o draw.o
+       @echo CC -o $@
+       @${CC} -o $@ dmenu.o draw.o ${LDFLAGS}

 
 

-dmenu: dmenu.o
+dmenu_path: dmenu_path.o

        @echo CC -o $@
        @echo CC -o $@

-       @${CC} -o $@ $+ ${LDFLAGS}
+       @${CC} -o $@ dmenu_path.o ${LDFLAGS}
+
+.c.o: config.mk
+       @echo CC -c $<
+       @${CC} -c $< ${CFLAGS}

 
 clean:
        @echo cleaning
 
 clean:
        @echo cleaning

-       @rm -f dmenu dmenu.o dmenu-${VERSION}.tar.gz
+       @rm -f dmenu dmenu.o draw.o dmenu_path dmenu_path.o dmenu-${VERSION}.tar.gz

 
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}
 
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}

-       @cp -R LICENSE Makefile README config.mk dmenu.1 dmenu.c dmenu_path 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}