annotate automake snippets with $(AM_V_GEN) and $(AM_V_at)

[pspp] / modules / search

diff --git a/modules/search b/modules/search
index 0ed8b8da48a3585ce00115fdafee37f1ac680ccb..57b425a485cb55c917db503748ec08b5e3c9728e 100644 (file)
--- a/modules/search
+++ b/modules/search
@@ -2,11 +2,11 @@ Description:
 A GNU-like <search.h>.
 
 Files:
-lib/search_.h
+lib/search.in.h
 m4/search_h.m4
 
 Depends-on:
-absolute-header
+include_next
 link-warning
 
 configure.ac:
@@ -17,17 +17,19 @@ BUILT_SOURCES += search.h
 
 # We need the following in order to create <search.h> when the system
 # doesn't have one that works with the given compiler.
-search.h: search_.h
-       rm -f $@-t $@
+search.h: search.in.h
+       $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
          sed -e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \
-             -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \
-             -e 's|@''ABSOLUTE_SEARCH_H''@|$(ABSOLUTE_SEARCH_H)|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+             -e 's|@''NEXT_SEARCH_H''@|$(NEXT_SEARCH_H)|g' \
              -e 's|@''GNULIB_TSEARCH''@|$(GNULIB_TSEARCH)|g' \
              -e 's|@''HAVE_TSEARCH''@|$(HAVE_TSEARCH)|g' \
+             -e 's|@''REPLACE_TSEARCH''@|$(REPLACE_TSEARCH)|g' \
              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-             < $(srcdir)/search_.h; \
-       } > $@-t
+             < $(srcdir)/search.in.h; \
+       } > $@-t && \
        mv $@-t $@
 MOSTLYCLEANFILES += search.h search.h-t