reorganizing to prepare for transition to openpgp2ssh.

diff --git a/src/gpg2ssh/Makefile b/src/keytrans/Makefile
similarity index 61%
rename from src/gpg2ssh/Makefile
rename to src/keytrans/Makefile
index 65a5f0f7623ceb47e6861882d6b917854588d50c..fdd4ccda27b0262f68913f0d175b5ee186c5442e 100644 (file)
--- a/src/gpg2ssh/Makefile
+++ b/src/keytrans/Makefile
@@ -1,18 +1,19 @@
-all: monkeysphere gpg2ssh ssh2gpg
+all: openpgp2ssh
 
-monkeysphere: main.c gnutls-helpers.o
-       gcc -g -Wall --pedantic -o monkeysphere main.c `libgnutls-config --libs --cflags` -lgnutls-extra gnutls-helpers.o
+openpgp2ssh: openpgp2ssh.c gnutls-helpers.o
+       gcc -g -Wall --pedantic -o openpgp2ssh openpgp2ssh.c `libgnutls-config --libs --cflags` -lgnutls-extra gnutls-helpers.o
 
+%.o: %.c
+       gcc -g -Wall --pedantic -o $@ -c $<
+
+clean: 
+       rm -f openpgp2ssh gpg2ssh ssh2gpg *.o
+
+# deprecated:
 gpg2ssh: gpg2ssh.c gnutls-helpers.o
        gcc -g -Wall --pedantic -o gpg2ssh gpg2ssh.c `libgnutls-config --libs --cflags` -lgnutls-extra gnutls-helpers.o
 
 ssh2gpg: ssh2gpg.c gnutls-helpers.o
        gcc -g -Wall --pedantic -o ssh2gpg ssh2gpg.c `libgnutls-config --libs --cflags` -lgnutls-extra gnutls-helpers.o
 
-%.o: %.c
-       gcc -g -Wall --pedantic -o $@ -c $<
-
-clean: 
-       rm -f monkeysphere gpg2ssh ssh2gpg *.o
-
 .PHONY: clean all

diff --git a/src/gpg2ssh/gnutls-helpers.c b/src/keytrans/gnutls-helpers.c
similarity index 100%
rename from src/gpg2ssh/gnutls-helpers.c
rename to src/keytrans/gnutls-helpers.c

diff --git a/src/gpg2ssh/gnutls-helpers.h b/src/keytrans/gnutls-helpers.h
similarity index 100%
rename from src/gpg2ssh/gnutls-helpers.h
rename to src/keytrans/gnutls-helpers.h

diff --git a/src/gpg2ssh/gpg2ssh.c b/src/keytrans/gpg2ssh.c
similarity index 100%
rename from src/gpg2ssh/gpg2ssh.c
rename to src/keytrans/gpg2ssh.c

diff --git a/src/gpg2ssh/main.c b/src/keytrans/openpgp2ssh.c
similarity index 100%
rename from src/gpg2ssh/main.c
rename to src/keytrans/openpgp2ssh.c

diff --git a/src/gpg2ssh/ssh2gpg.c b/src/keytrans/ssh2gpg.c
similarity index 100%
rename from src/gpg2ssh/ssh2gpg.c
rename to src/keytrans/ssh2gpg.c