Skip to content

Consistently honor make V=0 convention #2467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kinkie wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Consistently honor make V=0 convention #2467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4f2a437
Reduce verbosity of "make testHeaders"
kinkie Jul 31, 2026
ed1d716
Adopt autotools best practices, improve portability
kinkie Jul 31, 2026
9b9788b
improve hdrtest filter
kinkie Aug 1, 2026
08c2f24
Use AM_V_GEN in errors/
kinkie Aug 1, 2026
0cdd2ea
Use standard autotools verbosity patterns in translations
kinkie Aug 1, 2026
583dce8
Silence more needlessly verbose output
kinkie Aug 1, 2026
bf38c80
Optionally silence more pointless details
kinkie Aug 1, 2026
bfa065b
silence shell snippet in translate-warn
kinkie Aug 1, 2026
a525bb0
Honor V=0 insome file generation steps
kinkie Aug 1, 2026
cd20761
Honor V=.. in several targets in src/. Also improve portability by ab…
kinkie Aug 1, 2026
336bb32
Adopt AM_V_GEN across the board
kinkie Aug 1, 2026
426d325
Silence more GEN operations
kinkie Aug 1, 2026
17edf83
fix typo
kinkie Aug 1, 2026
9404325
Fix improper use of AM_V_GEN
kinkie Aug 1, 2026
7358c02
Restore explicit failure handling in src/anyp/Makefile.am
kinkie Aug 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/manuals/Substitute.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
## DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
## DEFAULT_ERROR_DIR = $(datadir)/errors

SUBSTITUTE=sed "\
SUBSTITUTE=$(SED) "\
s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\
s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\
s%@DEFAULT_SSL_CRTD@%$(DEFAULT_SSL_CRTD)%g;\
Expand Down
21 changes: 10 additions & 11 deletions errors/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ all: all-am
translate: translate-warn $(TRANSLATE_LANGUAGES)

translate-warn:
case "$(PO2HTML)" in \
@case "$(PO2HTML)" in \
off) \
echo "WARNING: Translation is disabled."; \
;; \
Expand All @@ -59,30 +59,29 @@ NOTIDY=`$(PO2HTML) --help | grep -o "[-]-notidy"`
@if test "$(PO2HTML)" != "" && test "$(PO2HTML)" != "no" && test "$(PO2HTML)" != "off" && test -f $(top_srcdir)/errors/en.po; then \
lang=$(@:.lang=); \
mkdir -p $(top_builddir)/errors/$$lang; \
echo "Translating $$lang ..."; \
$(AM_V_P) && echo "Translating $$lang"; \
for f in $(ERROR_TEMPLATES); do \
page=`basename $$f`; \
$(PO2HTML) $(NOTIDY) --progress=none -i $(top_srcdir)/errors/$$lang.po -t $(top_srcdir)/errors/$$f >$(top_builddir)/errors/$$lang/$$page || exit 1; \
done; \
cp $(top_srcdir)/errors/templates/error-details.txt $(top_builddir)/errors/$$lang/error-details.txt || exit 1; \
echo "Done translating $$lang"; \
else \
lang=$(@:.lang=); \
echo "Translation of $$lang disabled"; \
fi; \
touch $@

install-exec-local: translate
if test -f $(DESTDIR)$(DEFAULT_STYLESHEET) ; then \
$(AM_V_at)if test -f $(DESTDIR)$(DEFAULT_STYLESHEET) ; then \
echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_STYLESHEET)" ; \
else \
$(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_STYLESHEET)` ; \
echo "$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET)"; \
$(AM_V_P) && echo "$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET)"; \
$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET); \
fi

