Alexander/st
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make st and std separate programmes

Browse Source
This commit is contained in:
Matthias-Christian Ott 2008-06-14 11:03:29 +02:00
parent 339e7f3571
commit 0c0ada8a7f
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -6,12 +6,13 @@ include config.mk
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 "X11LDFLAGS = ${X11LDFLAGS}"
@echo "CC = ${CC}"
.c.o:
@ -20,13 +21,17 @@ options:
${OBJ}: config.mk
st: ${OBJ}
st: st.o util.o
@echo CC -o $@
@${CC} -o $@ ${OBJ} ${LDFLAGS}
@${CC} -o $@ $^ ${LDFLAGS} ${X11LDFLAGS}
std: std.o pty.o util.o
@echo CC -o $@
@${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
@ -41,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

4
config.mk
View File

@ -12,7 +12,8 @@ X11LIB = /usr/X11R6/lib
# includes and libs
INCS = -I. -I/usr/include -I${X11INC}
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
LIBS = -L/usr/lib -lc
X11LIBS = -L${X11LIB} -lX11
# glibc
CPPFLAGS = -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
@ -21,6 +22,7 @@ CPPFLAGS = -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
#CPPFLAGS = -DVERSION=\"${VERSION}\"
CFLAGS = -Os ${INCS} ${CPPFLAGS}
LDFLAGS = -s ${LIBS}
X11LDFLAGS = ${X11LIBS}
#CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} ${CPPFLAGS}
#LDFLAGS = -g ${LIBS}

2
st.c
View File

@ -4,7 +4,7 @@
#include <string.h>
int
Xmain(int argc, char *argv[]) {
main(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)