Split gnulib_headers into 3 variables.

This will be useful for symbol mangling, where additional header files
may need to be added to various points in the dependency chain.

diff --git a/scripts/fix-gnulib.pl b/scripts/fix-gnulib.pl
index 3876f93e4b8639fcc0420ef51f17f8fc8f9a6c85..17163c7e24cc15d436bd5dd593c7629212bc5963 100755 (executable)
--- a/scripts/fix-gnulib.pl
+++ b/scripts/fix-gnulib.pl
@@ -93,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;
@@ -133,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.
@@ -158,7 +160,7 @@ 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;