Skip to content

L
lxc
Commit c13c0e08 by Stéphane Graber
Options

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: 's avatarStéphane Graber <stgraber@ubuntu.com> Acked-by: 's avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
parent 1fbb470b
Showing with 22 additions and 11 deletions
Makefile.am
...@@ -4,7 +4,13 @@ ACLOCAL_AMFLAGS = -I config ...@@ -4,7 +4,13 @@ ACLOCAL_AMFLAGS = -I config
SUBDIRS = config src templates doc hooks SUBDIRS = config src templates doc hooks
DIST_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 = RPMARGS =
if ENABLE_LUA if ENABLE_LUA
......
doc/Makefile.am
...@@ -2,8 +2,7 @@ SUBDIRS = examples rootfs ...@@ -2,8 +2,7 @@ SUBDIRS = examples rootfs
DIST_SUBDIRS = examples rootfs DIST_SUBDIRS = examples rootfs
EXTRA_DIST = \ EXTRA_DIST = \
FAQ.txt \ FAQ.txt
$(man_MANS)
if ENABLE_DOCBOOK if ENABLE_DOCBOOK
man_MANS = \ man_MANS = \
......
doc/examples/Makefile.am
EXTRA_DIST = $(pkgexamples_DATA)
if ENABLE_EXAMPLES if ENABLE_EXAMPLES
pkgexamplesdir=$(docdir)/examples pkgexamplesdir=$(docdir)/examples
......
src/lua-lxc/Makefile.am
...@@ -4,7 +4,6 @@ luadir=$(datadir)/lua/5.1 ...@@ -4,7 +4,6 @@ luadir=$(datadir)/lua/5.1
sodir=$(libdir)/lua/5.1/lxc sodir=$(libdir)/lua/5.1/lxc
lua_SCRIPTS=lxc.lua lua_SCRIPTS=lxc.lua
EXTRA_DIST=lxc.lua
so_PROGRAMS = core.so so_PROGRAMS = core.so
...@@ -24,3 +23,7 @@ core_so_LDADD = -llxc $(LUA_LIBS) ...@@ -24,3 +23,7 @@ core_so_LDADD = -llxc $(LUA_LIBS)
lxc.lua: lxc.lua:
endif endif
EXTRA_DIST= \
lxc.lua \
test/apitest.lua
src/lxc/Makefile.am
...@@ -126,9 +126,12 @@ bin_SCRIPTS = \ ...@@ -126,9 +126,12 @@ bin_SCRIPTS = \
lxc-shutdown \ lxc-shutdown \
lxc-destroy lxc-destroy
EXTRA_DIST= EXTRA_DIST = \
lxc-device \
lxc-ls \
lxc-top
if ENABLE_PYTHON if ENABLE_PYTHON
EXTRA_DIST += lxc-device lxc-ls
bin_SCRIPTS += lxc-device bin_SCRIPTS += lxc-device
bin_SCRIPTS += lxc-ls bin_SCRIPTS += lxc-ls
bin_SCRIPTS += lxc-start-ephemeral bin_SCRIPTS += lxc-start-ephemeral
...@@ -137,7 +140,6 @@ else ...@@ -137,7 +140,6 @@ else
endif endif
if ENABLE_LUA if ENABLE_LUA
EXTRA_DIST += lxc-top
bin_SCRIPTS += lxc-top bin_SCRIPTS += lxc-top
endif endif
......
src/python-lxc/Makefile.am
if ENABLE_PYTHON if ENABLE_PYTHON
EXTRA_DIST = setup.py lxc.c
if HAVE_DEBIAN if HAVE_DEBIAN
DISTSETUPOPTS=--install-layout=deb DISTSETUPOPTS=--install-layout=deb
else else
...@@ -22,3 +20,8 @@ clean: ...@@ -22,3 +20,8 @@ clean:
rm -rf build rm -rf build
endif endif
EXTRA_DIST = \
setup.py \
lxc.c \
lxc/__init__.py \
examples/api_test.py
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment