Move programs in /config into appropriate subdirectories.

diff --git a/config/Makefile.am b/config/Makefile.am
index 705bf0a..2135891 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,36 +1,6 @@
-bin_PROGRAMS=locktouch tthsum
-if DOLCONF
-bin_PROGRAMS+=dolconf
-endif
-if BASECONV
-bin_PROGRAMS+=baseconv
-else
-noinst_PROGRAMS=baseconv
-endif
-libexec_PROGRAMS=speedrec
+SUBDIRS=cmd util
 
-speedrec_SOURCES=speedrec.c
-locktouch_SOURCES=locktouch.c
-tthsum_SOURCES=tthsum.c
-dolconf_SOURCES=dolconf.c
-baseconv_SOURCES=baseconv.c
-BUILT_SOURCES=dolconf-assistant.gtk dolconf-wnd.gtk
-
-AM_CPPFLAGS=-I$(top_srcdir)/include
-tthsum_LDADD=$(top_srcdir)/common/libcommon.a
-baseconv_LDADD=$(top_srcdir)/common/libcommon.a
-
-dolconf.c: dolconf-assistant.desc dolconf-wnd.desc
-localedir=$(datadir)/locale
-dolconf_LDFLAGS=       @GTK2_LDADD@
-dolconf_CPPFLAGS=      @GTK2_CFLAGS@ \
-                       -DLOCALEDIR=\"$(localedir)\"
-dolconf_LDADD=         $(top_srcdir)/common/libcommon.a $(top_srcdir)/lib/libdcui.la
-
-.desc.gtk: $(top_srcdir)/common/makegdesc
-       $(top_srcdir)/common/makegdesc $< >$@
-
-EXTRA_DIST=doldacond.conf dc-filter dc-filtercmd dolconf-assistant.desc dolconf-wnd.desc
+EXTRA_DIST=doldacond.conf dc-filter dc-filtercmd
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \

diff --git a/config/cmd/.gitignore b/config/cmd/.gitignore
new file mode 100644 (file)
index 0000000..b717d52
--- /dev/null
+++ b/config/cmd/.gitignore
@@ -0,0 +1,3 @@
+/locktouch
+/speedrec
+/tthsum

diff --git a/config/cmd/Makefile.am b/config/cmd/Makefile.am
new file mode 100644 (file)
index 0000000..8130e70
--- /dev/null
+++ b/config/cmd/Makefile.am
@@ -0,0 +1,9 @@
+bin_PROGRAMS=locktouch tthsum
+libexec_PROGRAMS=speedrec
+
+speedrec_SOURCES=speedrec.c
+locktouch_SOURCES=locktouch.c
+tthsum_SOURCES=tthsum.c
+
+AM_CPPFLAGS=-I$(top_srcdir)/include
+tthsum_LDADD=$(top_srcdir)/common/libcommon.a

diff --git a/config/locktouch.c b/config/cmd/locktouch.c
similarity index 100%
rename from config/locktouch.c
rename to config/cmd/locktouch.c

diff --git a/config/speedrec.c b/config/cmd/speedrec.c
similarity index 100%
rename from config/speedrec.c
rename to config/cmd/speedrec.c

diff --git a/config/tthsum.c b/config/cmd/tthsum.c
similarity index 100%
rename from config/tthsum.c
rename to config/cmd/tthsum.c

diff --git a/config/util/.gitignore b/config/util/.gitignore
new file mode 100644 (file)
index 0000000..719a410
--- /dev/null
+++ b/config/util/.gitignore
@@ -0,0 +1,2 @@
+/dolconf
+/baseconv

diff --git a/config/util/Makefile.am b/config/util/Makefile.am
new file mode 100644 (file)
index 0000000..d2830e5
--- /dev/null
+++ b/config/util/Makefile.am
@@ -0,0 +1,28 @@
+bin_PROGRAMS=
+if DOLCONF
+bin_PROGRAMS+=dolconf
+endif
+if BASECONV
+bin_PROGRAMS+=baseconv
+else
+noinst_PROGRAMS=baseconv
+endif
+
+dolconf_SOURCES=dolconf.c
+baseconv_SOURCES=baseconv.c
+BUILT_SOURCES=dolconf-assistant.gtk dolconf-wnd.gtk
+
+AM_CPPFLAGS=-I$(top_srcdir)/include
+baseconv_LDADD=$(top_srcdir)/common/libcommon.a
+
+dolconf.c: dolconf-assistant.desc dolconf-wnd.desc
+localedir=$(datadir)/locale
+dolconf_LDFLAGS=       @GTK2_LDADD@
+dolconf_CPPFLAGS=      @GTK2_CFLAGS@ \
+                       -DLOCALEDIR=\"$(localedir)\"
+dolconf_LDADD=         $(top_srcdir)/common/libcommon.a $(top_srcdir)/lib/libdcui.la
+
+.desc.gtk: $(top_srcdir)/common/makegdesc
+       $(top_srcdir)/common/makegdesc $< >$@
+
+EXTRA_DIST=dolconf-assistant.desc dolconf-wnd.desc

diff --git a/config/baseconv.c b/config/util/baseconv.c
similarity index 100%
rename from config/baseconv.c
rename to config/util/baseconv.c

diff --git a/config/dolconf-assistant.desc b/config/util/dolconf-assistant.desc
similarity index 100%
rename from config/dolconf-assistant.desc
rename to config/util/dolconf-assistant.desc

diff --git a/config/dolconf-wnd.desc b/config/util/dolconf-wnd.desc
similarity index 100%
rename from config/dolconf-wnd.desc
rename to config/util/dolconf-wnd.desc

diff --git a/config/dolconf.c b/config/util/dolconf.c
similarity index 100%
rename from config/dolconf.c
rename to config/util/dolconf.c

diff --git a/configure.in b/configure.in
index 1679a24..087f0cf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -267,6 +267,8 @@ doc/Makefile
 doc/man/Makefile
 po/Makefile.in
 config/Makefile
+config/cmd/Makefile
+config/util/Makefile
 contrib/Makefile
 autopackage/dolcon.apspec
 autopackage/dcuilib.apspec