diff options
author | G. Branden Robinson <g.branden.robinson@gmail.com> | 2022-05-01 02:47:03 +1000 |
---|---|---|
committer | G. Branden Robinson <g.branden.robinson@gmail.com> | 2022-05-02 01:22:50 +1000 |
commit | 4de4ca940930ccc67c60db85eabda68d1ef873ff (patch) | |
tree | 52e953188d680545d00428a72dfd82180b8eaac9 | |
parent | 46321cffe2dd937011f74fa5260e1a27e7312b29 (diff) | |
download | groff-git-4de4ca940930ccc67c60db85eabda68d1ef873ff.tar.gz |
[build]: Fix code style nits in Automake files.
* doc/doc.am: Put spaces around (Auto)make variable assignments, for
consistency with the rest of this .am file, and our others.
* font/devpdf/devpdf.am (font/devpdf/build_font_files): Use shell '>'
operator instead of touch(1).
* font/devhtml/devhtml.am (font/devhtml/DESC):
* font/devps/devps.am (font/devps/DESC): Construct target in temporary
file, since doing so is a multi-step process, moving it to the target
name when it is complete and usable by dependencies.
Also fix indentation and trailing whitespace nits.
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | doc/doc.am | 8 | ||||
-rw-r--r-- | font/devhtml/devhtml.am | 8 | ||||
-rw-r--r-- | font/devpdf/devpdf.am | 2 | ||||
-rw-r--r-- | font/devps/devps.am | 13 | ||||
-rw-r--r-- | font/devutf8/devutf8.am | 4 |
6 files changed, 33 insertions, 16 deletions
@@ -1,3 +1,17 @@ +2022-04-30 G. Branden Robinson <g.branden.robinson@gmail.com> + + [build]: Fix code style nits in Automake files. + + * doc/doc.am: Put spaces around (Auto)make variable assignments, + for consistency with the rest of this .am file, and our others. + * font/devpdf/devpdf.am (font/devpdf/build_font_files): Use + shell '>' operator instead of touch(1). + * font/devhtml/devhtml.am (font/devhtml/DESC): + * font/devps/devps.am (font/devps/DESC): Construct target in + temporary file, since doing so is a multi-step process, moving + it to the target name when it is complete and usable by + dependencies. + 2022-04-29 G. Branden Robinson <g.branden.robinson@gmail.com> * src/preproc/refer/refer.cpp (main): When complaining of diff --git a/doc/doc.am b/doc/doc.am index 6a9ea1874..8f064c1bf 100644 --- a/doc/doc.am +++ b/doc/doc.am @@ -33,21 +33,21 @@ DOC_SED = $(SED) \ # It includes flags to locate its tmac and device/font description # directories and to produce verbose diagnostics in the event of syntax # or formatting problems. -DOC_GROFF=\ +DOC_GROFF = \ GROFF_COMMAND_PREFIX= \ GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \ $(GROFFBIN) -M $(doc_srcdir) $(MFLAG) $(FFLAG) -ww -b # This image file is used by several documents in the groff source tree. -DOC_GNU_EPS=doc/gnu.eps +DOC_GNU_EPS = doc/gnu.eps # Other doc, installed in $(docdir) # Files located in the source tree -DOCFILES_INST= \ +DOCFILES_INST = \ doc/me-revisions \ doc/ms.ms \ doc/pic.ms -DOCFILES_NOINST= \ +DOCFILES_NOINST = \ doc/meintro.me.in \ doc/meintro_fr.me.in \ doc/meref.me.in diff --git a/font/devhtml/devhtml.am b/font/devhtml/devhtml.am index d8f208821..49194ddb7 100644 --- a/font/devhtml/devhtml.am +++ b/font/devhtml/devhtml.am @@ -44,13 +44,15 @@ $(DEVHTMLFONTSFILES): $(devhtml_srcdir)/R.proto $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ && $(RM) $@ \ && $(SHELL) $(GENFONTSSH) $(devhtml_srcdir)/R.proto \ - $(DEVHTMLRES) $(DEVHTMLCPI) `basename $@` > $@ + $(DEVHTMLRES) $(DEVHTMLCPI) `basename $@` >$@ font/devhtml/DESC: $(devhtml_srcdir)/DESC.proto $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ && $(SHELL) $(GENDESCSH) $(devhtml_srcdir)/DESC.proto \ - $(DEVHTMLRES) $(DEVHTMLCPI) $(DEVHTMLLPI) $(DEVHTMLFONTS) > $@ \ - && echo "image_generator $(GHOSTSCRIPT)" >> $@ + $(DEVHTMLRES) $(DEVHTMLCPI) $(DEVHTMLLPI) $(DEVHTMLFONTS) \ + > $@.tmp \ + && echo "image_generator $(GHOSTSCRIPT)" >>$@.tmp \ + && mv $@.tmp $@ # Local Variables: diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am index 0c1e2a4a2..e1bce488d 100644 --- a/font/devpdf/devpdf.am +++ b/font/devpdf/devpdf.am @@ -126,7 +126,7 @@ font/devpdf/build_font_files: afmtodit font/devpdf/DESC \ $(abs_top_builddir)/font/devpdf \ '$(abs_top_srcdir)/font/devps : $(abs_top_builddir)/font/devps' \ >> $(top_builddir)/font/devpdf/download \ - && touch $@ + && >$@ mostlyclean-local: mostlyclean_devpdf_extra mostlyclean_devpdf_extra: diff --git a/font/devps/devps.am b/font/devps/devps.am index 09a452fe3..dbeafba39 100644 --- a/font/devps/devps.am +++ b/font/devps/devps.am @@ -69,7 +69,7 @@ DEVPSFONTFILES_GENERATED = \ font/devps/zapfdr.pfa \ font/devps/symbolsl.pfa devpsfontdir = $(fontdir)/devps -dist_devpsfont_DATA = $(DEVPSFONTFILES) +dist_devpsfont_DATA = $(DEVPSFONTFILES) nodist_devpsfont_DATA = $(DEVPSFONTFILES_GENERATED) # these files will be installed in oldfontdir @@ -140,15 +140,16 @@ EXTRA_DIST += \ font/devps/DESC: $(devps_srcdir)/DESC.in $(AM_V_GEN)$(MKDIR_P) font/devps \ - && cat $(devps_srcdir)/DESC.in >$@ \ - && echo broken $(BROKEN_SPOOLER_FLAGS) >>$@ \ + && cat $(devps_srcdir)/DESC.in >$@.tmp \ + && echo broken $(BROKEN_SPOOLER_FLAGS) >>$@.tmp \ && if test "$(PAGE)" = A4; then \ - echo "papersize a4" >>$@; \ + echo "papersize a4" >>$@.tmp; \ else \ - echo "papersize letter" >>$@; \ + echo "papersize letter" >>$@.tmp; \ fi \ && (test -z '$(PSPRINT)' \ - || echo print '$(PSPRINT)' >>$@) + || echo print '$(PSPRINT)' >>$@.tmp) + $(AM_V_at)mv $@.tmp $@ maintainer-font-descriptions: devps_font-descriptions # This target generates font descriptions from installed Type 1 AFM diff --git a/font/devutf8/devutf8.am b/font/devutf8/devutf8.am index f611432e6..9732a82a1 100644 --- a/font/devutf8/devutf8.am +++ b/font/devutf8/devutf8.am @@ -37,12 +37,12 @@ $(DEVUTF8FONTSFILES): $(devutf8_srcdir)/R.proto $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ && $(RM) $@ \ && $(SHELL) $(GENFONTSSH) $(devutf8_srcdir)/R.proto \ - $(DEVUTF8RES) $(DEVUTF8CPI) `basename $@` > $@ + $(DEVUTF8RES) $(DEVUTF8CPI) `basename $@` >$@ font/devutf8/DESC: $(devutf8_srcdir)/DESC.proto $(AM_V_GEN)$(MKDIR_P) `dirname $@` \ && $(SHELL) $(GENDESCSH) $(devutf8_srcdir)/DESC.proto \ - $(DEVUTF8RES) $(DEVUTF8CPI) $(DEVUTF8LPI) $(DEVUTF8FONTS) > $@ + $(DEVUTF8RES) $(DEVUTF8CPI) $(DEVUTF8LPI) $(DEVUTF8FONTS) >$@ # Local Variables: |