X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=Makefile;h=daac40bd9e50a36d7d9e121f9fc1fa0c2938e748;hb=e75494b730ea6883e68072a106a09a301cfaf845;hp=e7df2d78f93b70f844dcdae69bba7d8dcf5be0e6;hpb=542c58d8d00e26f23a5e0f09a9d1e68a7259db5e;p=dmenu.git

diff --git a/Makefile b/Makefile
index e7df2d7..daac40b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,56 +3,72 @@
 
 include config.mk
 
-SRC = dmenu.c
-OBJ = ${SRC:.c=.o}
+SRC = drw.c dmenu.c stest.c util.c
+OBJ = $(SRC:.c=.o)
 
-all: options dmenu
+all: options dmenu stest
 
 options:
 	@echo dmenu build options:
-	@echo "CFLAGS   = ${CFLAGS}"
-	@echo "LDFLAGS  = ${LDFLAGS}"
-	@echo "CC       = ${CC}"
+	@echo "CFLAGS   = $(CFLAGS)"
+	@echo "LDFLAGS  = $(LDFLAGS)"
+	@echo "CC       = $(CC)"
 
 .c.o:
 	@echo CC $<
-	@${CC} -c ${CFLAGS} $<
+	@$(CC) -c $(CFLAGS) $<
 
-${OBJ}: config.h config.mk
+config.h:
+	@echo creating $@ from config.def.h
+	@cp config.def.h $@
 
-dmenu: ${OBJ}
+$(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)
+
+stest: stest.o
 	@echo CC -o $@
-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
+	@$(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.mk dmenu.1 config.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
-	@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
-	@gzip dmenu-${VERSION}.tar
-	@rm -rf dmenu-${VERSION}
+	@mkdir -p dmenu-$(VERSION)
+	@cp LICENSE Makefile README arg.h config.def.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
-	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@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
-	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
-	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	@sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
-	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
+	@echo installing executables to $(DESTDIR)$(PREFIX)/bin
+	@mkdir -p $(DESTDIR)$(PREFIX)/bin
+	@cp -f dmenu dmenu_path 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
+	@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/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_run
-	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
-	@rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
+	@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