cgroups: use zalloc

[mirror_lxc.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7b3232646bf7ba6295afdc43f4d5ca08ffee1fb8..17fd6a89c29ccbf91798aeeacdc91c66d6850af1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,29 @@
 # Makefile.am
 
 ACLOCAL_AMFLAGS = -I config
+AM_CFLAGS += $(PTHREAD_CFLAGS)
+AM_LDFLAGS += $(PTHREAD_LIBS)
 
-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 coccinelle src templates doc hooks
+DIST_SUBDIRS = config coccinelle  src templates doc hooks
+EXTRA_DIST = autogen.sh \
+            lxc.spec \
+            CONTRIBUTING \
+            CODING_STYLE.md \
+            LICENSE.GPL2 \
+            LICENSE.LGPL2.1 \
+            MAINTAINERS \
+            README.md
+
+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 +32,4 @@ ChangeLog::
        @touch ChangeLog
 
 rpm: dist
-       rpmbuild --clean -ta ${distdir}.tar.gz
+       rpmbuild --clean -ta ${distdir}.tar.gz $(RPMARGS)