move src/subcommands to srv/share, and add common file to src/share (update Makefile...

diff --git a/Makefile b/Makefile
index 6acb3f43d46b66c32e1200c1986a0c6de85b1370..0ec2030f9e1c5eca4c8aedcb2450da230eacd086 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -53,10 +53,10 @@ install: all installman
        mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
        install src/monkeysphere src/keytrans/openpgp2ssh src/keytrans/pem2openpgp $(DESTDIR)$(PREFIX)/bin
        install src/monkeysphere-host src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
-       install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere
-       install -m 0644 src/subcommands/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m
-       install -m 0644 src/subcommands/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh
-       install -m 0644 src/subcommands/ma/* $(DESTDIR)$(PREFIX)/share/monkeysphere/ma
+       install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
+       install -m 0644 src/share/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m
+       install -m 0644 src/share/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh
+       install -m 0644 src/share/ma/* $(DESTDIR)$(PREFIX)/share/monkeysphere/ma
        install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
        install -m 0644 etc/monkeysphere.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere.conf$(ETCSUFFIX)
        install -m 0644 etc/monkeysphere-host.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-host.conf$(ETCSUFFIX)

diff --git a/src/common b/src/share/common
similarity index 100%
rename from src/common
rename to src/share/common

diff --git a/src/subcommands/m/gen_subkey b/src/share/m/gen_subkey
similarity index 100%
rename from src/subcommands/m/gen_subkey
rename to src/share/m/gen_subkey

diff --git a/src/subcommands/m/import_subkey b/src/share/m/import_subkey
similarity index 100%
rename from src/subcommands/m/import_subkey
rename to src/share/m/import_subkey

diff --git a/src/subcommands/m/ssh_proxycommand b/src/share/m/ssh_proxycommand
similarity index 100%
rename from src/subcommands/m/ssh_proxycommand
rename to src/share/m/ssh_proxycommand

diff --git a/src/subcommands/m/subkey_to_ssh_agent b/src/share/m/subkey_to_ssh_agent
similarity index 100%
rename from src/subcommands/m/subkey_to_ssh_agent
rename to src/share/m/subkey_to_ssh_agent

diff --git a/src/subcommands/ma/add_certifier b/src/share/ma/add_certifier
similarity index 100%
rename from src/subcommands/ma/add_certifier
rename to src/share/ma/add_certifier

diff --git a/src/subcommands/ma/diagnostics b/src/share/ma/diagnostics
similarity index 100%
rename from src/subcommands/ma/diagnostics
rename to src/share/ma/diagnostics

diff --git a/src/subcommands/ma/list_certifiers b/src/share/ma/list_certifiers
similarity index 100%
rename from src/subcommands/ma/list_certifiers
rename to src/share/ma/list_certifiers

diff --git a/src/subcommands/ma/remove_certifier b/src/share/ma/remove_certifier
similarity index 100%
rename from src/subcommands/ma/remove_certifier
rename to src/share/ma/remove_certifier

diff --git a/src/subcommands/ma/update_users b/src/share/ma/update_users
similarity index 100%
rename from src/subcommands/ma/update_users
rename to src/share/ma/update_users

diff --git a/src/subcommands/mh/add_hostname b/src/share/mh/add_hostname
similarity index 100%
rename from src/subcommands/mh/add_hostname
rename to src/share/mh/add_hostname

diff --git a/src/subcommands/mh/add_revoker b/src/share/mh/add_revoker
similarity index 100%
rename from src/subcommands/mh/add_revoker
rename to src/share/mh/add_revoker

diff --git a/src/subcommands/mh/diagnostics b/src/share/mh/diagnostics
similarity index 100%
rename from src/subcommands/mh/diagnostics
rename to src/share/mh/diagnostics

diff --git a/src/subcommands/mh/extend_key b/src/share/mh/extend_key
similarity index 100%
rename from src/subcommands/mh/extend_key
rename to src/share/mh/extend_key

diff --git a/src/subcommands/mh/gen_key b/src/share/mh/gen_key
similarity index 100%
rename from src/subcommands/mh/gen_key
rename to src/share/mh/gen_key

diff --git a/src/subcommands/mh/import_key b/src/share/mh/import_key
similarity index 100%
rename from src/subcommands/mh/import_key
rename to src/share/mh/import_key

diff --git a/src/subcommands/mh/publish_key b/src/share/mh/publish_key
similarity index 100%
rename from src/subcommands/mh/publish_key
rename to src/share/mh/publish_key

diff --git a/src/subcommands/mh/revoke_hostname b/src/share/mh/revoke_hostname
similarity index 100%
rename from src/subcommands/mh/revoke_hostname
rename to src/share/mh/revoke_hostname

diff --git a/src/subcommands/mh/revoke_key b/src/share/mh/revoke_key
similarity index 100%
rename from src/subcommands/mh/revoke_key
rename to src/share/mh/revoke_key