From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Thu, 8 Dec 2011 17:53:10 +0000 (-0500)
Subject: Clean up the DEVEL noise
X-Git-Tag: SUDO_1_8_4~107^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31c08fca3ea0e3f11c954360269a5dbf09bc46b1;p=sudo

Clean up the DEVEL noise
---

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9c66c65ea..60f0d49b3 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -84,13 +84,14 @@ Makefile: $(srcdir)/Makefile.in
 .SUFFIXES: .man
 
 varsub: $(top_srcdir)/configure.in
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
 	    printf 's#@%s@#1#\ns#@%s@#1#\ns#@%s@#1#\ns#@%s@#/etc#g\ns#@%s@#/usr/local#g\ns#@%s@#4#g\ns#@%s@#1m#g\n' SEMAN BAMAN LCMAN sysconfdir prefix mansectform mansectsu > $@; \
 	    sed -n '/Begin initial values for man page substitution/,/End initial values for man page substitution/{;p;}' $(top_srcdir)/configure.in | sed -e '/^#/d' -e 's/^/s#@/' -e 's/=[\\"]*/@#/' -e 's/[\\"]*$$/#g/' >> $@; \
 	fi
 
 $(srcdir)/sudo.man.in: $(srcdir)/sudo.pod
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
+	    echo "Generating $@"; \
 	    mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; \
 	    mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; \
 	    sed -n -e '/^=pod/q' -e 's/^/.\\" /p' $(srcdir)/sudo.pod > $@; \
@@ -101,12 +102,14 @@ sudo.man: $(srcdir)/sudo.man.in
 	(cd $(top_builddir) && $(SHELL) config.status --file=doc/$@)
 
 $(srcdir)/sudo.cat: varsub $(srcdir)/sudo.man.in
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
+	    echo "Generating $@"; \
 	    sed -f varsub $(srcdir)/sudo.man.in | $(NROFF) -man > $@; \
 	fi
 
 $(srcdir)/visudo.man.in: $(srcdir)/visudo.pod
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
+	    echo "Generating $@"; \
 	    mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; \
 	    mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; \
 	    sed -n -e '/^=pod/q' -e 's/^/.\\" /p' $(srcdir)/visudo.pod > $@; \
@@ -117,12 +120,14 @@ visudo.man: $(srcdir)/visudo.man.in
 	(cd $(top_builddir) && $(SHELL) config.status --file=doc/$@)
 
 $(srcdir)/visudo.cat: varsub $(srcdir)/visudo.man.in
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
+	    echo "Generating $@"; \
 	    sed -f varsub $(srcdir)/visudo.man.in | $(NROFF) -man > $@; \
 	fi
 
 $(srcdir)/sudoers.man.in: $(srcdir)/sudoers.pod
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
+	    echo "Generating $@"; \
 	    mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; \
 	    mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; \
 	    sed -n -e '/^=pod/q' -e 's/^/.\\" /p' $(srcdir)/sudoers.pod > $@; \
@@ -133,12 +138,14 @@ sudoers.man: $(srcdir)/sudoers.man.in
 	(cd $(top_builddir) && $(SHELL) config.status --file=doc/$@)
 
 $(srcdir)/sudoers.cat: varsub $(srcdir)/sudoers.man.in
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
+	    echo "Generating $@"; \
 	    sed -f varsub $(srcdir)/sudoers.man.in | $(NROFF) -man > $@; \
 	fi
 
 $(srcdir)/sudoers.ldap.man.in: $(srcdir)/sudoers.ldap.pod
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
+	    echo "Generating $@"; \
 	    mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; \
 	    mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; \
 	    sed -n -e '/^=pod/q' -e 's/^/.\\" /p' $(srcdir)/sudoers.ldap.pod > $@; \
@@ -149,12 +156,14 @@ sudoers.ldap.man: $(srcdir)/sudoers.ldap.man.in
 	(cd $(top_builddir) && $(SHELL) config.status --file=doc/$@)
 
 $(srcdir)/sudoers.ldap.cat: varsub $(srcdir)/sudoers.ldap.man.in
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
+	    echo "Generating $@"; \
 	    sed -f varsub $(srcdir)/sudoers.ldap.man.in | $(NROFF) -man > $@; \
 	fi
 
 $(srcdir)/sudoreplay.man.in: $(srcdir)/sudoreplay.pod
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
+	    echo "Generating $@"; \
 	    mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; \
 	    mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; \
 	    sed -n -e '/^=pod/q' -e 's/^/.\\" /p' $(srcdir)/sudoreplay.pod > $@; \
@@ -165,12 +174,14 @@ sudoreplay.man: $(srcdir)/sudoreplay.man.in
 	(cd $(top_builddir) && $(SHELL) config.status --file=doc/$@)
 
 $(srcdir)/sudoreplay.cat: varsub $(srcdir)/sudoreplay.man.in
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
+	    echo "Generating $@"; \
 	    sed -f varsub $(srcdir)/sudoreplay.man.in | $(NROFF) -man > $@; \
 	fi
 
 $(srcdir)/sudo_plugin.man.in: $(srcdir)/sudo_plugin.pod
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
+	    echo "Generating $@"; \
 	    mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; \
 	    mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; \
 	    sed -n -e '/^=pod/q' -e 's/^/.\\" /p' $(srcdir)/sudo_plugin.pod > $@; \
