Add Makefile.am in gui/.

This ensures the gui source will be included in the tarball with make dist,
and will be installed with make install.

diff --git a/Makefile.am b/Makefile.am
index d2f9c3b3d77fed4fff7197a907fc588506cd58bc..e37864d05f092cce1d5ad72760be88baa82adbc0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,11 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 src doc
+SUBDIRS =  m4 src doc gui
 
 ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = have.h system.h COPYING.README gui
+EXTRA_DIST = have.h system.h COPYING.README
 
 ChangeLog:
        git log > ChangeLog

diff --git a/configure.in b/configure.in
index 22e5fb1f914fb04eb4866acaf475736e323b0e8e..edd3bec63fe93c8ef61d193c29051ab5300f6dbe 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -20,6 +20,7 @@ AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_RANLIB
+AM_PATH_PYTHON
 
 dnl Check and set OS
 
@@ -172,6 +173,6 @@ AC_ARG_ENABLE(jumbograms,
 
 AC_SUBST(INCLUDES)
 
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile m4/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile m4/Makefile gui/Makefile])
 
 AC_OUTPUT

diff --git a/gui/Makefile.am b/gui/Makefile.am
new file mode 100644 (file)
index 0000000..e538e8f
--- /dev/null
+++ b/gui/Makefile.am
@@ -0,0 +1,7 @@
+dist_bin_SCRIPTS = tinc-gui
+
+tinc_gui_PYTHON = Tinc.py
+
+tinc_guidir = $(prefix)/bin
+
+extra_DIST = README.gui