backport of local changes

[st.git] / Makefile

diff --git a/Makefile b/Makefile
index 72154e9..b0bd42d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,17 +3,16 @@
 
 include config.mk
 
-SRC = st.c std.c pty.c
+SRC = st.c
 OBJ = ${SRC:.c=.o}
 
-all: options st std
+all: options st
 
 options:
        @echo st build options:
-       @echo "CFLAGS     = ${CFLAGS}"
-       @echo "LDFLAGS    = ${LDFLAGS}"
-       @echo "X11LDFLAGS = ${X11LDFLAGS}"
-       @echo "CC         = ${CC}"
+       @echo "CFLAGS   = ${CFLAGS}"
+       @echo "LDFLAGS  = ${LDFLAGS}"
+       @echo "CC       = ${CC}"
 
 .c.o:
        @echo CC $<
@@ -21,23 +20,18 @@ options:
 
 ${OBJ}: config.mk
 
-st: st.o
+st: ${OBJ}
        @echo CC -o $@
-       @${CC} -o $@ $^ ${LDFLAGS} ${X11LDFLAGS}
-
-std: std.o pty.o
-       @echo CC -o $@
-       @${CC} -o $@ $^ ${LDFLAGS}
+       @${CC} -o $@ ${OBJ} ${LDFLAGS}
 
 clean:
        @echo cleaning
-       @rm -f st std ${OBJ} st-${VERSION}.tar.gz
+       @rm -f st ${OBJ} st-${VERSION}.tar.gz
 
 dist: clean
        @echo creating dist tarball
        @mkdir -p st-${VERSION}
-       @cp -R LICENSE Makefile README config.mk \
-               st.1 ${SRC} st-${VERSION}
+       @cp -R LICENSE Makefile README config.mk st.h ${SRC} st-${VERSION}
        @tar -cf st-${VERSION}.tar st-${VERSION}
        @gzip st-${VERSION}.tar
        @rm -rf st-${VERSION}
@@ -46,19 +40,11 @@ install: all
        @echo installing executable file to ${DESTDIR}${PREFIX}/bin
        @mkdir -p ${DESTDIR}${PREFIX}/bin
        @cp -f st ${DESTDIR}${PREFIX}/bin
-       @cp -f std ${DESTDIR}${PREFIX}/bin
        @chmod 755 ${DESTDIR}${PREFIX}/bin/st
-       @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
-       @mkdir -p ${DESTDIR}${MANPREFIX}/man1
-       @sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1
-       @chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1
-       @sed "s/VERSION/${VERSION}/g" < std.1 > ${DESTDIR}${MANPREFIX}/man1/std.1
-       @chmod 644 ${DESTDIR}${MANPREFIX}/man1/std.1
+       @tic st.info
 
 uninstall:
        @echo removing executable file from ${DESTDIR}${PREFIX}/bin
        @rm -f ${DESTDIR}${PREFIX}/bin/st
-       @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
-       @rm -f ${DESTDIR}${MANPREFIX}/man1/st.1
 
 .PHONY: all options clean dist install uninstall