install-data-local: translate
$(mkinstalldirs) $(DESTDIR)$(DEFAULT_ERROR_DIR) ; \
$(AM_V_at)$(mkinstalldirs) $(DESTDIR)$(DEFAULT_ERROR_DIR) ; \
for l in $(TRANSLATE_LANGUAGES) templates; do \
l=`basename $$l .lang`; \
echo "Located $$l for install..."; \
Expand All @@ -92,11 +91,11 @@ install-data-local: translate
for f in $(ERROR_TEMPLATES) templates/error-details.txt; do \
page=`basename $$f`; \
if test -f $(builddir)/$$l/$$page; then \
echo "$(INSTALL_DATA) $(builddir)/$$l/$$page $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l"; \
$(INSTALL_DATA) $(builddir)/$$l/$$page $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l; \
$(AM_V_P) && echo "$(INSTALL_DATA) $(builddir)/$$l/$$page $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l"; \
$(INSTALL_DATA) $(builddir)/$$l/$$page $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l; \
elif test -f $(srcdir)/$$l/$$page; then \
echo "$(INSTALL_DATA) $(srcdir)/$$l/$$page $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l"; \
$(INSTALL_DATA) $(srcdir)/$$l/$$page $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l; \
$(AM_V_P) && echo "$(INSTALL_DATA) $(srcdir)/$$l/$$page $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l"; \
$(INSTALL_DATA) $(srcdir)/$$l/$$page $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l; \
fi; \
done; \
done; \
Expand All @@ -106,7 +105,7 @@ install-data-local: translate
$(ALIAS_LINKER) "$(srcdir)/aliases" || exit 1 ;

uninstall-local:
for l in $(TRANSLATE_LANGUAGES) templates; do \
$(AM_V_at)for l in $(TRANSLATE_LANGUAGES) templates; do \
l=`basename $$l .lang`; \
echo "Located $$l for uninstall ..."; \
if test -d $(srcdir)/$$l; then \
Expand Down
2 changes: 1 addition & 1 deletion src/Common.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h
COMPAT_LIB = $(top_builddir)/compat/libcompatsquid.la $(LIBPROFILER)

## Some helpers are written in Perl and need the local shell defined properly
subst_perlshell = sed -e 's,[@]PERL[@],$(PERL),g' <$(srcdir)/$@.pl.in >$@ || ($(RM) -f $@ ; exit 1)
subst_perlshell = $(SED) -e 's,[@]PERL[@],$(PERL),g' <$(srcdir)/$@.pl.in >$@ || ($(RM) -f $@ ; exit 1)

include $(top_srcdir)/src/TestHeaders.am
34 changes: 17 additions & 17 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,51 +599,51 @@ EXTRA_DIST = \
snmp_core.o snmp_agent.o: ../lib/snmplib/libsnmplib.la $(top_srcdir)/include/cache_snmp.h

globals.cc: globals.h mk-globals-c.awk
$(AWK) -f $(srcdir)/mk-globals-c.awk < $(srcdir)/globals.h > $@ || ($(RM) -f $@ && exit 1)
$(AM_V_GEN)$(AWK) -f $(srcdir)/mk-globals-c.awk < $(srcdir)/globals.h > $@ || ($(RM) -f $@ && exit 1)

## Generate files containing string arrays for various enums....
hier_code.cc: hier_code.h mk-string-arrays.awk
$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/hier_code.h > $@ || ($(RM) -f $@ && exit 1)
$(AM_V_GEN)$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/hier_code.h > $@ || ($(RM) -f $@ && exit 1)

lookup_t.cc: lookup_t.h mk-string-arrays.awk
$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/lookup_t.h > $@ || ($(RM) -f $@ && exit 1)
$(AM_V_GEN)$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/lookup_t.h > $@ || ($(RM) -f $@ && exit 1)

icp_opcode.cc: icp_opcode.h mk-string-arrays.awk
$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/icp_opcode.h > $@ || ($(RM) -f $@ && exit 1)
$(AM_V_GEN)$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/icp_opcode.h > $@ || ($(RM) -f $@ && exit 1)

swap_log_op.cc: swap_log_op.h mk-string-arrays.awk
$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/swap_log_op.h > $@ || ($(RM) -f $@ && exit 1)
$(AM_V_GEN)$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/swap_log_op.h > $@ || ($(RM) -f $@ && exit 1)


