Merge commit 'jrollins/master'

[monkeysphere.git] / Makefile

diff --git a/Makefile b/Makefile
index 4fb4556c493bc7cadf3183566857fabf81f3f121..64e6cbe6775a35c63e4fa72d2b3a581d4a54c36d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,12 @@
-monkeysphere: main.c gnutls-helpers.o
-       gcc -g -Wall --pedantic -o monkeysphere main.c `libgnutls-config --libs --cflags` -lgnutls-extra gnutls-helpers.o
+all: keytrans
 
-gpg2ssh: gpg2ssh.c gnutls-helpers.o
-       gcc -g -Wall --pedantic -o gpg2ssh gpg2ssh.c `libgnutls-config --libs --cflags` -lgnutls-extra gnutls-helpers.o
+keytrans:
+       $(MAKE) -C src/keytrans
 
-%.o: %.c
-       gcc -g -Wall --pedantic -o $@ -c $<
+release: clean
+       tar c COPYING doc etc Makefile man src | gzip -n > ../monkeysphere_`head -n1 debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'`.orig.tar.gz
 
-clean: 
-       rm -f monkeysphere *.o
+clean:
+       $(MAKE) -C src/keytrans clean
 
-.PHONY: clean
+.PHONY: all clean release