Trivial manual fixes.

[slotifier.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e2c3fc3fbd7c2389069136c52036ff44b9e1ea1a..24e7919f92eedf5cec50b3b9383e7cdd8017a40b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright © 2018, 2021 Nick Bowler
+# Copyright © 2018, 2021, 2023 Nick Bowler
 #
 # License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 # This is free software: you are free to do what the fuck you want to.
@@ -11,19 +11,31 @@ DISTCLEANFILES =
 MOSTLYCLEANFILES =
 MAINTAINERCLEANFILES =
 EXTRA_LIBRARIES =
-EXTRA_DIST = INSTALL
+EXTRA_DIST = bootstrap common/scripts/fix-gnulib.pl m4/gnulib-cache.m4 \
+             INSTALL README.md
 
 AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \
-              -DLOCALEDIR=\"$(localedir)\"
+              -I$(DX_BASEDIR)/src -DLOCALEDIR=\"$(localedir)\"
 AM_CFLAGS = $(LIBGERBV_CFLAGS) $(CNEARTREE_CFLAGS)
 
 bin_PROGRAMS = slotifier
 
-slotifier_SOURCES = src/slotifier.c
-slotifier_LDADD = $(LIBGERBV_LIBS) $(CNEARTREE_LIBS) libgnu.a \
-                  $(LTLIBICONV) $(LTLIBINTL) $(HYPOT_LIBM)
+noinst_HEADERS = common/src/help.h common/src/xtra.h
+slotifier_SOURCES = src/options.h common/src/help.c
+EXTRA_slotifier_DEPENDENCIES = $(libslotifiermain_a_OBJECTS)
+slotifier_LDADD = $(EXTRA_slotifier_DEPENDENCIES) \
+                  $(LIBGERBV_LIBS) $(CNEARTREE_LIBS) libgnu.a \
+                  $(LTLIBINTL) $(HYPOT_LIBM)
 $(slotifier_OBJECTS): $(gnulib_headers)
 
+if USE_NLS
+slotifier_SOURCES += common/src/copysym.c common/src/copysym.h
+endif
+
+EXTRA_LIBRARIES += libslotifiermain.a
+libslotifiermain_a_SOURCES = src/slotifier.c
+$(libslotifiermain_a_OBJECTS): $(gnulib_headers) src/options.h
+
 dist_man_MANS = doc/slotifier.1
 
 # When running "make dist" in a VPATH build with a read-only srcdir, Automake
@@ -68,6 +80,22 @@ distcheck-hook:
              echo '       *** be the stub from a git checkout.  The "git" and "perl"'; \
              echo '       *** programs are required for ChangeLog generation to work.'; \
              $(TEST_DISTRIBUTION_OR_ERROR); } >&2
+       $(GENERIC_V) : 'CHECK   ' NEWS; \
+         $(AWK) 'NR == 1 && $$NF != "$(PACKAGE_VERSION):" \
+           { print FILENAME ":" NR ":", $$0; exit 1}' \
+           $(distdir)/NEWS || { \
+             echo 'ERROR: *** First line of NEWS should match the package version'; \
+             echo '       *** $(PACKAGE_VERSION), but that does not appear to be the case.'; \
+             echo '       *** Remember to update NEWS before preparing a release.'; \
+             $(TEST_DISTRIBUTION_OR_ERROR); } >&2
+
+OPTFILES = src/options.opt
+.opt.h:
+       $(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-options.awk $< >$@.tmp
+       $(AM_V_at) mv -f $@.tmp $@
+$(OPTFILES:.opt=.h): $(DX_BASEDIR)/scripts/gen-options.awk
+MAINTAINERCLEANFILES += $(OPTFILES:.opt=.h)
+EXTRA_DIST += $(DX_BASEDIR)/scripts/gen-options.awk $(OPTFILES)
 
 # Supporting rules for gettext.
 include $(top_srcdir)/common/snippet/gettext.mk
@@ -80,7 +108,8 @@ XGETTEXT_OPTS = -D $(builddir) -D $(srcdir) --from-code=utf-8 \
                 --add-comments=TRANSLATORS: --foreign-user \
                 --msgid-bugs-address=$(PACKAGE_BUGREPORT) \
                 --package-version=$(PACKAGE_VERSION) \
-                --package-name=$(PACKAGE) --keyword=_
+                --package-name=$(PACKAGE) --keyword=_ \
+                --keyword=N_ --keyword=PN_:1c,2
 
 po/$(PACKAGE).pot: $(SOURCES)
        $(AM_V_at)  $(MKDIR_P) $(@D)