config: Include some extra files in the tarball

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

diff --git a/Makefile.am b/Makefile.am
index 8d3dff86cefb55399fc7dc904c420c280b2d5389..98d773084f02c50e9256bbc3128afdb80cefcb1f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,10 @@ sample_DATA = \
 
 EXTRA_README = \
     Changes-2.3 \
 
 EXTRA_README = \
     Changes-2.3 \

+    Changes-2.4 \

     FAQ \
     FAQ \

+    LICENSE.BSD \
+    LICENSE.GPL-2 \

     README \
     README.cbcp \
     README.eap-srp \
     README \
     README.cbcp \
     README.eap-srp \


@@ -38,9 +41,12 @@ EXTRA_README = \
     README.pwfd \
     README.sol2 \
     PLUGINS \
     README.pwfd \
     README.sol2 \
     PLUGINS \

+    SECURITY.md \

     SETUP \
     SETUP \

-    Submitting-patches.md
+    Submitting-patches.md \
+    autogen.sh

 
 EXTRA_DIST= \
     $(sample_DATA) \
 
 EXTRA_DIST= \
     $(sample_DATA) \

-    $(EXTRA_README)
+    $(EXTRA_README) \
+    sample

diff --git a/pppd/Makefile.am b/pppd/Makefile.am
index f2fb19211e53ed4689d128bc7e1ed54bd79abd93..93dbeedb3c282a8e3e4b9a59ee0019da7fa5bf51 100644 (file)
--- a/pppd/Makefile.am
+++ b/pppd/Makefile.am
@@ -28,7 +28,6 @@ check_PROGRAMS += utest_utils
 
 if WITH_SRP
 sbin_PROGRAMS += srp-entry
 
 if WITH_SRP
 sbin_PROGRAMS += srp-entry

-dist_man8_MANS += srp-entry.8

 endif
 
 pkgconfigdir   = $(libdir)/pkgconfig
 endif
 
 pkgconfigdir   = $(libdir)/pkgconfig


@@ -205,6 +204,7 @@ srp_entry_SOURCES = srp-entry.c
 srp_entry_CPPFLAGS = $(OPENSSL_INCLUDES) $(SRP_CFLAGS)
 srp_entry_LDADD = $(SRP_LIBS) $(OPENSSL_LIBS)
 srp_entry_LDFLAGS = $(OPENSSL_LDFLAGS) $(SRP_LDFLAGS)
 srp_entry_CPPFLAGS = $(OPENSSL_INCLUDES) $(SRP_CFLAGS)
 srp_entry_LDADD = $(SRP_LIBS) $(OPENSSL_LIBS)
 srp_entry_LDFLAGS = $(OPENSSL_LDFLAGS) $(SRP_LDFLAGS)

+dist_srp_entry_MANS = srp-entry.8

 
 pppd_CPPFLAGS += $(SRP_CFLAGS)
 pppd_LDFLAGS += $(SRP_LDFLAGS)
 
 pppd_CPPFLAGS += $(SRP_CFLAGS)
 pppd_LDFLAGS += $(SRP_LDFLAGS)


@@ -214,7 +214,8 @@ endif
 pppd_LDADD = $(pppd_LIBS)
 
 EXTRA_DIST = \
 pppd_LDADD = $(pppd_LIBS)
 
 EXTRA_DIST = \

-    ppp.pam
+    ppp.pam \
+    srp-entry.8

 
 TESTS = $(check_PROGRAMS)
 
 
 TESTS = $(check_PROGRAMS)
 

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index d2779cb6cdd2ebb8c3a5b8cc6523a8b05a355521..65b15f9e345126e9b687ee5fb2a6b271d1450b04 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -5,7 +5,9 @@ EXTRA_SCRIPTS = \
     plog \
     poff \
     pon \
     plog \
     poff \
     pon \

-    pon.1
+    pon.1 \
+    lcp_rtt_dump \
+    lcp_rtt_exporter

 
 EXTRA_DIST= \
     $(EXTRA_SCRIPTS)
 
 EXTRA_DIST= \
     $(EXTRA_SCRIPTS)