network: simplify instantiate_vlan()

[mirror_lxc.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7b3232646bf7ba6295afdc43f4d5ca08ffee1fb8..dd892c820cf0ef85cfcd3d065882a3ca2cd9e71b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,13 +2,23 @@
 
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = config src templates doc
-DIST_SUBDIRS = config src templates doc
-EXTRA_DIST = autogen.sh lxc.spec CONTRIBUTING MAINTAINERS ChangeLog
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+SUBDIRS = config src templates doc hooks
+DIST_SUBDIRS = config src templates doc hooks
+EXTRA_DIST = \
+       autogen.sh \
+       lxc.spec \
+       CONTRIBUTING \
+       MAINTAINERS
+
+RPMARGS =
 
 pcdatadir = $(libdir)/pkgconfig
 pcdata_DATA = lxc.pc
 
+libtool: $(LIBTOOL_DEPS)
+       $(SHELL) ./config.status libtool
+
 install-data-local:
        $(MKDIR_P) $(DESTDIR)$(LXCPATH)
        $(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/lxc
@@ -17,4 +27,4 @@ ChangeLog::
        @touch ChangeLog
 
 rpm: dist
-       rpmbuild --clean -ta ${distdir}.tar.gz
+       rpmbuild --clean -ta ${distdir}.tar.gz $(RPMARGS)