slw2gmi

чување 2ba3a2df5a5267f08bdec046299077e71f0390c0
родитељ 205381e63d1e1d817f384ddb793cd280b44280e1
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Thu, 28 Sep 2023 15:14:13 +0200

Make config.redo behave more like config.mk; synchronize changes to build
scripts and INSTALL from sled

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
.gitignore
 | 
1
-
M
INSTALL
 | 
8
+++++++-
A
config.redo
 | 
4
++++
M
default.o.do
 | 
2
+-
M
defs.h
 | 
4
----
M
install.do
 | 
5
+----
M
slw2gmi.do
 | 
7
+++----
M
uninstall.do
 | 
5
+----

измењених датотека: 8, додавања: 17(+), брисања: 19(-)
diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,6 @@
 nohup.out
 *.gz
 *.xz
-config.redo
 slw2gmi
 slw2gmi.1
 slw2gmi.html
diff --git a/INSTALL b/INSTALL
@@ -1,7 +1,7 @@
 Prerequisites
 =============
 
-* C compiler (GCC-compatible) - ${SLW2GMI_CC:-gcc -g}
+* C compiler - defaults in config.redo
 * gzip
 
 
@@ -27,3 +27,9 @@ if you don't:
 	# ./do install
 
 
+Persistent build configuration file
+-----------------------------------
+
+The file config.redo will be sourced when building targets which also accept
+configuration through environment variables.  For example, CC and PREFIX
+are specified in config.redo.
diff --git a/config.redo b/config.redo
@@ -0,0 +1,4 @@
+PREFIX=${PREFIX:-/usr/local}
+CC=${CC:-gcc -g -Wall -pedantic -std=c99 -D_POSIX_C_SOURCE=200809L \
+-D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE}
+STRIP=${STRIP:-:}
diff --git a/default.o.do b/default.o.do
@@ -1,2 +1,2 @@
 redo-ifchange $2.c
-${SLW2GMI_CC:-gcc -g} -Wall -std=c99 -o $3 -c $2.c
+${CC} -o $3 -c $2.c
diff --git a/defs.h b/defs.h
@@ -5,10 +5,6 @@
 #ifndef __DEFS_H
 #define __DEFS_H
 
-#define _POSIX_C_SOURCE 200809L
-#define _DEFAULT_SOURCE
-#define _XOPEN_SOURCE
-
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
diff --git a/install.do b/install.do
@@ -1,8 +1,5 @@
 redo-ifchange all
-if [ -r ./config.redo ]; then
-	. ./config.redo
-fi
-PREFIX=${PREFIX:-/usr/local}
+. ./config.redo
 BINDIR=$PREFIX/bin
 DOCDIR=$PREFIX/share/doc/slw2gmi
 MANDIR=$PREFIX/share/man/man1
diff --git a/slw2gmi.do b/slw2gmi.do
@@ -1,6 +1,4 @@
-if [ -r ./config.redo ]; then
-	. ./config.redo
-fi
+. ./config.redo
 for f in *.h.in; do
 	echo $f | sed -e's/\.in$//g'
 done | xargs redo-ifchange
@@ -8,4 +6,5 @@ for f in *.h *.c; do
 	echo $f
 	echo $f | sed -e's/\.c$/.o/g'
 done | xargs redo-ifchange
-${SLW2GMI_CC:-gcc -g} -Wall -std=c99 -o $3 slw2gmi.o utf8.o
+${CC} -o $3 slw2gmi.o utf8.o
+${STRIP} $3
diff --git a/uninstall.do b/uninstall.do
@@ -1,8 +1,5 @@
 redo-always
-if [ -r ./config.redo ]; then
-	. ./config.redo
-fi
-PREFIX=${PREFIX:-/usr/local}
+. ./config.redo
 BINDIR=$PREFIX/bin
 DOCDIR=$PREFIX/share/doc/slw2gmi
 MANDIR=$PREFIX/share/man/man1