Merge 0.30.214.

[util-vserver.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dd30d82..f261bf5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 2367 2006-11-03 19:59:15Z dhozac $
+## $Id: Makefile.am 2482 2007-01-29 23:37:07Z dhozac $
 
 # Copyright (C) 2003,2004,2005,2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 #  
@@ -18,7 +18,7 @@
 #  
 
 ACLOCAL_AMFLAGS                =  -I m4
-SUBDIRS                        =  . distrib
+SUBDIRS                        =  . distrib python
 
 SVN2CL_AMFLAGS         =  $(SVN2CL_TAG) --authors=svnusers.map
 SVN2CL_ALLFLAGS        :=  $(SVN2CL_AMFLAGS) $(SVN2CL_FLAGS)
@@ -140,6 +140,8 @@ pathsubst_RULES =   s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
                        s!@'ENSC_HAVE_C99_COMPILER_FALSE'@!\@ENSC_HAVE_C99_COMPILER_FALSE@ !g; \
                        s!@'ENSC_HAVE_CXX_COMPILER_TRUE'@!\@ENSC_HAVE_CXX_COMPILER_TRUE@ !g; \
                        s!@'ENSC_HAVE_CXX_COMPILER_FALSE'@!\@ENSC_HAVE_CXX_COMPILER_FALSE@ !g; \
+                       s!@'ENSC_HAVE_LIBNL_TRUE'@!\@ENSC_HAVE_LIBNL_TRUE@ !g; \
+                       s!@'ENSC_HAVE_LIBNL_FALSE'@!\@ENSC_HAVE_LIBNL_FALSE@ !g; \
                        $(ENSC_PATHPROG_SED)
 
 pathconfig.h:          .pathconfig.h.pathsubst.stamp
@@ -236,6 +238,7 @@ include $(top_srcdir)/ensc_wrappers/Makefile-files
 include $(top_srcdir)/ensc_fmt/Makefile-files
 include $(top_srcdir)/lib_internal/Makefile-files
 include $(top_srcdir)/vserver-start/Makefile-files
+include $(top_srcdir)/gentoo/Makefile-files
 
 include $(top_srcdir)/m4/gpgsig.am
 include $(top_srcdir)/m4/validate.am