chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefile.am: Some reformatting.
[tripe]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index d86ec32184efb6682efab0c691b3c098a64e42a0..e00e796bf64314cc0f66f3550fccc3794487cae9 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
@@
-72,7
+82,7
@@
SUBDIRS += contrib
SUBDIRS += t
###--------------------------------------------------------------------------
SUBDIRS += t
###--------------------------------------------------------------------------
-###
The pkg-config
file.
+###
Package-configuration
file.
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = tripe.pc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = tripe.pc
@@
-84,7
+94,7
@@
tripe.pc: tripe.pc.in Makefile
mv $@.new $@
###--------------------------------------------------------------------------
mv $@.new $@
###--------------------------------------------------------------------------
-###
Release tweaking
.
+###
Distribution
.
## Distcheck tweaks.
DISTCHECK_TUNNELS = slip
## Distcheck tweaks.
DISTCHECK_TUNNELS = slip
@@
-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
@@
-137,6
+148,7
@@
EXTRA_DIST += debian/python-tripe.install
## peer services
EXTRA_DIST += debian/tripe-peer-services.install
## peer services
EXTRA_DIST += debian/tripe-peer-services.install
+EXTRA_DIST += debian/tripe-peer-services.postinst
## monitor
EXTRA_DIST += debian/tripemon.install
## monitor
EXTRA_DIST += debian/tripemon.install