X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=blobdiff_plain;f=Makefile;h=6158ab20f2f7cc22abef463c81f19e342686c42e;hp=72154e94b0f9824d6c1c3f552fcdffbbdf98e486;hb=d945d7093d1822bf249e2e38ce97e5b37f695fdb;hpb=b3902ca1782515ee8b9cd38af10e51bc3ba2fc98

diff --git a/Makefile b/Makefile
index 72154e9..6158ab2 100644
--- a/Makefile
+++ b/Makefile
@@ -3,41 +3,38 @@
 
 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}"
+
+config.h:
+	cp config.def.h config.h
 
 .c.o:
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: config.mk
-
-st: st.o
-	@echo CC -o $@
-	@${CC} -o $@ $^ ${LDFLAGS} ${X11LDFLAGS}
+${OBJ}: config.h config.mk
 
-std: std.o pty.o
+st: ${OBJ}
 	@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 config.def.h st.info st.1 arg.h ${SRC} st-${VERSION}
 	@tar -cf st-${VERSION}.tar st-${VERSION}
 	@gzip st-${VERSION}.tar
 	@rm -rf st-${VERSION}
@@ -46,14 +43,13 @@ 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
+	@echo Please see the README file regarding the terminfo entry of st.
+	@tic -s st.info
 
 uninstall:
 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin