make st and std separate programmes - st - Personal fork of st
(HTM) git clone git://git.drkhsh.at/st.git
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 0c0ada8a7f6e916eb2b05ae5571e375e522d0a2e
(DIR) parent 339e7f35713ae0c35be2537e6639cd5eee592acb
(HTM) Author: Matthias-Christian Ott <ott@enolink.de>
Date: Sat, 14 Jun 2008 11:03:29 +0200
make st and std separate programmes
Diffstat:
M Makefile | 22 +++++++++++++++-------
M config.mk | 4 +++-
M st.c | 2 +-
3 files changed, 19 insertions(+), 9 deletions(-)
---
(DIR) diff --git a/Makefile b/Makefile
@@ -6,13 +6,14 @@ 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 "CC = ${CC}"
+ @echo "CFLAGS = ${CFLAGS}"
+ @echo "LDFLAGS = ${LDFLAGS}"
+ @echo "X11LDFLAGS = ${X11LDFLAGS}"
+ @echo "CC = ${CC}"
.c.o:
@echo CC $<
@@ -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
(DIR) diff --git a/config.mk b/config.mk
@@ -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}
(DIR) diff --git a/st.c b/st.c
@@ -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)