X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=Makefile;h=6775a106850e76f4a0c10d8162c827ec399b5bf4;hb=eeba6221b1f2863800dc3490eb80f3b7adb14675;hp=7274923b3295e702d1886b6e4a55fdb5c6c75465;hpb=855a56631916bdff1438e11c232b88450f973648;p=dmenu.git

diff --git a/Makefile b/Makefile
index 7274923..6775a10 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,7 @@
 
 include config.mk
 
-SRC = dinput.c dmenu.c common.c
-OBJ = ${SRC:.c=.o}
-
-all: options dinput dmenu
+all: options dmenu dmenu_path config.mk
 
 options:
 	@echo dmenu build options:
@@ -14,41 +11,33 @@ options:
 	@echo "LDFLAGS  = ${LDFLAGS}"
 	@echo "CC       = ${CC}"
 
-.c.o:
-	@echo CC $<
-	@${CC} -c ${CFLAGS} $<
-
-${OBJ}: config.h config.mk
-
-config.h:
-	@echo creating $@ from config.def.h
-	@cp config.def.h $@
+dmenu: dmenu.o draw.o
+dmenu_path: dmenu_path.o
 
-dinput: dinput.o common.o
-	@echo CC -o $@
-	@${CC} -o $@ $+ ${LDFLAGS}
+.c.o:
+	@echo CC -c $<
+	@${CC} -c $< ${CFLAGS}
 
-dmenu: dmenu.o common.o
+dmenu dmenu_path:
 	@echo CC -o $@
 	@${CC} -o $@ $+ ${LDFLAGS}
 
 clean:
 	@echo cleaning
-	@rm -f dinput dmenu ${OBJ} 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}
-	@cp -R LICENSE Makefile README config.mk dmenu.1 config.def.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
+	@cp LICENSE Makefile README config.mk dmenu.1 dmenu.c dmenu_path.c 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 dinput dmenu dmenu_path dmenu_run ${DESTDIR}${PREFIX}/bin
-	@chmod 755 ${DESTDIR}${PREFIX}/bin/dinput
+	@cp -f dmenu dmenu_path dmenu_run ${DESTDIR}${PREFIX}/bin
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
@@ -58,9 +47,10 @@ 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
-	@rm -f ${DESTDIR}${PREFIX}/bin/dinput ${DESTDIR}${PREFIX}/bin/dmenu_run
+	@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