X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=Makefile;h=ddf1952fbd2ce1f6bbfe13c9d90341e174768e6b;hb=0c0ada8a7f6e916eb2b05ae5571e375e522d0a2e;hp=c4d0b1a3ec2b3ee4e16d143115493c2535a368e5;hpb=1987ae4bacf58c588bbc967434be4e39125c37f9;p=st.git

diff --git a/Makefile b/Makefile
index c4d0b1a..ddf1952 100644
--- a/Makefile
+++ b/Makefile
@@ -3,39 +3,40 @@
 
 include config.mk
 
-SRC = st
+SRC = st.c std.c util.c pty.c
 OBJ = ${SRC:.c=.o}
 
-all: options st
+all: options st std
 
 options:
 	@echo st build options:
-	@echo "CFLAGS   = ${CFLAGS}"
-	@echo "LDFLAGS  = ${LDFLAGS}"
-	@echo "CC       = ${CC}"
+	@echo "CFLAGS     = ${CFLAGS}"
+	@echo "LDFLAGS    = ${LDFLAGS}"
+	@echo "X11LDFLAGS = ${X11LDFLAGS}"
+	@echo "CC         = ${CC}"
 
 .c.o:
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: config.h config.mk
+${OBJ}: config.mk
 
-config.h:
-	@echo creating $@ from config.def.h
-	@cp config.def.h $@
+st: st.o util.o
+	@echo CC -o $@
+	@${CC} -o $@ $^ ${LDFLAGS} ${X11LDFLAGS}
 
-st: ${OBJ}
+std: std.o pty.o util.o
 	@echo CC -o $@
-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
+	@${CC} -o $@ $^ ${LDFLAGS}
 
 clean:
 	@echo cleaning
-	@rm -f st ${OBJ} st-${VERSION}.tar.gz
+	@rm -f st std ${OBJ} st-${VERSION}.tar.gz
 
 dist: clean
 	@echo creating dist tarball
 	@mkdir -p st-${VERSION}
-	@cp -R LICENSE Makefile README config.def.h config.mk \
+	@cp -R LICENSE Makefile README config.mk \
 		st.1 ${SRC} st-${VERSION}
 	@tar -cf st-${VERSION}.tar st-${VERSION}
 	@gzip st-${VERSION}.tar
@@ -45,11 +46,14 @@ 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
 
 uninstall:
 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin