[groff] 17/27: [eqn,pic,refer]: Trivially reorganize .am files.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit f68b337f28ad6fd892248be53f40d6e42e1ce2aa
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Mon May 2 19:45:50 2022 -0500

    [eqn,pic,refer]: Trivially reorganize .am files.
    
    Make their ordering and comments more closely parallel to each other so
    it's easier to compare them.
---
 src/preproc/eqn/eqn.am     |  6 ++++--
 src/preproc/pic/pic.am     | 14 ++++++++------
 src/preproc/refer/refer.am | 17 +++++++++++------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/preproc/eqn/eqn.am b/src/preproc/eqn/eqn.am
index f40ae05a..cece865b 100644
--- a/src/preproc/eqn/eqn.am
+++ b/src/preproc/eqn/eqn.am
@@ -45,11 +45,13 @@ eqn_SOURCES = \
 PREFIXMAN1 += src/preproc/eqn/eqn.1 src/preproc/eqn/neqn.1
 EXTRA_DIST += \
   src/preproc/eqn/TODO \
-  src/preproc/eqn/neqn.sh \
   src/preproc/eqn/eqn.1.man \
-  src/preproc/eqn/neqn.1.man
+  src/preproc/eqn/neqn.1.man \
+  src/preproc/eqn/neqn.sh
 
+# Since eqn_CPPFLAGS was set, all .o files have an 'eqn-' prefix.
 src/preproc/eqn/eqn-lex.$(OBJEXT): src/preproc/eqn/eqn.hpp
+
 CLEANFILES += \
   src/preproc/eqn/eqn.hpp \
   src/preproc/eqn/eqn.cpp \
diff --git a/src/preproc/pic/pic.am b/src/preproc/pic/pic.am
index e3a5ad22..11dccc43 100644
--- a/src/preproc/pic/pic.am
+++ b/src/preproc/pic/pic.am
@@ -16,6 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 prefixexecbin_PROGRAMS += pic
+pic_CPPFLAGS = $(AM_CPPFLAGS) \
+  -I $(top_srcdir)/src/preproc/pic \
+  -I $(top_builddir)/src/preproc/pic
 pic_LDADD = libgroff.a $(LIBM) lib/libgnu.a
 pic_SOURCES = \
   src/preproc/pic/pic.ypp \
@@ -32,15 +35,14 @@ pic_SOURCES = \
   src/preproc/pic/output.h \
   src/preproc/pic/object.h
 
-pic_CPPFLAGS = $(AM_CPPFLAGS) \
-  -I $(top_srcdir)/src/preproc/pic \
-  -I $(top_builddir)/src/preproc/pic
 PREFIXMAN1 += src/preproc/pic/pic.1
+EXTRA_DIST += \
+  src/preproc/pic/TODO \
+  src/preproc/pic/pic.1.man
 
+# Since pic_CPPFLAGS was set, all .o files have a 'pic-' prefix.
 src/preproc/pic/pic-lex.$(OBJEXT): src/preproc/pic/pic.hpp
-EXTRA_DIST += \
-  src/preproc/pic/pic.1.man \
-  src/preproc/pic/TODO
+
 CLEANFILES += \
   src/preproc/pic/pic.cpp \
   src/preproc/pic/pic.hpp \
diff --git a/src/preproc/refer/refer.am b/src/preproc/refer/refer.am
index 0f14238b..4685b860 100644
--- a/src/preproc/refer/refer.am
+++ b/src/preproc/refer/refer.am
@@ -28,19 +28,24 @@ refer_SOURCES =  \
   src/preproc/refer/ref.h \
   src/preproc/refer/token.h \
   src/preproc/refer/command.h
+
 PREFIXMAN1 += src/preproc/refer/refer.1
-EXTRA_DIST += src/preproc/refer/TODO src/preproc/refer/refer.1.man
-CLEANFILES += \
-  src/preproc/refer/label.cpp \
-  src/preproc/refer/label.hpp \
-  src/preproc/refer/label.output
-# As refer_CPPFLAGS was set, all the .o have a 'refer-' prefix
+EXTRA_DIST += \
+  src/preproc/refer/TODO \
+  src/preproc/refer/refer.1.man
+
+# Since refer_CPPFLAGS was set, all .o files have a 'refer-' prefix.
 src/preproc/refer/refer-command.$(OBJEXT): defs.h
 src/preproc/refer/refer-ref.$(OBJEXT): defs.h
 src/preproc/refer/refer-refer.$(OBJEXT): defs.h
 src/preproc/refer/refer-token.$(OBJEXT): defs.h
 src/preproc/refer/refer-label.$(OBJEXT): defs.h
 
+CLEANFILES += \
+  src/preproc/refer/label.cpp \
+  src/preproc/refer/label.hpp \
+  src/preproc/refer/label.output
+
 refer_TESTS = \
   src/preproc/refer/tests/report-correct-line-numbers.sh
 TESTS += $(refer_TESTS)