EXTRA_DIST: Fix missing files with "make dist"

I recently noticed that the generated tarballs with "make dist"
were incomplete unless the configure script was run on a machine
with all possible build dependencies.

That's wrong as you clearly don't need those dependencies to generate
the tarball. This change fixes that.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

diff --git a/Makefile.am b/Makefile.am
index 7ebef9dcbb2ac8ddf8fad921e3d0eba219e252bd..eac2bfd32796c0993ab52388e6a821f7e0ec07ea 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,13 @@ ACLOCAL_AMFLAGS = -I config
 
 SUBDIRS = config src templates doc hooks
 DIST_SUBDIRS = config src templates doc hooks
-EXTRA_DIST = autogen.sh lxc.spec CONTRIBUTING MAINTAINERS ChangeLog
+EXTRA_DIST = \
+       autogen.sh \
+       lxc.spec \
+       CONTRIBUTING \
+       MAINTAINERS \
+       runapitests.sh
+
 RPMARGS =
 
 if ENABLE_LUA

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/doc/Makefile.am b/doc/Makefile.am
index df5ad73a5e5ed5548ceaa45a68d2df216419cb09..b5887123d9f6aa706eb38bf0d8e0455136a65bba 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,8 +2,7 @@ SUBDIRS = examples rootfs
 DIST_SUBDIRS = examples rootfs
 
 EXTRA_DIST = \
-       FAQ.txt \
-       $(man_MANS)
+       FAQ.txt
 
 if ENABLE_DOCBOOK
 man_MANS = \

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 4869c02c568b9916caa9dfe7d39943b6c1be9014..66658b4f7c654db53c6d1f1115a5d4707d7467c2 100644 (file)
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -1,5 +1,3 @@
-EXTRA_DIST = $(pkgexamples_DATA)
-
 if ENABLE_EXAMPLES
 pkgexamplesdir=$(docdir)/examples
 

diff --git a/src/lua-lxc/Makefile.am b/src/lua-lxc/Makefile.am
index f05eb72599e7ee7256b0fd3064557c07b1249d37..82dbae843b40ff7dc6b040dca2530ce379e174a8 100644 (file)
--- a/src/lua-lxc/Makefile.am
+++ b/src/lua-lxc/Makefile.am
@@ -4,7 +4,6 @@ luadir=$(datadir)/lua/5.1
 sodir=$(libdir)/lua/5.1/lxc
 
 lua_SCRIPTS=lxc.lua
-EXTRA_DIST=lxc.lua
 
 so_PROGRAMS = core.so
 
@@ -24,3 +23,7 @@ core_so_LDADD = -llxc $(LUA_LIBS)
 lxc.lua:
 
 endif
+
+EXTRA_DIST= \
+       lxc.lua \
+       test/apitest.lua

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 0385e0d196042b7efceaf0a3107f24015f90e653..ebeca46633d04d0e80b52b2b1ed60b43a80462bc 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -126,9 +126,12 @@ bin_SCRIPTS = \
        lxc-shutdown \
        lxc-destroy
 
-EXTRA_DIST=
+EXTRA_DIST = \
+       lxc-device \
+       lxc-ls \
+       lxc-top
+
 if ENABLE_PYTHON
-    EXTRA_DIST += lxc-device lxc-ls
     bin_SCRIPTS += lxc-device
     bin_SCRIPTS += lxc-ls
     bin_SCRIPTS += lxc-start-ephemeral
@@ -137,7 +140,6 @@ else
 endif
 
 if ENABLE_LUA
-    EXTRA_DIST += lxc-top
     bin_SCRIPTS += lxc-top
 endif
 

diff --git a/src/python-lxc/Makefile.am b/src/python-lxc/Makefile.am
index 52ede07012dea721397ab539266d35560024244a..bdb6dbdd7d441c0944fb716d0ad6822d78953792 100644 (file)
--- a/src/python-lxc/Makefile.am
+++ b/src/python-lxc/Makefile.am
@@ -1,7 +1,5 @@
 if ENABLE_PYTHON
 
-EXTRA_DIST = setup.py lxc.c
-
 if HAVE_DEBIAN
     DISTSETUPOPTS=--install-layout=deb
 else
@@ -22,3 +20,8 @@ clean:
        rm -rf build
 
 endif
+EXTRA_DIST = \
+       setup.py \
+       lxc.c \
+       lxc/__init__.py \
+       examples/api_test.py