chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/tun-*.c: Factor out the (very similar) TUN-like drivers.
[tripe]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 8926279034a1a5ec9cb35d7c13bd36fc6db15faa..dbfa5121d93191feadc7d4b2f66128e07c1fc6a4 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-34,21
+34,27
@@
SUBDIRS =
SUBDIRS += common
SUBDIRS += uslip
SUBDIRS += client
SUBDIRS += common
SUBDIRS += uslip
SUBDIRS += client
+SUBDIRS += priv
SUBDIRS += server
SUBDIRS += proxy
SUBDIRS += pkstream
SUBDIRS += init
## Path MTU discovery.
SUBDIRS += server
SUBDIRS += proxy
SUBDIRS += pkstream
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
+SUBDIRS += svc
+SUBDIRS += py
+SUBDIRS += peerdb
+endif
+
## Key-management.
if HAVE_PYCATACOMB
SUBDIRS += keys
## Key-management.
if HAVE_PYCATACOMB
SUBDIRS += keys
@@
-59,6
+65,9
@@
if HAVE_PYGTK
SUBDIRS += mon
endif
SUBDIRS += mon
endif
+## Contributed stuff.
+SUBDIRS += contrib
+
## Testing.
SUBDIRS += t
## Testing.
SUBDIRS += t
@@
-71,14
+80,14
@@
EXTRA_DIST += tripe.pc.in
CLEANFILES += tripe.pc
tripe.pc: tripe.pc.in Makefile
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 $@
###--------------------------------------------------------------------------
### Release tweaking.
## Distcheck tweaks.
mv $@.new $@
###--------------------------------------------------------------------------
### Release tweaking.
## 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)' \
@@
-88,10
+97,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
@@
-104,6
+109,7
@@
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
## pkstream
EXTRA_DIST += debian/pkstream.copyright
## pkstream
EXTRA_DIST += debian/pkstream.copyright
@@
-126,6
+132,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