2 files changed, 32 insertions, 85 deletions
diff --git a/Makefile b/Makefile
index 72154e9..0f74456 100644
--- a/Makefile
+++ b/Makefile
@@ -1,64 +1,45 @@
 # st - simple terminal
 # See LICENSE file for copyright and license details.
-include config.mk
+VERSION = 0.0
-SRC = st.c std.c pty.c
+PREFIX = /usr/local
-OBJ = ${SRC:.c=.o}
+MANDIR = $(PREFIX)/share/man
-all: options st std
+CFLAGS = -DVERSION=\"0.0\" -D_GNU_SOURCE
-options:
+all: st std
-        @echo st build options:
-        @echo "CFLAGS     = ${CFLAGS}"
-        @echo "LDFLAGS    = ${LDFLAGS}"
-        @echo "X11LDFLAGS = ${X11LDFLAGS}"
-        @echo "CC         = ${CC}"
-.c.o:
-        @echo CC $<
-        @${CC} -c ${CFLAGS} $<
-${OBJ}: config.mk
-st: st.o
-        @echo CC -o $@
-        @${CC} -o $@ $^ ${LDFLAGS} ${X11LDFLAGS}
-std: std.o pty.o
-        @echo CC -o $@
-        @${CC} -o $@ $^ ${LDFLAGS}
 clean:
-        @echo cleaning
+        rm -f st std
-        @rm -f st std ${OBJ} st-${VERSION}.tar.gz
+        rm -f st.o std.o
+        rm -f st-$(VERSION).tar.gz
 dist: clean
-        @echo creating dist tarball
+        mkdir st-$(VERSION)
-        @mkdir -p st-${VERSION}
+        cp -f LICENSE README st-$(VERSION)
-        @cp -R LICENSE Makefile README config.mk \
+        cp -f Makefile config.mk st-$(VERSION)
-                st.1 ${SRC} st-${VERSION}
+        cp -f st.1 std.1 st-$(VERSION)
-        @tar -cf st-${VERSION}.tar st-${VERSION}
+        cp -f st.c std.c st-$(VERSION)
-        @gzip st-${VERSION}.tar
+        tar -czf st-$(VERSION).tar st-$(VERSION)
-        @rm -rf st-${VERSION}
+        rm -rf st-$(VERSION)
-install: all
+install:
-        @echo installing executable file to ${DESTDIR}${PREFIX}/bin
+        mkdir -p $(DESTDIR)$(PREFIX)/bin
-        @mkdir -p ${DESTDIR}${PREFIX}/bin
+        cp -f st $(DESTDIR)$(PREFIX)/bin
-        @cp -f st ${DESTDIR}${PREFIX}/bin
+        cp -f std $(DESTDIR)$(PREFIX)/bin
-        @cp -f std ${DESTDIR}${PREFIX}/bin
+        chmod 755 $(DESTDIR)$(PREFIX)/bin/st
-        @chmod 755 ${DESTDIR}${PREFIX}/bin/st
+        chmod 755 $(DESTDIR)$(PREFIX)/bin/std
-        @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+        mkdir -p $(DESTDIR)$(MANDIR)/man1
-        @mkdir -p ${DESTDIR}${MANPREFIX}/man1
+        sed 's/VERSION/$(VERSION)/g' < st.1 > $(DESTDIR)$(MANDIR)/man1/st.1
-        @sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1
+        chmod 644 $(DESTDIR)$(MANDIR)/man1/st.1
-        @chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1
+        sed 's/VERSION/$(VERSION)/g' < std.1 > $(DESTDIR)$(MANDIR)/man1/std.1
-        @sed "s/VERSION/${VERSION}/g" < std.1 > ${DESTDIR}${MANPREFIX}/man1/std.1
+        chmod 644 $(DESTDIR)$(MANDIR)/man1/std.1
-        @chmod 644 ${DESTDIR}${MANPREFIX}/man1/std.1
 uninstall:
-        @echo removing executable file from ${DESTDIR}${PREFIX}/bin
+        rm -f $(DESTDIR)$(PREFIX)/bin/st
-        @rm -f ${DESTDIR}${PREFIX}/bin/st
+        rm -f $(DESTDIR)$(PREFIX)/bin/std
-        @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
+        rm -f $(DESTDIR)$(MANDIR)/man1/st.1
-        @rm -f ${DESTDIR}${MANPREFIX}/man1/st.1
+        rm -f $(DESTDIR)$(MANDIR)/man1/std.1
-.PHONY: all options clean dist install uninstall
+.PHONY: all clean dist install uninstall
diff --git a/config.mk b/config.mk
deleted file mode 100644
index 4d76c67..0000000
--- a/config.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# st version
-VERSION = 0.0
-# Customize below to fit your system
-# paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
-# includes and libs
-INCS = -I. -I/usr/include -I${X11INC}
-LIBS = -L/usr/lib -lc
-X11LIBS =  -L${X11LIB} -lX11
-# glibc
-CPPFLAGS = -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
-# flags
-#CPPFLAGS = -DVERSION=\"${VERSION}\"
-CFLAGS = -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
-X11LDFLAGS = ${X11LIBS}
-#CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} ${CPPFLAGS}
-#LDFLAGS = -g ${LIBS}
-# Solaris
-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
-# compiler and linker
-CC = cc

