configure.ac, debian/: Overhaul Wireshark plugin build machinery.

[tripe] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dbfa5121d93191feadc7d4b2f66128e07c1fc6a4..3c2c7f6f354a0bc222e74012219acc4cf4da9a1a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,20 +50,30 @@ endif
 
 ## Services.
 if HAVE_PYTHON
 
 ## Services.
 if HAVE_PYTHON

-SUBDIRS                        += svc
+if HAVE_PYMLIB

 SUBDIRS                        += py
 SUBDIRS                        += py

+if HAVE_PYCDB

 SUBDIRS                        += peerdb
 SUBDIRS                        += peerdb

+SUBDIRS                        += svc
+endif
+endif

 endif
 
 ## Key-management.
 endif
 
 ## Key-management.

+if HAVE_PYTHON

 if HAVE_PYCATACOMB
 SUBDIRS                        += keys
 endif
 if HAVE_PYCATACOMB
 SUBDIRS                        += keys
 endif

+endif

 
 ## Graphical monitor.
 
 ## Graphical monitor.

+if HAVE_PYTHON
+if HAVE_PYMLIB

 if HAVE_PYGTK
 SUBDIRS                        += mon
 endif
 if HAVE_PYGTK
 SUBDIRS                        += mon
 endif

+endif
+endif

 
 ## Contributed stuff.
 SUBDIRS                        += contrib
 
 ## Contributed stuff.
 SUBDIRS                        += contrib


@@ -110,6 +120,7 @@ EXTRA_DIST          += debian/control
 EXTRA_DIST             += debian/changelog
 EXTRA_DIST             += debian/copyright
 EXTRA_DIST             += debian/compat
 EXTRA_DIST             += debian/changelog
 EXTRA_DIST             += debian/copyright
 EXTRA_DIST             += debian/compat

+EXTRA_DIST             += debian/source/format

 
 ## pkstream
 EXTRA_DIST             += debian/pkstream.copyright
 
 ## pkstream
 EXTRA_DIST             += debian/pkstream.copyright