lav-sdl

чување 9554f661af8ff04439b9b5ccba27a3321a4b6b54
родитељ 5936bce0d8ff7fb61ba15e41018386af1414aacc
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Thu, 28 Sep 2023 14:38:42 +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
 | 
9
++++-----
A
config.redo
 | 
4
++++
M
default.o.do
 | 
7
++-----
M
install.do
 | 
5
+----
M
lav-sdl.c
 | 
4
----
M
lav-sdl.do
 | 
8
+++-----
M
uninstall.do
 | 
5
+----

измењених датотека: 8, додавања: 15(+), брисања: 28(-)
diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,6 @@ nohup.out
 *.gz
 *.xz
 !*.xcf.xz
-config.redo
 lav-sdl
 date
 local.h
diff --git a/INSTALL b/INSTALL
@@ -1,7 +1,7 @@
 Prerequisites
 =============
 
-* C compiler (GCC-compatible) - ${CC:-gcc -g}
+* C compiler - defaults in config.redo
 * gzip
 * libSDL (SDL2, SDL2_image)
 
@@ -25,7 +25,6 @@ if you don't:
 Persistent build configuration file
 -----------------------------------
 
-If a file config.redo exists in the build directory, it will be sourced when
-building targets which also accept configuration through environment variables.
-For example, CC and PREFIX can be specified in config.redo, eliminating
-the need to pass them with each build.
+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,7 +1,4 @@
 redo-ifchange $2.c
-if [ -r ./config.redo ]; then
-	. ./config.redo
-fi
-CC=${CC:-gcc -g}
+. ./config.redo
 INCLUDES=$(pkg-config --cflags sdl2)
-$CC -Wall -std=c99 $INCLUDES -o $3 -c $2.c
+$CC $INCLUDES -o $3 -c $2.c
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
 if [ -z "$DATADIR" ]; then
 	DATADIR=$PREFIX/share/lav-sdl
diff --git a/lav-sdl.c b/lav-sdl.c
@@ -2,10 +2,6 @@
  * any later version. Copyright (C) 2023  Strahinya Radich.
  * See the file LICENSE for exact copyright and license details. */
 
-#define _POSIX_C_SOURCE 200809L
-#define _DEFAULT_SOURCE
-#define _XOPEN_SOURCE
-
 #include <SDL.h>
 #include <SDL_image.h>
 #include <errno.h>
diff --git a/lav-sdl.do b/lav-sdl.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,8 +6,8 @@ for f in *.h *.c; do
 	echo $f
 	echo $f | sed -e's/\.c$/.o/g'
 done | xargs redo-ifchange
-CC=${CC:-gcc -g}
 LIBS=$(pkg-config --libs sdl2)
 LIBS="$LIBS $(pkg-config --libs SDL2_image)"
 LIBS="$LIBS -lm"
-$CC -Wall -std=c99 -o $3 lav-sdl.o $LIBS
+$CC -o $3 lav-sdl.o $LIBS
+$STRIP $3
diff --git a/uninstall.do b/uninstall.do
@@ -1,7 +1,4 @@
-if [ -r ./config.redo ]; then
-	. ./config.redo
-fi
-PREFIX=${PREFIX:-/usr/local}
+. ./config.redo
 BINDIR=$PREFIX/bin
 if [ -z "$DATADIR" ]; then
 	DATADIR=$PREFIX/share/lav-sdl