From ccf0dae1391fb8850f1ad89333cf8235a3010648 Mon Sep 17 00:00:00 2001 From: Tom Goff Date: Mon, 28 Dec 2015 14:56:00 -0500 Subject: [PATCH] automake: Add some missing distribution files. --- Makefile.am | 2 +- daemon/Makefile.am | 1 + doc/figures/Makefile.am | 13 ++++++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index b0374b77..316d9855 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ ACLOCAL_AMFLAGS = -I config # extra files to include with distribution tarball EXTRA_DIST = bootstrap.sh LICENSE README-Xen Changelog kernel \ - python-prefix.py \ + python-prefix.py revision.sh \ packaging/bsd \ packaging/deb/compat \ packaging/deb/copyright \ diff --git a/daemon/Makefile.am b/daemon/Makefile.am index b29d8432..731e3e90 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -50,6 +50,7 @@ dist_coreexmyservices_DATA = $(EXAMPLE_MYSERVICES_FILES) EXAMPLE_NETNS_FILES = \ examples/netns/basicrange.py \ + examples/netns/daemonnodes.py \ examples/netns/distributed.py \ examples/netns/emane80211.py \ examples/netns/howmanynodes.py \ diff --git a/doc/figures/Makefile.am b/doc/figures/Makefile.am index 97fe6974..087dcd37 100644 --- a/doc/figures/Makefile.am +++ b/doc/figures/Makefile.am @@ -34,6 +34,13 @@ figures_dia = $(figures:%=%.dia) # list of figure + jpg suffix figures_jpg = $(figures:%=%.jpg) +figures_png = \ + controlnetwork.png \ + distributed-controlnetwork.png \ + distributed-emane-configuration.png \ + distributed-emane-network.png \ + single-pc-emane.png + # icons from the GUI source icons = select start router host pc mdr router_green \ lanswitch hub wlan cel \ @@ -42,13 +49,13 @@ icons = select start router host pc mdr router_green \ # list of icons + .gif.jpg suffix icons_jpg = $(icons:%=%.jpg) -BUILT_SOURCES = $(figures_dia) $(figures_jpg) $(icons_jpg) +all-local: $(icons_jpg) clean-local: rm -f $(icons_jpg) -EXTRA_DIST = $(figures_dia) $(figures_jpg) +EXTRA_DIST = $(figures_dia) $(figures_jpg) $(figures_png) # extra cruft to remove -DISTCLEANFILES = Makefile.in $(icons_jpg) +DISTCLEANFILES = Makefile.in