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 <stgra...@ubuntu.com>
---
Makefile.am | 8 +++++++-
RELEASE-NOTES | 0
doc/Makefile.am | 3 +--
doc/examples/Makefile.am | 2 --
src/lua-lxc/Makefile.am | 5 ++++-
src/lxc/Makefile.am | 8 +++++---
src/python-lxc/Makefile.am | 7 +++++--
7 files changed, 22 insertions(+), 11 deletions(-)
delete mode 100644 RELEASE-NOTES
diff --git a/Makefile.am b/Makefile.am
index 7ebef9d..eac2bfd 100644
--- 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
index e69de29..0000000
diff --git a/doc/Makefile.am b/doc/Makefile.am
index df5ad73..b588712 100644
--- 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 4869c02..66658b4 100644
--- 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 f05eb72..82dbae8 100644
--- 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 0385e0d..ebeca466 100644
--- 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 52ede07..bdb6dbd 100644
--- 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
--
1.8.1.2
------------------------------------------------------------------------------
Own the Future-Intel® Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game
on Steam. $5K grand prize plus 10 genre and skill prizes.
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d
_______________________________________________
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
