Fold enchant-lsmod into enchant (WIP)

Makefile.am

@@ -38,7 +38,6 @@ ALL_SOURCE_FILES = \
 	lib/Makefile.am \
 	lib/*.vala \
 	src/Makefile.am \
-	src/*.h \
 	src/enchant*.vala \
 	providers/Makefile.am \
 	providers/*.[ch] \

bootstrap.conf

@@ -1,4 +1,4 @@
-# bootstrap.conf (Enchant) version 2024-05-05
+# bootstrap.conf (Enchant) version 2024-08-11
 
 # This file is part of Enchant.
 #
@@ -49,7 +49,6 @@ gnulib_modules='
         bootstrap
         configmake
         flock
-        getopt-posix
         gnu-make
         manywarnings
         relocatable-lib-lgpl

configure.ac

@@ -216,7 +216,6 @@ libgnu/Makefile
 providers/Makefile
 src/Makefile
 src/enchant.1
-src/enchant-lsmod.1
 tests/Makefile
 ], [],
 [ENCHANT_MAJOR_VERSION="$ENCHANT_MAJOR_VERSION"])

index.html

@@ -62,12 +62,10 @@ <h2>User configuration</h2>
 
 <h2>Command-line programs</h2>
 
-Enchant comes with a couple of command-line utilities:
+Enchant comes with a command-line utility:
 
 <dl>
-  <dt><a href="src/enchant-lsmod-2.html">enchant-lsmod(1)</a></dt><dd>Gives
-  information about the available dictionaries.</dd>
-  <dt><a href="src/enchant-2.html">enchant(1)</a></dt><dd>Check the spelling of some text. This program is compatible with the ispell utility, but is for non-interactive use only.</dd>
+  <dt><a href="src/enchant-2.html">enchant(1)</a></dt><dd>Gives information about the available dictionaries and spelling checkers, and does basic batch spell-checking.</dd>
 </dl>
 
 <h2>Programs using Enchant</h2>

lib/enchant.5.in.in

@@ -28,7 +28,7 @@ The per-user file takes precedence.
 .PP
 The ordering file takes the form \fIlanguage_tag:<comma-separated list of spelling
 providers>\fR.
-To see what dictionaries are available, run \fIenchant-lsmod-@ENCHANT_MAJOR_VERSION@\fR. \(oq*\(cq is
+To see what dictionaries are available, run \fIenchant-@ENCHANT_MAJOR_VERSION@ --list-dicts\fR. \(oq*\(cq is
 used to mean \(lquse this ordering for all languages, unless instructed otherwise.\(rq For example:
 .IP
 *:aspell,hunspell,nuspell
@@ -121,7 +121,6 @@ In addition, Enchant looks in the following systems directories for ordering fil
 \fI@PKGDATADIR@-@ENCHANT_MAJOR_VERSION@\fR
 (Or the equivalent location relative to the enchant library for a relocatable build.)
 .SH "SEE ALSO"
-.BR enchant-@ENCHANT_MAJOR_VERSION@ (1),
-.BR enchant-lsmod-@ENCHANT_MAJOR_VERSION@ (1)
+.BR enchant-@ENCHANT_MAJOR_VERSION@ (1)
 .SH "AUTHOR"
 Written by Dom Lachowicz and Reuben Thomas.

src/.gitignore

@@ -4,15 +4,5 @@
 /enchant-[1-9].html
 /enchant-[1-9].exe
 /enchant_*_vala.stamp
-/enchant-lsmod-[1-9]
-/enchant-lsmod-[1-9].html
-/enchant-lsmod-[1-9].exe
-/enchant-lsmod.1
-/enchant-lsmod-[1-9].1
 /enchant.c
-/enchant-lsmod.c
-/util.[ch]
-/util.vapi
-/libutil_la_vala.stamp
-/libutil_la_vala.stamp-t
 /dummy.vala

src/Makefile.am

@@ -16,17 +16,13 @@ AM_CPPFLAGS = --include config.h -I$(top_srcdir) $(ISYSTEM)$(top_builddir)/libgn
 
 VAPIS = config.vapi enchant-2.vapi
 
-dummy.vala: $(BUILT_VAPIS) $(VAPIS)
+dummy.vala: $(VAPIS)
 	touch $@
 
-BUILT_SOURCES = dummy.vala $(BUILT_VAPIS) util.h
+BUILT_SOURCES = dummy.vala
 
-BUILT_VAPIS = util.vapi
-
-util.h util.vapi: libutil.la
-
-dist_man_MANS = enchant-@[email protected] enchant-lsmod-@[email protected]
-nodist_doc_DATA = enchant-@[email protected] enchant-lsmod-@[email protected]
+dist_man_MANS = enchant-@[email protected]
+nodist_doc_DATA = enchant-@[email protected]
 
 DISTCLEANFILES = $(dist_man_MANS) $(nodist_doc_DATA) dummy.vala
 
@@ -36,22 +32,11 @@ DISTCLEANFILES = $(dist_man_MANS) $(nodist_doc_DATA) dummy.vala
 enchant-@[email protected]: $(builddir)/enchant.1 Makefile.am $(top_builddir)/config.status
 	cp $(abs_builddir)/enchant.1 $@
 
-enchant-lsmod-@[email protected]: $(builddir)/enchant-lsmod.1 Makefile.am $(top_builddir)/config.status
-	cp $(abs_builddir)/enchant-lsmod.1 $@
-
-noinst_LTLIBRARIES = libutil.la
-libutil_la_SOURCES = util.vala
-libutil_la_VALAFLAGS = $(AM_VALAFLAGS) --vapi=util.vapi --header=util.h
-libutil_la_LIBADD = $(GLIB_LIBS)
-
-LDADD = $(top_builddir)/lib/libenchant-@[email protected] $(GLIB_LIBS) $(top_builddir)/libgnu/libgnu.la libutil.la
-bin_PROGRAMS = enchant-@ENCHANT_MAJOR_VERSION@ enchant-lsmod-@ENCHANT_MAJOR_VERSION@
+LDADD = $(top_builddir)/lib/libenchant-@[email protected] $(GLIB_LIBS) $(top_builddir)/libgnu/libgnu.la
+bin_PROGRAMS = enchant-@ENCHANT_MAJOR_VERSION@
 enchant_@ENCHANT_MAJOR_VERSION@_SOURCES = enchant.vala
-enchant_@ENCHANT_MAJOR_VERSION@_VALAFLAGS = $(AM_VALAFLAGS) --pkg util
-enchant_lsmod_@ENCHANT_MAJOR_VERSION@_SOURCES = enchant-lsmod.vala
-enchant_lsmod_@ENCHANT_MAJOR_VERSION@_VALAFLAGS = $(AM_VALAFLAGS) --pkg util
 
-EXTRA_DIST = enchant.1.in enchant-lsmod.1.in util.h $(VAPIS)
+EXTRA_DIST = enchant.1.in $(VAPIS)
 
 loc:
 	$(CLOC) $(ALL_SOURCE_FILES)