chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure.ac: Abolish use of `libtool'.
[tripe]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index ce25e3704a9b3158aec6c51c6c44ba647b710549..046247a7e1a5dee823d1c579affe28b4fc9a91c2 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-41,45
+41,63
@@
SUBDIRS += pkstream
SUBDIRS += init
## Path MTU discovery.
SUBDIRS += init
## Path MTU discovery.
-if PATHMTU
SUBDIRS += pathmtu
SUBDIRS += pathmtu
-endif
## Wireshark.
if HAVE_WIRESHARK
SUBDIRS += wireshark
endif
## Wireshark.
if HAVE_WIRESHARK
SUBDIRS += wireshark
endif
+## Services.
+if HAVE_PYTHON
+if HAVE_PYMLIB
+SUBDIRS += py
+if HAVE_PYCDB
+SUBDIRS += peerdb
+SUBDIRS += svc
+endif
+endif
+endif
+
## Key-management.
## 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
## Testing.
SUBDIRS += t
###--------------------------------------------------------------------------
## Testing.
SUBDIRS += t
###--------------------------------------------------------------------------
-###
The pkg-config
file.
+###
Package-configuration
file.
-pkgconfigdir = $(
lib
dir)/pkgconfig
+pkgconfigdir = $(
data
dir)/pkgconfig
pkgconfig_DATA = tripe.pc
EXTRA_DIST += tripe.pc.in
CLEANFILES += tripe.pc
tripe.pc: tripe.pc.in Makefile
pkgconfig_DATA = tripe.pc
EXTRA_DIST += tripe.pc.in
CLEANFILES += tripe.pc
tripe.pc: tripe.pc.in Makefile
- $(
confsubst
) $(srcdir)/tripe.pc.in >$@.new $(SUBSTITUTIONS) && \
+ $(
SUBST
) $(srcdir)/tripe.pc.in >$@.new $(SUBSTITUTIONS) && \
mv $@.new $@
###--------------------------------------------------------------------------
mv $@.new $@
###--------------------------------------------------------------------------
-###
Release tweaking
.
+###
Distribution
.
## Distcheck tweaks.
## Distcheck tweaks.
-DISTCHECK_TUNNELS =
linux bsd unet
slip
+DISTCHECK_TUNNELS = slip
DISTCHECK_CONFIGURE_FLAGS = \
--with-tunnel='$(DISTCHECK_TUNNELS)' \
DISTCHECK_CONFIGURE_FLAGS = \
--with-tunnel='$(DISTCHECK_TUNNELS)' \
@@
-89,10
+107,6
@@
DISTCHECK_CONFIGURE_FLAGS = \
dist-hook::
echo $(VERSION) >$(distdir)/RELEASE
dist-hook::
echo $(VERSION) >$(distdir)/RELEASE
-## Manual page preamble.
-EXTRA_DIST += defs.man.in
-CLEANFILES += defs.man
-
## Additional build tools.
EXTRA_DIST += config/confsubst
EXTRA_DIST += config/auto-version
## Additional build tools.
EXTRA_DIST += config/confsubst
EXTRA_DIST += config/auto-version
@@
-105,6
+119,8
@@
EXTRA_DIST += debian/rules
EXTRA_DIST += debian/control
EXTRA_DIST += debian/changelog
EXTRA_DIST += debian/copyright
EXTRA_DIST += debian/control
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
@@
-127,6
+143,13
@@
EXTRA_DIST += debian/tripe-uslip.install
## keys
EXTRA_DIST += debian/tripe-keys.install
## keys
EXTRA_DIST += debian/tripe-keys.install
+## modules
+EXTRA_DIST += debian/python-tripe.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