From 00719770b7608af0c37dfd6c14a04eb7ebc4cad0 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 12 Jun 2008 13:31:13 -0400
Subject: [PATCH] reorganizing to prepare for transition to openpgp2ssh.

---
 src/{gpg2ssh => keytrans}/Makefile            | 19 ++++++++++---------
 src/{gpg2ssh => keytrans}/gnutls-helpers.c    |  0
 src/{gpg2ssh => keytrans}/gnutls-helpers.h    |  0
 src/{gpg2ssh => keytrans}/gpg2ssh.c           |  0
 .../main.c => keytrans/openpgp2ssh.c}         |  0
 src/{gpg2ssh => keytrans}/ssh2gpg.c           |  0
 6 files changed, 10 insertions(+), 9 deletions(-)
 rename src/{gpg2ssh => keytrans}/Makefile (61%)
 rename src/{gpg2ssh => keytrans}/gnutls-helpers.c (100%)
 rename src/{gpg2ssh => keytrans}/gnutls-helpers.h (100%)
 rename src/{gpg2ssh => keytrans}/gpg2ssh.c (100%)
 rename src/{gpg2ssh/main.c => keytrans/openpgp2ssh.c} (100%)
 rename src/{gpg2ssh => keytrans}/ssh2gpg.c (100%)

diff --git a/src/gpg2ssh/Makefile b/src/keytrans/Makefile
similarity index 61%
rename from src/gpg2ssh/Makefile
rename to 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
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
-- 
2.25.1