From fb77262ef4000f4be93a114e6c48e19d2ece0488 Mon Sep 17 00:00:00 2001 From: Shiz Date: Sat, 5 Apr 2025 04:10:05 +0200 Subject: [PATCH 2/3] build: fix compiling without exes for subdirectory --- hacks/Makefile.in | 2 +- hacks/check-configs.pl | 6 ++++-- hacks/glx/Makefile.in | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hacks/Makefile.in b/hacks/Makefile.in index fa5638b..ae6a78c 100644 --- a/hacks/Makefile.in +++ b/hacks/Makefile.in @@ -458,7 +458,7 @@ check_men: fi validate_xml: - @cd $(srcdir) && ./check-configs.pl $(EXES) + @cd $(srcdir) && ./check-configs.pl -f $(EXES) munge_ad_file: @echo "Updating hack list in XScreenSaver.ad.in..." ; \ diff --git a/hacks/check-configs.pl b/hacks/check-configs.pl index bbcc15f..5745419 100755 --- a/hacks/check-configs.pl +++ b/hacks/check-configs.pl @@ -1239,7 +1239,7 @@ sub error($) { } sub usage() { - print STDERR "usage: $progname [--verbose] [--debug]" . + print STDERR "usage: $progname [-f] [--verbose] [--debug]" . " [--build-android] files ...\n"; exit 1; } @@ -1248,11 +1248,13 @@ sub main() { binmode (STDOUT, ':utf8'); binmode (STDERR, ':utf8'); + my $force_p = 0; my $android_p = 0; my @files = (); while ($#ARGV >= 0) { $_ = shift @ARGV; if (m/^--?verbose$/) { $verbose++; } + elsif (m/^-f+$/) { $force_p++; } elsif (m/^-v+$/) { $verbose += length($_)-1; } elsif (m/^--?debug$/s) { $debug_p++; } elsif (m/^--?build-android$/s) { $android_p++; } @@ -1261,7 +1263,7 @@ sub main() { # else { usage; } } - usage unless ($#files >= 0); + usage unless ($#files >= 0) || $force_p; my $failures = 0; foreach my $file (@files) { $failures += check_config ($file, $android_p); diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in index 99cc75b..8c89fe5 100644 --- a/hacks/glx/Makefile.in +++ b/hacks/glx/Makefile.in @@ -559,7 +559,7 @@ check_men: fi validate_xml: - @cd $(HACK_SRC) && ./check-configs.pl $(EXES) $(RETIRED_EXES) + @cd $(HACK_SRC) && ./check-configs.pl -f $(EXES) $(RETIRED_EXES) distdepend:: check_men validate_xml -- 2.48.1