merge stest -> default

1 files changed, 12 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 929b108..c127f6a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@
 
 include config.mk
 
-SRC = dmenu.c draw.c lsx.c
+SRC = dmenu.c draw.c stest.c
 OBJ = ${SRC:.c=.o}
 
-all: options dmenu lsx
+all: options dmenu stest
 
 options:
         @echo dmenu build options:
@@ -24,18 +24,18 @@ dmenu: dmenu.o draw.o
         @echo CC -o $@
         @${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
 
-lsx: lsx.o
+stest: stest.o
         @echo CC -o $@
-        @${CC} -o $@ lsx.o ${LDFLAGS}
+        @${CC} -o $@ stest.o ${LDFLAGS}
 
 clean:
         @echo cleaning
-        @rm -f dmenu lsx ${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 LICENSE Makefile README config.mk dmenu.1 draw.h dmenu_run lsx.1 ${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}
@@ -43,24 +43,24 @@ dist: clean
 install: all
         @echo installing executables to ${DESTDIR}${PREFIX}/bin
         @mkdir -p ${DESTDIR}${PREFIX}/bin
-        @cp -f dmenu dmenu_run lsx ${DESTDIR}${PREFIX}/bin
+        @cp -f dmenu dmenu_run stest ${DESTDIR}${PREFIX}/bin
         @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
         @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
-        @chmod 755 ${DESTDIR}${PREFIX}/bin/lsx
+        @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" < lsx.1 > ${DESTDIR}${MANPREFIX}/man1/lsx.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/lsx.1
+        @chmod 644 ${DESTDIR}${MANPREFIX}/man1/stest.1
 
 uninstall:
         @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/lsx
+        @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/lsx.1
+        @rm -f ${DESTDIR}${MANPREFIX}/man1/stest.1
 
 .PHONY: all options clean dist install uninstall