@@ -181,22 +192,26 @@ sudo_plugin.man: $(srcdir)/sudo_plugin.man.in
 	(cd $(top_builddir) && $(SHELL) config.status --file=doc/$@)
 
 $(srcdir)/sudo_plugin.cat: varsub $(srcdir)/sudo_plugin.man.in
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
+	    echo "Generating $@"; \
 	    sed -f varsub $(srcdir)/sudo_plugin.man.in | $(NROFF) -man > $@; \
 	fi
 
 CONTRIBUTORS: $(srcdir)/contributors.pod
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
+	    echo "Generating $@"; \
 	    pod2text -l -i0 $(srcdir)/contributors.pod | sed '1,3d' > $@; \
 	fi
 
 HISTORY: $(srcdir)/history.pod
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
+	    echo "Generating $@"; \
 	    pod2text -l -i0 $(srcdir)/history.pod > $@; \
 	fi
 
 LICENSE: $(srcdir)/license.pod
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
+	    echo "Generating $@"; \
 	    pod2text -l -i0 $(srcdir)/license.pod | sed '1,3d' > $@; \
 	fi
 
diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index d050254c0..fa92d78ae 100644
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -192,36 +192,30 @@ check_wrap: $(CHECK_WRAP_OBJS) $(LT_LIBS)
 GENERATED = gram.h gram.c toke.c def_data.c def_data.h getdate.c
 
 $(devdir)/gram.c $(devdir)/gram.h: $(srcdir)/gram.y
-	if [ -n "$(DEVEL)" ]; then \
-	    $(YACC) -d $(srcdir)/gram.y; \
-	    echo "#include <config.h>" > $(devdir)/gram.c; \
-	    cat y.tab.c >> $(devdir)/gram.c; \
-	    rm -f y.tab.c; \
-	    mv -f y.tab.h $(devdir)/gram.h; \
+	@if [ -n "$(DEVEL)" ]; then \
+	    cmd='$(YACC) -d $(srcdir)/gram.y; echo "#include <config.h>" > $(devdir)/gram.c; cat y.tab.c >> $(devdir)/gram.c; rm -f y.tab.c; mv -f y.tab.h $(devdir)/gram.h'; \
+	    echo "$$cmd"; eval $$cmd; \
 	fi
 
 $(devdir)/toke.c: $(srcdir)/toke.l
-	if [ -n "$(DEVEL)" ]; then \
-	    $(FLEX) $(srcdir)/toke.l; \
-	    echo "#include <config.h>" > $(devdir)/toke.c; \
-	    cat lex.yy.c >> $(devdir)/toke.c; \
-	    rm -f lex.yy.c; \
+	@if [ -n "$(DEVEL)" ]; then \
+	    cmd='$(FLEX) $(srcdir)/toke.l; echo "#include <config.h>" > $(devdir)/toke.c; cat lex.yy.c >> $(devdir)/toke.c'; \
+	    echo "$$cmd"; eval $$cmd; \
 	fi
 
 # Uncomment the lines before -@true if you intend to modify getdate.y
 $(devdir)/getdate.c: $(srcdir)/getdate.y
-	if [ -n "$(DEVEL)" ]; then \
+	@if [ -n "$(DEVEL)" ]; then \
 	    echo "expect 10 shift/reduce conflicts"; \
-	    $(YACC) $(srcdir)/getdate.y; \
-	    echo "#include <config.h>" > $(devdir)/getdate.c; \
-	    cat y.tab.c >> $(devdir)/getdate.c; \
-	    rm -f y.tab.c; \
+	    cmd='$(YACC) $(srcdir)/getdate.y; echo "#include <config.h>" > $(devdir)/getdate.c; cat y.tab.c >> $(devdir)/getdate.c; rm -f y.tab.c'; \
+	    echo "$$cmd"; eval $$cmd; \
 	fi
 
 # Uncomment the following if you intend to modify def_data.in
 $(devdir)/def_data.c $(devdir)/def_data.h: $(srcdir)/def_data.in
-	if [ -n "$(DEVEL)" ]; then \
-	    $(PERL) $(srcdir)/mkdefaults -o $(devdir)/def_data $(srcdir)/def_data.in; \
+	@if [ -n "$(DEVEL)" ]; then \
+	    cmd='$(PERL) $(srcdir)/mkdefaults -o $(devdir)/def_data $(srcdir)/def_data.in'; \
+	    echo "$$cmd"; eval $$cmd; \
 	fi
 
 sudoers: $(srcdir)/sudoers.in
@@ -350,8 +344,9 @@ mostlyclean: clean
 
 distclean: clean
 	-rm -rf Makefile sudoers sudoers.lo .libs $(LINKS)
-	if [ -n "$(DEVEL)" -a "$(devdir)" != "$(srcdir)" ]; then \
-	    rm -rf $(GENERATED); \
+	@if [ -n "$(DEVEL)" -a "$(devdir)" != "$(srcdir)" ]; then \
+	    cmd='rm -rf $(GENERATED)'; \
+	    echo "$$cmd"; eval $$cmd; \
 	fi
 
 clobber: distclean