X-Git-Url: https://git.armaanb.net/?p=dmenu.git;a=blobdiff_plain;f=Makefile;h=8f14a8c27751e6aefcfda5fe67ba724d7a8f28d5;hp=d170037280d1be65f84d31b9b5291a187f8f3529;hb=da0b9eb6c98288e7f9455352a78ba30d4b8b17f5;hpb=5146c3f27f730b3b37805c1f7b19bbebe312959f

diff --git a/Makefile b/Makefile
index d170037..8f14a8c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,12 @@
 # dmenu - dynamic menu
-#   (C)opyright MMVI Anselm R. Garbe
+# See LICENSE file for copyright and license details.
 
 include config.mk
 
-SRC = draw.c main.c util.c
+SRC = drw.c dmenu.c stest.c util.c
 OBJ = ${SRC:.c=.o}
 
-all: options dmenu
-	@echo finished
+all: options dmenu stest
 
 options:
 	@echo dmenu build options:
@@ -19,44 +18,56 @@ options:
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: dmenu.h config.h
-
 config.h:
-	@echo creating $@ from config.default.h
-	@cp config.default.h $@
+	@echo creating $@ from config.def.h
+	@cp config.def.h $@
+
+${OBJ}: arg.h config.h config.mk drw.h
+
+dmenu: dmenu.o drw.o util.o
+	@echo CC -o $@
+	@${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS}
 
-dmenu: ${OBJ}
-	@echo LD $@
-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
-	@strip $@
+stest: stest.o
+	@echo CC -o $@
+	@${CC} -o $@ stest.o ${LDFLAGS}
 
 clean:
 	@echo cleaning
-	@rm -f 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.*.h config.mk \
-		dmenu.1 dmenu.h ${SRC} dmenu-${VERSION}
+	@cp LICENSE Makefile README arg.h config.mk dmenu.1 drw.h util.h \
+		dmenu_path 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 dmenu ${DESTDIR}${PREFIX}/bin
+	@cp -f dmenu dmenu_path dmenu_run stest ${DESTDIR}${PREFIX}/bin
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
-	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
+	@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" < 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
+	@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
+	@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