## other generated files...

test_cache_digest: test_cache_digest.o CacheDigest.o debug.o globals.o store_key_md5.o
$(CC) -o $@ $(LDFLAGS) $@.o CacheDigest.o debug.o globals.o store_key_md5.o $(STD_APP_LIBS)
$(AM_V_C) $(CC) -o $@ $(LDFLAGS) $@.o CacheDigest.o debug.o globals.o store_key_md5.o $(STD_APP_LIBS)

## If autodependency works well this is not needed anymore
cache_cf.o: cf_parser.cci

# cf_gen builds the configuration files.
cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
$(BUILDCXX) $(BUILDCXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
$(AM_V_CXX) $(BUILDCXX) $(BUILDCXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src

# squid.conf.default is built by cf_gen when making cf_parser.cci
squid.conf.default squid.conf.documented: cf_parser.cci
true

cf_parser.cci: cf.data cf_gen$(EXEEXT)
./cf_gen$(EXEEXT) cf.data $(srcdir)/cf.data.depend
$(AM_V_GEN) ./cf_gen$(EXEEXT) cf.data $(srcdir)/cf.data.depend

# The cf_gen_defines.cci is auto-generated and does not exist when the
# dependencies computed. We need to add its include files (autoconf.h) here
cf_gen_defines.cci: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre $(top_builddir)/include/autoconf.h
$(AWK) -f $(srcdir)/cf_gen_defines <$(srcdir)/cf.data.pre >$@ || ($(RM) -f $@ && exit 1)
$(AM_V_GEN) $(AWK) -f $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre >$@ || ($(RM) -f $@ && exit 1)


## TODO: generate a sed command file from configure. Then this doesn't
## depend on the Makefile.
cf.data: cf.data.pre Makefile
sed \
$(AM_V_GEN) $(SED) \
-e "s%[@]DEFAULT_HTTP_PORT[@]%$(DEFAULT_HTTP_PORT)%g" \
-e "s%[@]DEFAULT_CACHE_EFFECTIVE_USER[@]%$(CACHE_EFFECTIVE_USER)%g" \
-e "s%[@]DEFAULT_MIME_TABLE[@]%$(DEFAULT_MIME_TABLE)%g" \
Expand All @@ -669,12 +669,12 @@ cf.data: cf.data.pre Makefile
< $(srcdir)/cf.data.pre >$@

repl_modules.cc: repl_modules.sh Makefile
$(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc
$(AM_V_GEN) $(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc

include $(top_srcdir)/doc/manuals/Substitute.am

squid.8: $(srcdir)/squid.8.in Makefile
$(SUBSTITUTE) < $(srcdir)/squid.8.in > $@
$(AM_V_GEN) $(SUBSTITUTE) < $(srcdir)/squid.8.in > $@

man_MANS = squid.8
EXTRA_DIST += squid.8.in
Expand All @@ -684,18 +684,18 @@ install-data-local: install-sysconfDATA install-dataDATA
@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
else \
echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE)" ;\
$(AM_V_P) && echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE)" ;\
$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE); \
fi
@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
else \
echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
$(AM_V_P) && echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
fi
echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
$(AM_V_P) && echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \
$(AM_V_P) && echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \
$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \
$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \
$(mkinstalldirs) $(DESTDIR)$(DEFAULT_SWAP_DIR); \
Expand All @@ -712,7 +712,7 @@ CLEANFILES += cf.data squid.conf.default squid.conf.documented \
test_tools.cc *.a

test_tools.cc: $(top_srcdir)/test-suite/test_tools.cc
cp $(top_srcdir)/test-suite/test_tools.cc .
$(AM_V_GEN) cp $(top_srcdir)/test-suite/test_tools.cc .

# stock tools for unit tests - library independent versions of dlink_list
# etc.
Expand Down
5 changes: 3 additions & 2 deletions src/TestHeaders.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ EXCLUDE_FROM_HDR_TESTING =
# headers to test

testHeaders: $(SOURCES) $(noinst_HEADERS) $(EXTRA_DIST) $(top_srcdir)/test-suite/testHeader.cc.in
$(MAKE) $(^:.h=.hdrtest) && touch $@ && $(CHMOD) +x $@
$(AM_V_at)$(MAKE) `echo $(^:.h=.hdrtest) | $(AWK) '{for(i=1;i<=NF;i++) if($$i ~ /\.hdrtest$$/) printf "%s ", $$i}'` \
&& touch $@ && $(CHMOD) +x $@

.h.hdrtest:
@SrcFilePath=`echo $< | $(SED) 's%^$(top_srcdir)/%%'`; \
Expand All @@ -26,7 +27,7 @@ testHeaders: $(SOURCES) $(noinst_HEADERS) $(EXTRA_DIST) $(top_srcdir)/test-suite
exit 0; \
fi; \
$(SED) "s%[@]HEADER[@]%${<}%" "$(top_srcdir)/test-suite/testHeader.cc.in" >"$$TargetFileName.cc" && \
echo "$(CXXCOMPILE) -c -o" "$$TargetFileName" "$$TargetFileName.cc" && \
if $(AM_V_P) ; then echo "$(CXXCOMPILE) -c -o" "$$TargetFileName" "$$TargetFileName.cc" ; fi && \
if $(CXXCOMPILE) -c -o "$$TargetFileName" "$$TargetFileName.cc" ; \

@rousskov rousskov Jul 31, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After we settle on the best silencing method, please apply it to all similar echo command-that-will-run-next cases in .am files (at least). For example:

echo "$(INSTALL_DATA) $(builddir)/$$l/$$page ...

I also recommend applying it to other progress-like echo cases. For example:

echo "Located $$l for install..."; ...

@kinkie kinkie Jul 31, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer to do that in a followup, but sure

@rousskov rousskov Jul 31, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not insist on that, but, in my experience, in a PR dedicated to the corresponding improvement, it is usually best to address all eligible cases. That is actually one of the primary values of comprehensive dedicated PRs: Compared to a series of incomplete PRs spread over time, they reduce noise and half-working solution risks while avoiding technical debt creation.

@kinkie kinkie Aug 1, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is another problem to address then: echo is not portable. We should use $(ECHO) instead.

@kinkie kinkie Aug 1, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and on that line, sed should be $(SED) (for a future PR)

@kinkie kinkie Aug 1, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done across the board. Changed the PR title to account for it

then echo "header-test: ok - $$SrcFilePath"; $(RM) "$$TargetFileName.cc" "$$TargetFileName"; \
else echo "header-test: not ok - $$SrcFilePath"; exit 1; fi
Expand Down
4 changes: 2 additions & 2 deletions src/acl/external/SQL_session/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ EXTRA_DIST= \
required.m4

ext_sql_session_acl: ext_sql_session_acl.pl.in
$(subst_perlshell)
$(AM_V_GEN) $(subst_perlshell)

if ENABLE_POD2MAN_DOC
man_MANS = ext_sql_session_acl.8
CLEANFILES += ext_sql_session_acl.8
EXTRA_DIST += ext_sql_session_acl.8

ext_sql_session_acl.8: ext_sql_session_acl
pod2man --section=8 ext_sql_session_acl ext_sql_session_acl.8
$(AM_V_GEN) pod2man --section=8 ext_sql_session_acl ext_sql_session_acl.8

endif
4 changes: 2 additions & 2 deletions src/acl/external/delayer/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ EXTRA_DIST= \
ext_delayer_acl.pl.in

ext_delayer_acl: ext_delayer_acl.pl.in
$(subst_perlshell)
$(AM_V_GEN) $(subst_perlshell)

if ENABLE_POD2MAN_DOC
man_MANS = ext_delayer_acl.8
CLEANFILES += ext_delayer_acl.8
EXTRA_DIST += ext_delayer_acl.8

ext_delayer_acl.8: ext_delayer_acl
pod2man --section=8 ext_delayer_acl ext_delayer_acl.8
$(AM_V_GEN) pod2man --section=8 ext_delayer_acl ext_delayer_acl.8

endif
4 changes: 2 additions & 2 deletions src/acl/external/kerberos_sid_group/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ EXTRA_DIST= \
required.m4

ext_kerberos_sid_group_acl: ext_kerberos_sid_group_acl.pl.in
$(subst_perlshell)
$(AM_V_GEN) $(subst_perlshell)

if ENABLE_POD2MAN_DOC
man_MANS = ext_kerberos_sid_group_acl.8
CLEANFILES += ext_kerberos_sid_group_acl.8
EXTRA_DIST += ext_kerberos_sid_group_acl.8

ext_kerberos_sid_group_acl.8: ext_kerberos_sid_group_acl
pod2man --section=8 ext_kerberos_sid_group_acl ext_kerberos_sid_group_acl.8
$(AM_V_GEN) pod2man --section=8 ext_kerberos_sid_group_acl ext_kerberos_sid_group_acl.8

endif

4 changes: 2 additions & 2 deletions src/acl/external/wbinfo_group/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ EXTRA_DIST= \
required.m4

ext_wbinfo_group_acl: ext_wbinfo_group_acl.pl.in
$(subst_perlshell)
$(AM_V_GEN) $(subst_perlshell)

if ENABLE_POD2MAN_DOC
man_MANS = ext_wbinfo_group_acl.8
CLEANFILES += ext_wbinfo_group_acl.8
EXTRA_DIST += ext_wbinfo_group_acl.8

ext_wbinfo_group_acl.8: ext_wbinfo_group_acl
pod2man --section=8 ext_wbinfo_group_acl ext_wbinfo_group_acl.8
$(AM_V_GEN) pod2man --section=8 ext_wbinfo_group_acl ext_wbinfo_group_acl.8

endif
4 changes: 3 additions & 1 deletion src/anyp/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ libanyp_la_SOURCES = \
forward.h

ProtocolType.cc: ProtocolType.h $(top_srcdir)/src/mk-string-arrays.awk
($(AWK) -f $(top_srcdir)/src/mk-string-arrays.awk <$(srcdir)/ProtocolType.h | sed -e 's%PROTO_%%' >$@) || ($(RM) -f $@ && exit 1)
$(AM_V_GEN) ($(AWK) -f $(top_srcdir)/src/mk-string-arrays.awk $(srcdir)/ProtocolType.h |\
$(SED) -e 's%PROTO_%%' >$@) || \
($(RM) -f $@ && exit 1)

CLEANFILES += ProtocolType.cc
4 changes: 2 additions & 2 deletions src/auth/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ libacls_la_SOURCES = \
AuthAclState.h

CredentialState.cc: CredentialState.h $(top_srcdir)/src/mk-string-arrays.awk
$(AWK) -f $(top_srcdir)/src/mk-string-arrays.awk < $(srcdir)/CredentialState.h > $@ || (rm -f $@ ; exit 1)
$(AM_V_GEN) $(AWK) -f $(top_srcdir)/src/mk-string-arrays.awk $(srcdir)/CredentialState.h > $@ || (rm -f $@ ; exit 1)

Type.cc: Type.h $(top_srcdir)/src/mk-string-arrays.awk
$(AWK) -f $(top_srcdir)/src/mk-string-arrays.awk < $(srcdir)/Type.h > $@ || (rm -f $@ ; exit 1)
$(AM_V_GEN) $(AWK) -f $(top_srcdir)/src/mk-string-arrays.awk $(srcdir)/Type.h > $@ || (rm -f $@ ; exit 1)

CLEANFILES += CredentialState.cc Type.cc
4 changes: 2 additions & 2 deletions src/auth/basic/DB/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ EXTRA_DIST= \
required.m4

basic_db_auth: basic_db_auth.pl.in
$(subst_perlshell)
$(AM_V_GEN) $(subst_perlshell)

if ENABLE_POD2MAN_DOC
man_MANS = basic_db_auth.8
CLEANFILES += basic_db_auth.8
EXTRA_DIST += basic_db_auth.8

basic_db_auth.8: basic_db_auth
pod2man --section=8 basic_db_auth basic_db_auth.8
$(AM_V_GEN) pod2man --section=8 basic_db_auth basic_db_auth.8

endif
4 changes: 2 additions & 2 deletions src/auth/basic/POP3/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ EXTRA_DIST= \
required.m4

basic_pop3_auth: basic_pop3_auth.pl.in
$(subst_perlshell)
$(AM_V_GEN) $(subst_perlshell)

if ENABLE_POD2MAN_DOC
man_MANS = basic_pop3_auth.8
CLEANFILES += basic_pop3_auth.8
EXTRA_DIST += basic_pop3_auth.8

basic_pop3_auth.8: basic_pop3_auth
pod2man --section=8 basic_pop3_auth basic_pop3_auth.8
$(AM_V_GEN) pod2man --section=8 basic_pop3_auth basic_pop3_auth.8

endif
2 changes: 1 addition & 1 deletion src/auth/ntlm/fake/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ntlm_fake_auth_LDADD= \

## Demo using perl.
## ntlm_fake_auth.pl: ntlm_fake_auth.pl.in
## $(subst_perlshell)
## $(AM_V_GEN) $(subst_perlshell)

EXTRA_DIST= \
ntlm_fake_auth.pl.in \
Expand Down
2 changes: 1 addition & 1 deletion src/error/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
include $(top_srcdir)/src/Common.am

categories.cc: forward.h $(top_srcdir)/src/mk-string-arrays.awk
$(AWK) -f $(top_srcdir)/src/mk-string-arrays.awk ifile=error/forward.h < $(srcdir)/forward.h > $@ || ($(RM) -f $@ && exit 1)
$(AM_V_GEN) $(AWK) -f $(top_srcdir)/src/mk-string-arrays.awk ifile=error/forward.h < $(srcdir)/forward.h > $@ || ($(RM) -f $@ && exit 1)

BUILT_SOURCES = \
categories.cc
Expand Down
4 changes: 2 additions & 2 deletions src/http/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ libhttp_la_SOURCES = \
libhttp_la_LIBADD= one/libhttp1.la

MethodType.cc: MethodType.h $(top_srcdir)/src/mk-string-arrays.awk
($(AWK) -f $(top_srcdir)/src/mk-string-arrays.awk sbuf=1 < $(srcdir)/MethodType.h | \
sed -e 's%METHOD_%%' -e 's%_C%-C%' >$@) || ($(RM) -f $@ && exit 1)
$(AM_V_GEN) ($(AWK) -f $(top_srcdir)/src/mk-string-arrays.awk sbuf=1 $(srcdir)/MethodType.h | \
$(SED) -e 's%METHOD_%%' -e 's%_C%-C%' >$@) || ($(RM) -f $@ && exit 1)

CLEANFILES += MethodType.cc

Expand Down
4 changes: 2 additions & 2 deletions src/http/url_rewriters/LFS/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ EXTRA_DIST= \
url_lfs_rewrite.pl.in

url_lfs_rewrite: url_lfs_rewrite.pl.in
$(subst_perlshell)
$(AM_V_GEN) $(subst_perlshell)

if ENABLE_POD2MAN_DOC
man_MANS = url_lfs_rewrite.8
CLEANFILES += url_lfs_rewrite.8
EXTRA_DIST += url_lfs_rewrite.8

url_lfs_rewrite.8: url_lfs_rewrite
pod2man --section=8 url_lfs_rewrite url_lfs_rewrite.8
$(AM_V_GEN) pod2man --section=8 url_lfs_rewrite url_lfs_rewrite.8

endif
Loading
Loading