reorganizing to prepare for transition to openpgp2ssh.

6 files changed, 10 insertions, 9 deletions

diff --git a/src/gpg2ssh/Makefile b/src/keytrans/Makefile
index 65a5f0f..fdd4ccd 100644
--- 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
index 6eae29e..6eae29e 100644
--- a/src/gpg2ssh/gnutls-helpers.c
+++ b/src/keytrans/gnutls-helpers.c
diff --git a/src/gpg2ssh/gnutls-helpers.h b/src/keytrans/gnutls-helpers.h
index 9ea22a3..9ea22a3 100644
--- a/src/gpg2ssh/gnutls-helpers.h
+++ b/src/keytrans/gnutls-helpers.h
diff --git a/src/gpg2ssh/gpg2ssh.c b/src/keytrans/gpg2ssh.c
index c99f03f..c99f03f 100644
--- a/src/gpg2ssh/gpg2ssh.c
+++ b/src/keytrans/gpg2ssh.c
diff --git a/src/gpg2ssh/main.c b/src/keytrans/openpgp2ssh.c
index d6bac68..d6bac68 100644
--- a/src/gpg2ssh/main.c
+++ b/src/keytrans/openpgp2ssh.c
diff --git a/src/gpg2ssh/ssh2gpg.c b/src/keytrans/ssh2gpg.c
index b14a540..b14a540 100644
--- a/src/gpg2ssh/ssh2gpg.c
+++ b/src/keytrans/ssh2gpg.c