Neither cleaner.h nor recodext.h needs to be generated

So don’t generate them, and move cleaner.h into src; this fixes dependency
tracking, and prevents system headers from installations of librecode being
used erroneously.

Also remove defunct symbols from cleaner.h.

Also fix a wrong dependency: charname.lo depends on charname.h, not
rfc1345.h.

diff --git a/.gitignore b/.gitignore
index 867c2ff4ce292b5bdaa56fe5cc011ca21a9363f8..b6483f5086ba8617946b4817f57df0f9780a7305 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@ html/
 /aclocal.m4
 /autom4te.cache
 /build-aux
-/cleaner.h
 /compile
 /config.guess
 /config.h
@@ -46,7 +45,6 @@ html/
 /src/merged.c
 /src/recode
 /src/recode.1
-/src/recodext.h
 /src/rfc1345.h
 /src/strip-data.c
 /src/strip-pool.c

diff --git a/Makefile.am b/Makefile.am
index f81fbc7366ed305d98b22b5f1f7ca4212bcbadaf..05d6505ec915bca0fd97f5bd956f0196ab496153 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,10 +27,6 @@ keld/NomsSeulsfinal.lst keld/charsets.def keld/control.def \
 keld/iso10646.def keld/mnemonics,ds keld/other.def keld/rfc1345.txt
 SUBDIRS = doc lib po src tests contrib
 
-# All object files should depend on cleaner.h as well on as config.h.
-# For now at least, if you modify cleaner.h.in, make twice!
-all-local: cleaner.h
-
 get-po-files:
        cd $(top_srcdir) && \
          rsync -Lrtvz translationproject.org::tp/latest/recode/ po

diff --git a/configure.ac b/configure.ac
index 29665db9f0dd42b16ac81a9d22c0d679f80ded50..82eaf287c74969f7e258dec2754fb2fa905a24cf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -76,9 +76,5 @@ AM_GNU_GETTEXT(external)
 
 AM_CONDITIONAL(MES_SITES, [test -f "~/etc/mes-sites/site.mk"])
 
-AH_BOTTOM([
-#include "cleaner.h"
-])
-
-AC_OUTPUT(Makefile cleaner.h contrib/Makefile doc/Makefile lib/Makefile
+AC_OUTPUT(Makefile contrib/Makefile doc/Makefile lib/Makefile
           po/Makefile.in src/Makefile tests/Makefile tests/setup.py)

diff --git a/src/Makefile.am b/src/Makefile.am
index f563edb39b1d85fef3221a90a9855f693686c9ac..291c438f37ee47eb032b2d5d487256ce6c90d448 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,11 +26,9 @@ include_HEADERS = recode.h recodext.h
 H_STEPS = common.h decsteps.h inisteps.h tersteps.h \
 $(H_FALLBACKS) $(H_SURFACES)
 
-noinst_HEADERS = $(H_STEPS) \
-charname.h fr-charname.h iconvdecl.h rfc1345.h
+noinst_HEADERS = $(H_STEPS) cleaner.h charname.h fr-charname.h iconvdecl.h rfc1345.h
 
-EXTRA_DIST = recodext.h.in stamp-steps stamp-strip \
-$(L_STEPS) mergelex.py $(MANS)
+EXTRA_DIST = stamp-steps stamp-strip $(L_STEPS) mergelex.py $(MANS)
 
 CLEANFILES = iconvdecl.h
 
@@ -50,11 +48,12 @@ H_SURFACES = base64.h
 C_SURFACES = base64.c dump.c endline.c permut.c quoted.c
 L_SURFACES =
 
-recode_SOURCES = main.c mixed.c
+recode_SOURCES = main.c mixed.c common.h
 recode_LDADD = librecode.la ../lib/libgnu.la
 
 librecode_la_SOURCES = charname.c combine.c fr-charname.c iconv.c \
-names.c outer.c recode.c request.c strip-pool.c task.c $(ALL_STEPS)
+names.c outer.c recode.c request.c strip-pool.c task.c $(ALL_STEPS) \
+$(include_HEADERS) $(noinst_HEADERS) $(H_STEPS)
 librecode_la_LDFLAGS = -version-info 0:0:0
 
 loc:
@@ -102,12 +101,9 @@ $(srcdir)/recode.1: recode
          echo "         but you may safely and merely ignore this error."; \
        fi
 
-$(srcdir)/recodext.h: $(top_srcdir)/cleaner.h.in $(srcdir)/recodext.h.in
-       cat $(top_srcdir)/cleaner.h.in $(srcdir)/recodext.h.in > $@
-
 main.o: main.c ../config.status
 
-charname.lo: rfc1345.h
+charname.lo: charname.h
 charname.h: ../tables.py $(MNEMONICS_DS) $(RFC1345_TXT)
        $(TABLES_PY) -C $(srcdir) -n $(MNEMONICS_DS) $(RFC1345_TXT)
 

diff --git a/cleaner.h.in b/src/cleaner.h
similarity index 90%
rename from cleaner.h.in
rename to src/cleaner.h
index ad45ef5323cb537aee91e59be6a6281756711fde..5a83c477e6a7142b889bf7d4706e46a2b39af72a 100644 (file)
--- a/cleaner.h.in
+++ b/src/cleaner.h
@@ -22,13 +22,6 @@
 #ifndef CLEANER_H_
 # define CLEANER_H_
 
-# define __xargmatch_internal librecode_xargmatch_internal
-# define aliases_lookup librecode_aliases_lookup
-# define argcasematch librecode_argcasematch
-# define argmatch librecode_argmatch
-# define argmatch_invalid librecode_argmatch_invalid
-# define argmatch_to_argument librecode_argmatch_to_argument
-# define argmatch_valid librecode_argmatch_valid
 # define clone_quoting_options librecode_clone_quoting_options
 # define code_to_ucs2 librecode_code_to_ucs2
 # define combine_byte_byte librecode_combine_byte_byte
@@ -96,7 +89,6 @@
 # define list_all_symbols librecode_list_all_symbols
 # define list_concise_charset librecode_list_concise_charset
 # define list_full_charset librecode_list_full_charset
-# define make_argmatch_arrays librecode_make_argmatch_arrays
 # define module_african librecode_module_african
 # define module_afrtran librecode_module_afrtran
 # define module_applemac librecode_module_applemac
@@ -134,13 +126,6 @@
 # define prepare_for_aliases librecode_prepare_for_aliases
 # define put_ucs2 librecode_put_ucs2
 # define put_ucs4 librecode_put_ucs4
-# define quotearg librecode_quotearg
-# define quotearg_buffer librecode_quotearg_buffer
-# define quotearg_char librecode_quotearg_char
-# define quotearg_colon librecode_quotearg_colon
-# define quotearg_n librecode_quotearg_n
-# define quotearg_n_style librecode_quotearg_n_style
-# define quotearg_style librecode_quotearg_style
 # define reversibility librecode_reversibility
 # define set_char_quoting librecode_set_char_quoting
 # define set_quoting_style librecode_set_quoting_style

diff --git a/src/common.h b/src/common.h
index 21e2efb3cf42152072f53cc1590ddf0d84c620e2..857495ca671f6debf17fe339ac09524941386e36 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -18,6 +18,7 @@
    Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
+#include "cleaner.h"
 
 #if MSDOS || WIN32 || _WIN32 || OS2
 # define DOSWIN_OR_OS2 1

diff --git a/src/recodext.h.in b/src/recodext.h
similarity index 100%
rename from src/recodext.h.in
rename to src/recodext.h