use a better method to copy labels; formerly, bad parameters could
[util-vserver.git] / util-vserver / Makefile.am
index f2d1742..12dc5df 100644 (file)
@@ -80,7 +80,8 @@ TESTS =
 
 TESTS_ENVIRONMENT =
 
-AM_CPPFLAGS            =  -I $(top_srcdir)/lib -I $(top_srcdir)/ensc_wrappers -D _GNU_SOURCE $(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 \
@@ -91,17 +92,13 @@ DISTCLEANFILES =    FEATURES.txt
 
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT =
 
-LIBTOOL_CC =           @LIBTOOL@ --tag CC
-LIBTOOL_CXX =          @LIBTOOL@ --tag CXX
-
 if USE_DIETLIBC
 DIET                   =  diet
 DIET_FLAGS             =
 DIET_CC                       :=  $(DIET) $(DIET_FLAGS) $(CC)
-DIET_LIBTOOL          :=  $(LIBTOOL_CC)
-VSERVER_LDFLAGS               :=  -static
+VSERVER_LDFLGS        :=  -static
 else
-VSERVER_LDFLAGS               :=
+VSERVER_LDFLGS        :=
 endif
 
 if USE_DIETLIBC_COMPAT
@@ -112,6 +109,15 @@ endif
 
 VSERVER_LDADDS =       lib/libvserver.la  $(DIET_COMPAT_LDADDS)
 
+silent.%:              FORCE
+                       @t=$$(mktemp /tmp/build.XXXXXX) && \
+                       $(MAKE) '$*' -s 2>$$t >/dev/null && \
+                       ( cat $$t | \
+                               grep -v ': In function' | \
+                               grep -v 'your code still has assertions enabled' | \
+                               grep -v ' is obsoleted' | \
+                               grep -v 'warning: #warning'; \
+                               rm -f $$t || : )
 
 linuxcaps.h:           ${kernelincludedir}/linux/capability.h Makefile
                        @rm -f $@
@@ -231,10 +237,6 @@ _install-vserverdir:
 if USE_DIETLIBC
 $(addsuffix $(EXEEXT), $(DIETPROGS)) \
 $(addsuffix $(OBJEXT), $(DIETPROGS)) \
-               :               LIBTOOL=$(DIET_LIBTOOL)
-
-$(addsuffix $(EXEEXT), $(DIETPROGS)) \
-$(addsuffix $(OBJEXT), $(DIETPROGS)) \
                :               CC=$(DIET_CC)
 endif
 
@@ -248,9 +250,13 @@ include $(top_srcdir)/sysv/Makefile-files
 include $(top_srcdir)/contrib/Makefile-files
 include $(top_srcdir)/ensc_vector/Makefile-files
 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)/m4/gpgsig.am
 include $(top_srcdir)/m4/validate.am
 include $(top_srcdir)/m4/changelog.am
 include $(top_srcdir)/m4/pkgconfig.am
+
+.PHONY:                FORCE