chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/tripe.h: Don't say `struct bulkcrypto' where we don't have to.
[tripe]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 21412150477ecf211c44b8a054e666fe26579f12..e00e796bf64314cc0f66f3550fccc3794487cae9 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-32,32
+32,57
@@
SUBDIRS =
## Core components.
SUBDIRS += common
## Core components.
SUBDIRS += common
+SUBDIRS += uslip
SUBDIRS += client
SUBDIRS += client
+SUBDIRS += priv
SUBDIRS += server
SUBDIRS += proxy
SUBDIRS += pkstream
SUBDIRS += init
SUBDIRS += server
SUBDIRS += proxy
SUBDIRS += pkstream
SUBDIRS += init
+## Path MTU discovery.
+SUBDIRS += pathmtu
+
## 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 = $(libdir)/pkgconfig
pkgconfig_DATA = tripe.pc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = tripe.pc
@@
-65,14
+90,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 $@
###--------------------------------------------------------------------------
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)' \
@@
-82,12
+107,9
@@
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
## Additional build tools.
EXTRA_DIST += config/confsubst
+EXTRA_DIST += config/auto-version
###--------------------------------------------------------------------------
### Debian.
###--------------------------------------------------------------------------
### Debian.
@@
-97,11
+119,17
@@
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
EXTRA_DIST += debian/pkstream.install
## pkstream
EXTRA_DIST += debian/pkstream.copyright
EXTRA_DIST += debian/pkstream.install
+## pathmtu
+EXTRA_DIST += debian/pathmtu.copyright
+EXTRA_DIST += debian/pathmtu.install
+
## server and client
EXTRA_DIST += debian/tripe.README
EXTRA_DIST += debian/tripe.dirs
## server and client
EXTRA_DIST += debian/tripe.README
EXTRA_DIST += debian/tripe.dirs
@@
-109,14
+137,23
@@
EXTRA_DIST += debian/tripe.install
EXTRA_DIST += debian/tripe.postinst
EXTRA_DIST += debian/tripe.logrotate
EXTRA_DIST += debian/tripe.postinst
EXTRA_DIST += debian/tripe.logrotate
+## uslip
+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
## wireshark
EXTRA_DIST += debian/tripe-wireshark.install
## monitor
EXTRA_DIST += debian/tripemon.install
## wireshark
EXTRA_DIST += debian/tripe-wireshark.install
-
###----- That's all, folks --------------------------------------------------
###----- That's all, folks --------------------------------------------------