X-Git-Url: https://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/7688d80fdcf83763450d2c41acdc5b5c8fbf67c0..0760e669cdb984633fffb2f99d20b019706ec597:/scripts/fix-gnulib.pl

diff --git a/scripts/fix-gnulib.pl b/scripts/fix-gnulib.pl
index 1f50d49..17163c7 100755
--- a/scripts/fix-gnulib.pl
+++ b/scripts/fix-gnulib.pl
@@ -30,6 +30,7 @@ open STDIN,  "<", $input  or die "$input: $!\n"  if (defined $input);
 
 my $printed_header = 0;
 my (%allvars, %sourcevars);
+my @cleanfiles;
 
 sub drop {
 	undef $_;
@@ -92,7 +93,9 @@ while (<STDIN>) {
 # This trick should define gnulib_orderonly to | iff we're using GNU make.
 gnulib_have_orderonly = $(findstring order-only,$(.FEATURES))
 gnulib_orderonly = $(gnulib_have_orderonly:order-only=|)
-gnulib_headers = $(gnulib_orderonly)
+gnulib_core_headers = $(gnulib_orderonly)
+gnulib_src_headers = $(gnulib_core_headers)
+gnulib_headers = $(gnulib_src_headers)
 EOF
 
 		$printed_header = 1;
@@ -132,7 +135,7 @@ EOF
 	# BUILT_SOURCES has similar problems to recursive make: inadequate
 	# dependencies lead to incorrect builds.  Collect them into an
 	# ordinary variable so we can deal with them later.
-	s/BUILT_SOURCES/gnulib_headers/;
+	s/BUILT_SOURCES/gnulib_core_headers/;
 
 	# Targets are similar to variables: the target and its dependencies
 	# need to be mangled.
@@ -140,6 +143,16 @@ EOF
 		$_ = mangle_target($_);
 	}
 
+	# When using conditional-dependencies, *CLEANFILES can end up
+	# depending on the configuration.  This means that "make distclean"
+	# may not actually delete everything if the configuration changes
+	# after building the package.  Stash all the variables for later so
+	# they can be moved outside of any conditional.
+	if (/CLEANFILES/) {
+		push(@cleanfiles, $_);
+		drop;
+	}
+
 	# Finally, references to $(srcdir) and $(builddir) need to be fixed up.
 	s:\$\(srcdir\):\$\(top_srcdir\)/lib:g;
 	s:\$\(builddir\):\$\(top_builddir\)/lib:g;
@@ -147,8 +160,9 @@ EOF
 
 print <<'EOF';
 gnulib_lt_objects = $(libgnu_la_OBJECTS) $(gl_LTLIBOBJS)
-$(gnulib_lt_objects): $(gnulib_headers)
+$(gnulib_lt_objects): $(gnulib_src_headers)
 EOF
+print @cleanfiles;
 
 # Some filenames are AC_SUBSTed by the Gnulib macros, and thus we need to
 # prepend lib/ if and only if they're not empty.  Unfortunately, make is not