isRegularFile(): added
[util-vserver.git] / util-vserver / Makefile.am
index f591619..c71b759 100644 (file)
@@ -20,7 +20,7 @@
 ACLOCAL_AMFLAGS                =  -I m4
 SUBDIRS                        =  . distrib
 
-CVS2CL_AMFLAGS         =  $(CVS2CL_TAG) -U cvsusers.map --show-dead
+CVS2CL_AMFLAGS         =  $(CVS2CL_TAG) -U cvsusers.map --show-dead -S --no-wrap
 CVS2CL_ALLFLAGS        :=  $(CVS2CL_AMFLAGS) $(CVS2CL_FLAGS)
 
 confdir                        =  $(sysconfdir)/vservers
@@ -75,17 +75,19 @@ kernel_HDRS =               kernel/context.h \
 EXTRA_PROGRAMS =
 EXTRA_DIST =           pathconfig.h.pathsubst \
                        util-vserver.spec \
-                       THANKS \
+                       THANKS REQUIREMENTS \
                        $(kernel_HDRS)
 
 check_PROGRAMS =
 check_SCRIPTS =
-TESTS =
 
-TESTS_ENVIRONMENT =
+TESTS_DEBUG =          no
+TESTS =
+TESTS_ENVIRONMENT =    ensc_use_expensive_tests="$(ENSC_USE_EXPENSIVE_TESTS)" \
+                       ensc_test_debug="$(TESTS_DEBUG)"
 
-AM_CPPFLAGS            =  -I $(top_srcdir)/lib -I $(top_srcdir)/ensc_wrappers \
-                          -D_GNU_SOURCE -D_REENTRANT $(RELEASE_CPPFLAGS)
+AM_CPPFLAGS =          -I $(top_srcdir)/lib -I $(top_srcdir)/ensc_wrappers \
+                       -D_GNU_SOURCE -D_REENTRANT $(RELEASE_CPPFLAGS)
 
 CLEANFILES =           $(BUILT_SOURCES) \
                        .*.pathsubst.stamp */.*.pathsubst.stamp */*/.*.pathsubst.stamp \
@@ -97,9 +99,7 @@ DISTCLEANFILES =      FEATURES.txt
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT =
 
 if USE_DIETLIBC
-DIET                   =  diet
-DIET_FLAGS             =
-DIET_CC                       :=  $(DIET) $(DIET_FLAGS) $(CC)
+DIET_CC                       :=  $(DIET) $(DIETFLAGS) $(CC)
 VSERVER_LDFLGS        :=  -static
 else
 VSERVER_LDFLGS        :=
@@ -221,6 +221,9 @@ if USE_DIETLIBC
 $(addsuffix $(EXEEXT), $(DIETPROGS)) \
 $(addsuffix $(OBJEXT), $(DIETPROGS)) \
                :               CC=$(DIET_CC)
+else   !USE_DIETLIBC
+nodist_lib_dietlibc_not_enabled_error_a_SOURCES = \
+                       lib-dietlibc-not-enabled-error.c
 endif
 
 include $(top_srcdir)/lib/Makefile-files
@@ -241,5 +244,6 @@ include $(top_srcdir)/m4/gpgsig.am
 include $(top_srcdir)/m4/validate.am
 include $(top_srcdir)/m4/changelog.am
 include $(top_srcdir)/m4/pkgconfig.am
+include $(top_srcdir)/m4/libsel.am
 
 .PHONY:                FORCE update-doc