about summary refs log tree commit diff
path: root/Makefile
diff options
context:
space:
mode:
authorConnor Lane Smith <cls@lubutu.com>2010-08-02 14:22:54 +0100
committerConnor Lane Smith <cls@lubutu.com>2010-08-02 14:22:54 +0100
commita7aee433ccfd2590e0785a7b93a89d8d0593a234 (patch)
tree5a6fcb7a210c164c22194674a7b01c7e8cfe2458 /Makefile
parentupdated manpage, added paste, cleaned up, new libdraw (diff)
downloaddmenu-a7aee433ccfd2590e0785a7b93a89d8d0593a234.tar.gz
dmenu-a7aee433ccfd2590e0785a7b93a89d8d0593a234.tar.bz2
dmenu-a7aee433ccfd2590e0785a7b93a89d8d0593a234.zip
fixed bugs, no more config.h, updated manpage, new libdraw
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile24
1 files changed, 8 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index 269bc27..7b21a25 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,6 @@
 
 include config.mk
 
-SRC = dmenu.c
-OBJ = ${SRC:.c=.o}
-
 all: options dmenu
 
 options:
@@ -14,34 +11,28 @@ options:
 	@echo "LDFLAGS  = ${LDFLAGS}"
 	@echo "CC       = ${CC}"
 
-.c.o:
+dmenu.o: dmenu.c config.mk
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: config.h config.mk
-
-config.h:
-	@echo creating $@ from config.def.h
-	@cp config.def.h $@
-
-dmenu: ${OBJ}
+dmenu: dmenu.o
 	@echo CC -o $@
 	@${CC} -o $@ $+ ${LDFLAGS}
 
 clean:
 	@echo cleaning
-	@rm -f dmenu ${OBJ} dmenu-${VERSION}.tar.gz
+	@rm -f dmenu dmenu.o dmenu-${VERSION}.tar.gz
 
 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 dmenu.c dmenu_path dmenu_run dmenu-${VERSION}
 	@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
 	@gzip dmenu-${VERSION}.tar
 	@rm -rf dmenu-${VERSION}
 
 install: all
-	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
+	@echo installing executables to ${DESTDIR}${PREFIX}/bin
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
 	@cp -f dmenu dmenu_path dmenu_run ${DESTDIR}${PREFIX}/bin
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
@@ -53,8 +44,9 @@ install: all
 	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
 
 uninstall:
-	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
-	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_path
+	@echo removing executables from ${DESTDIR}${PREFIX}/bin
+	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu
+	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu_path
 	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run
 	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
 	@rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1