M Makefile → Makefile

@@ -3,7 +3,7 @@ # See LICENSE file for copyright and license details.
 
 include config.mk
 
-SRC = st
+SRC = st.c std.c
 OBJ = ${SRC:.c=.o}
 
 all: options st
@@ -18,11 +18,7 @@ .c.o:
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: config.h config.mk
-
-config.h:
-	@echo creating $@ from config.def.h
-	@cp config.def.h $@
+${OBJ}: config.mk
 
 st: ${OBJ}
 	@echo CC -o $@
@@ -35,7 +31,7 @@ 
 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

M st.c → st.c

@@ -2,7 +2,7 @@ /* See LICENSE file for copyright and license details. */
 #include <stdio.h>
 
 int
-main(int argc, char *argv[]) {
+Xmain(int argc, char *argv[]) {
 	if(argc == 2 && !strcmp("-v", argv[1]))
 		eprint("st-"VERSION", © 2007-2008 st engineers, see LICENSE for details\n");
 	else if(argc != 1)