From 159e2781ce1e3e724a7b25b8a5f477f3f7006304 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Fri, 7 Nov 2025 21:58:43 +0000 Subject: [PATCH] fix git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@635 b9cfdab3-6d41-4d17-bbe4-086880011989 --- m4/toplevel/rules.m4 | 4 ++-- m4/util/my_syscmd.m4 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/m4/toplevel/rules.m4 b/m4/toplevel/rules.m4 index 0888645..8aeae18 100644 --- a/m4/toplevel/rules.m4 +++ b/m4/toplevel/rules.m4 @@ -25,7 +25,7 @@ define([library_targets],[])dnl define([library_objects],[])dnl define([new_object],[pushdef([source])define([source],patsubst(patsubst(patsubst(my_syscmd([sh -c "ls -d $1"]),[\..+$],object_suffix),[ ],[ ]),[ $],[]))define([library_targets],ifelse(library_targets,[],[source],[library_targets source]))popdef([source])])dnl -define([print_library_targets],[foreach(x,space_to_comma(library_targets),[pushdef([source])define([source],[patsubst(x,[\]object_suffix[$],[.c])])dnl +define([print_library_targets],[foreach([x],space_to_comma(library_targets),[pushdef([source])define([source],[patsubst(x,[\]object_suffix[$],[.c])])dnl x: source $(CC) -c -fPIC $(CFLAGS) $(INCDIR) -o x source popdef([source])])])dnl @@ -35,7 +35,7 @@ define([new_example],[define($1[]_cflag,[$2])dnl define($1[]_ldflag,[$3])dnl define($1[]_lib,[$4])dnl define([examples_targets],ifelse(examples_targets,[],[$1[]executable_suffix],[examples_targets $1[]executable_suffix]))])dnl -define([print_examples_targets],[foreach(x,space_to_comma(examples_targets),[pushdef(base)dnl +define([print_examples_targets],[foreach([x],space_to_comma(examples_targets),[pushdef(base)dnl define([base],patsubst(x,[\..+$],[]))dnl x: base[]object_suffix library $(CC) -L src -Wl,-R./src $(LIBDIR) indir(base[]_ldflag) -o x base[]object_suffix -lMw $(MATH) indir(base[]_lib) diff --git a/m4/util/my_syscmd.m4 b/m4/util/my_syscmd.m4 index 2254727..ba19b44 100644 --- a/m4/util/my_syscmd.m4 +++ b/m4/util/my_syscmd.m4 @@ -1,3 +1,3 @@ dnl $Id$ -define([my_syscmd],[syscmd([$* | tr '\n' ' ' | sed 's/ $//' > my_syscmd_out.out])dnl +define([my_syscmd],[syscmd([$* > my_syscmd_out.out])dnl include(my_syscmd_out.out)[]syscmd([sh -c "rm -f my_syscmd_out.out"])])dnl