removed test_gnu_dummy_s2k_extension(); no longer necessary

[monkeysphere.git] / src / keytrans / Makefile

diff --git a/src/keytrans/Makefile b/src/keytrans/Makefile
index fdd4ccda27b0262f68913f0d175b5ee186c5442e..4d54be743f88c31be6fab35fb456be2ab700872b 100644 (file)
--- a/src/keytrans/Makefile
+++ b/src/keytrans/Makefile
@@ -1,19 +1,15 @@
+CFLAGS=`libgnutls-config --libs --cflags` -g -Wall --pedantic
+CC=gcc
+
 all: openpgp2ssh
 
 openpgp2ssh: openpgp2ssh.c gnutls-helpers.o
-       gcc -g -Wall --pedantic -o openpgp2ssh openpgp2ssh.c `libgnutls-config --libs --cflags` -lgnutls-extra gnutls-helpers.o
+       $(CC) $(CFLAGS) -o openpgp2ssh openpgp2ssh.c gnutls-helpers.o
 
-%.o: %.c
-       gcc -g -Wall --pedantic -o $@ -c $<
+.c.o: 
+       $(CC) $(CFLAGS) -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
+       rm -f openpgp2ssh *.o
 
 .PHONY: clean all