diff --git a/Makefile b/Makefile index 72154e9..0f74456 100644 --- a/Makefile +++ b/Makefile
@@ -1,64 +1,45 @@
1	# st - simple terminal	1	# st - simple terminal
2	# See LICENSE file for copyright and license details.	2	# See LICENSE file for copyright and license details.
3		3
4	include config.mk	4	VERSION = 0.0
5		5
6	SRC = st.c std.c pty.c	6	PREFIX = /usr/local
7	OBJ = ${SRC:.c=.o}	7	MANDIR = $(PREFIX)/share/man
8		8
9	all: options st std	9	CFLAGS = -DVERSION=\"0.0\" -D_GNU_SOURCE
10		10
11	options:	11	all: st std
12	@echo st build options:
13	@echo "CFLAGS = ${CFLAGS}"
14	@echo "LDFLAGS = ${LDFLAGS}"
15	@echo "X11LDFLAGS = ${X11LDFLAGS}"
16	@echo "CC = ${CC}"
17
18	.c.o:
19	@echo CC $<
20	@${CC} -c ${CFLAGS} $<
21
22	${OBJ}: config.mk
23
24	st: st.o
25	@echo CC -o $@
26	@${CC} -o $@ $^ ${LDFLAGS} ${X11LDFLAGS}
27
28	std: std.o pty.o
29	@echo CC -o $@
30	@${CC} -o $@ $^ ${LDFLAGS}
31		12
32	clean:	13	clean:
33	@echo cleaning	14	rm -f st std
34	@rm -f st std ${OBJ} st-${VERSION}.tar.gz	15	rm -f st.o std.o
		16	rm -f st-$(VERSION).tar.gz
35		17
36	dist: clean	18	dist: clean
37	@echo creating dist tarball	19	mkdir st-$(VERSION)
38	@mkdir -p st-${VERSION}	20	cp -f LICENSE README st-$(VERSION)
39	@cp -R LICENSE Makefile README config.mk \	21	cp -f Makefile config.mk st-$(VERSION)
40	st.1 ${SRC} st-${VERSION}	22	cp -f st.1 std.1 st-$(VERSION)
41	@tar -cf st-${VERSION}.tar st-${VERSION}	23	cp -f st.c std.c st-$(VERSION)
42	@gzip st-${VERSION}.tar	24	tar -czf st-$(VERSION).tar st-$(VERSION)
43	@rm -rf st-${VERSION}	25	rm -rf st-$(VERSION)
44		26
45	install: all	27	install:
46	@echo installing executable file to ${DESTDIR}${PREFIX}/bin	28	mkdir -p $(DESTDIR)$(PREFIX)/bin
47	@mkdir -p ${DESTDIR}${PREFIX}/bin	29	cp -f st $(DESTDIR)$(PREFIX)/bin
48	@cp -f st ${DESTDIR}${PREFIX}/bin	30	cp -f std $(DESTDIR)$(PREFIX)/bin
49	@cp -f std ${DESTDIR}${PREFIX}/bin	31	chmod 755 $(DESTDIR)$(PREFIX)/bin/st
50	@chmod 755 ${DESTDIR}${PREFIX}/bin/st	32	chmod 755 $(DESTDIR)$(PREFIX)/bin/std
51	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1	33	mkdir -p $(DESTDIR)$(MANDIR)/man1
52	@mkdir -p ${DESTDIR}${MANPREFIX}/man1	34	sed 's/VERSION/$(VERSION)/g' < st.1 > $(DESTDIR)$(MANDIR)/man1/st.1
53	@sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1	35	chmod 644 $(DESTDIR)$(MANDIR)/man1/st.1
54	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1	36	sed 's/VERSION/$(VERSION)/g' < std.1 > $(DESTDIR)$(MANDIR)/man1/std.1
55	@sed "s/VERSION/${VERSION}/g" < std.1 > ${DESTDIR}${MANPREFIX}/man1/std.1	37	chmod 644 $(DESTDIR)$(MANDIR)/man1/std.1
56	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/std.1
57		38
58	uninstall:	39	uninstall:
59	@echo removing executable file from ${DESTDIR}${PREFIX}/bin	40	rm -f $(DESTDIR)$(PREFIX)/bin/st
60	@rm -f ${DESTDIR}${PREFIX}/bin/st	41	rm -f $(DESTDIR)$(PREFIX)/bin/std
61	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1	42	rm -f $(DESTDIR)$(MANDIR)/man1/st.1
62	@rm -f ${DESTDIR}${MANPREFIX}/man1/st.1	43	rm -f $(DESTDIR)$(MANDIR)/man1/std.1
63		44
64	.PHONY: all options clean dist install uninstall	45	.PHONY: all clean dist install uninstall


diff --git a/config.mk b/config.mk deleted file mode 100644 index 4d76c67..0000000 --- a/config.mk +++ /dev/null
@@ -1,34 +0,0 @@
1	# st version
2	VERSION = 0.0
3
4	# Customize below to fit your system
5
6	# paths
7	PREFIX = /usr/local
8	MANPREFIX = ${PREFIX}/share/man
9
10	X11INC = /usr/X11R6/include
11	X11LIB = /usr/X11R6/lib
12
13	# includes and libs
14	INCS = -I. -I/usr/include -I${X11INC}
15	LIBS = -L/usr/lib -lc
16	X11LIBS = -L${X11LIB} -lX11
17
18	# glibc
19	CPPFLAGS = -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
20
21	# flags
22	#CPPFLAGS = -DVERSION=\"${VERSION}\"
23	CFLAGS = -Os ${INCS} ${CPPFLAGS}
24	LDFLAGS = -s ${LIBS}
25	X11LDFLAGS = ${X11LIBS}
26	#CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} ${CPPFLAGS}
27	#LDFLAGS = -g ${LIBS}
28
29	# Solaris
30	#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
31	#LDFLAGS = ${LIBS}
32
33	# compiler and linker
34	CC = cc