Merge branch 'master' into 1.1

[tinc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3a8e51f..e37864d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,11 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 lib src doc
+SUBDIRS =  m4 src doc gui
 
 ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = config.rpath mkinstalldirs have.h system.h COPYING.README depcomp
+EXTRA_DIST = have.h system.h COPYING.README
 
 ChangeLog:
        git log > ChangeLog