|
 |
bdd84d8 |
From dcdd5d26c0c2c49f8113b63186449d6a1e3a509e Mon Sep 17 00:00:00 2001
|
|
|
bdd84d8 |
From: Reuben Thomas <rrt@sc3d.org>
|
|
|
bdd84d8 |
Date: Fri, 6 Jan 2023 20:11:03 +0100
|
|
|
bdd84d8 |
Subject: [PATCH 02/18] src/Makefile.am: allow build without help2man
|
|
|
bdd84d8 |
|
|
|
bdd84d8 |
---
|
|
|
bdd84d8 |
src/Makefile.am | 8 +++-----
|
|
|
bdd84d8 |
tests/Makefile.am | 2 +-
|
|
|
bdd84d8 |
2 files changed, 4 insertions(+), 6 deletions(-)
|
|
|
bdd84d8 |
|
|
|
bdd84d8 |
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
|
bdd84d8 |
index fa6740e..0342057 100644
|
|
|
bdd84d8 |
--- a/src/Makefile.am
|
|
|
bdd84d8 |
+++ b/src/Makefile.am
|
|
|
bdd84d8 |
@@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = gnits
|
|
|
bdd84d8 |
bin_PROGRAMS = recode
|
|
|
bdd84d8 |
lib_LTLIBRARIES = librecode.la
|
|
|
bdd84d8 |
noinst_LTLIBRARIES = libmerged.la
|
|
|
bdd84d8 |
-man_MANS = recode.1
|
|
|
bdd84d8 |
+dist_man_MANS = recode.1
|
|
|
bdd84d8 |
include_HEADERS = recode.h recodext.h
|
|
|
bdd84d8 |
|
|
|
bdd84d8 |
H_STEPS = common.h decsteps.h inisteps.h tersteps.h \
|
|
|
bdd84d8 |
@@ -100,12 +100,12 @@ merged.c: mergelex.py $(L_STEPS)
|
|
|
bdd84d8 |
# Depend on recode$(EXEEXT) rather than explicitly make-ing it, as otherwise
|
|
|
bdd84d8 |
# we break parallel builds, as libmerged.la can be built twice in parallel,
|
|
|
bdd84d8 |
# which can fail.
|
|
|
bdd84d8 |
-recode.1: main.c $(top_srcdir)/configure.ac recode$(EXEEXT)
|
|
|
bdd84d8 |
+recode.1: main.c $(top_srcdir)/configure.ac
|
|
|
bdd84d8 |
## Exit gracefully if recode.1 is not writeable, such as during distcheck!
|
|
|
bdd84d8 |
$(AM_V_GEN)if ( touch $@.w && rm -f $@.w; ) >/dev/null 2>&1; then \
|
|
|
bdd84d8 |
$(top_srcdir)/build-aux/missing --run $(HELP2MAN) --locale=en_US.UTF-8 \
|
|
|
bdd84d8 |
--name="converts files between character sets" \
|
|
|
bdd84d8 |
- --output=$@ ./recode; \
|
|
|
bdd84d8 |
+ --output=$@ ./recode$(EXEEXT); \
|
|
|
bdd84d8 |
fi
|
|
|
bdd84d8 |
|
|
|
bdd84d8 |
main.o: main.c ../config.status
|
|
|
bdd84d8 |
@@ -169,5 +169,3 @@ strip-pool.c strip-data.c: stamp-strip
|
|
|
bdd84d8 |
stamp-strip: ../tables.py $(MNEMONICS_DS) $(CHARSETS_DEF)
|
|
|
bdd84d8 |
$(TABLES_PY) -C $(srcdir) -p $(MNEMONICS_DS) $(CHARSETS_DEF)
|
|
|
bdd84d8 |
@echo timestamp > $(srcdir)/$@
|
|
|
bdd84d8 |
-
|
|
|
bdd84d8 |
-DISTCLEANFILES = recode.1
|
|
|
bdd84d8 |
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
|
|
bdd84d8 |
index 3ab84cd..a26d43e 100644
|
|
|
bdd84d8 |
--- a/tests/Makefile.am
|
|
|
bdd84d8 |
+++ b/tests/Makefile.am
|
|
|
bdd84d8 |
@@ -1,5 +1,5 @@
|
|
|
bdd84d8 |
# Makefile for Recode regression tests.
|
|
|
bdd84d8 |
-# Copyright © 1996-2022 Free Software Foundation, Inc.
|
|
|
bdd84d8 |
+# Copyright © 1996-2023 Free Software Foundation, Inc.
|
|
|
bdd84d8 |
# François Pinard <pinard@iro.umontreal.ca>, 1988.
|
|
|
bdd84d8 |
|
|
|
bdd84d8 |
# This program is free software; you can redistribute it and/or modify
|
|
|
bdd84d8 |
--
|
|
|
bdd84d8 |
2.38.1
|
|
|
bdd84d8 |
|