X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=Makefile;h=c127f6af8727f7b4b55b7768ea16a59cc5d37337;hb=b95fb20269f55c9fe649d971c53efb8040d3ceea;hp=0f29652f0d8e423747b602f6f893096981371c88;hpb=26b9f3de0ffe471e5335b07454147457e373c037;p=dmenu.git

diff --git a/Makefile b/Makefile
index 0f29652..c127f6a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@
 
 include config.mk
 
-SRC = dinput.c dmenu.c
+SRC = dmenu.c draw.c stest.c
 OBJ = ${SRC:.c=.o}
 
-all: options dinput dmenu
+all: options dmenu stest
 
 options:
 	@echo dmenu build options:
@@ -15,49 +15,52 @@ options:
 	@echo "CC       = ${CC}"
 
 .c.o:
-	@echo CC $<
-	@${CC} -c ${CFLAGS} $<
+	@echo CC -c $<
+	@${CC} -c $< ${CFLAGS}
 
-${OBJ}: config.h config.mk
+${OBJ}: config.mk draw.h
 
-config.h:
-	@echo creating $@ from config.def.h
-	@cp config.def.h $@
+dmenu: dmenu.o draw.o
+	@echo CC -o $@
+	@${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
 
-.o:
+stest: stest.o
 	@echo CC -o $@
-	@${CC} -o $@ $< ${LDFLAGS}
+	@${CC} -o $@ stest.o ${LDFLAGS}
 
 clean:
 	@echo cleaning
-	@rm -f dinput dmenu ${OBJ} dmenu-${VERSION}.tar.gz
+	@rm -f dmenu stest ${OBJ} 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 draw.h dmenu_run stest.1 ${SRC} 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_run stest ${DESTDIR}${PREFIX}/bin
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
-	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
-	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/stest
+	@echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
 	@sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
+	@sed "s/VERSION/${VERSION}/g" < stest.1 > ${DESTDIR}${MANPREFIX}/man1/stest.1
 	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
+	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/stest.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_run
+	@rm -f ${DESTDIR}${PREFIX}/bin/stest
 	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
 	@rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
+	@rm -f ${DESTDIR}${MANPREFIX}/man1/stest.1
 
 .PHONY: all options clean dist install uninstall