updated again...
[util-vserver.git] / util-vserver / Makefile.am
index 83cef0e..12dc5df 100644 (file)
@@ -53,7 +53,8 @@ sysconf_DATA =
 
 DIETPROGS =            $(ENSC_VECTOR_LIBS)
 
-BUILT_SOURCES =                linuxcaps.h pathconfig.h linuxvirtual.h
+BUILT_SOURCES =                linuxcaps.h pathconfig.h linuxvirtual.h \
+                       .fixups
 
 man_MANS =
 
@@ -79,28 +80,25 @@ 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 \
-                       linuxcaps.h pathconfig.h
+                       linuxcaps.h pathconfig.h .fixups
 
 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
@@ -111,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 $@
@@ -151,16 +158,22 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
                        s!@'PACKAGE_TARNAME'@!$(PACKAGE_TARNAME)!g; \
                        s!@'PACKAGE_VERSION'@!$(PACKAGE_VERSION)!g; \
                        s!@'AWK'@!$(AWK)!g; \
+                       s!@'ENV'@!$(ENV)!g; \
                        s!@'GREP'@!$(GREP)!g; \
                        s!@'IP'@!$(IP)!g; \
+                       s!@'IPTABLES'@!$(IPTABLES)!g; \
+                       s!@'MODPROBE'@!$(MODPROBE)!g; \
                        s!@'MOUNT'@!$(MOUNT)!g; \
-                       s!@'UMOUNT'@!$(UMOUNT)!g; \
+                       s!@'NAMEIF'@!$(NAMEIF)!g; \
                        s!@'NICE'@!$(NICE)!g; \
-                       s!@'VCONFIG'@!$(VCONFIG)!g; \
                        s!@'PS'@!$(PS)!g; \
+                       s!@'RMMOD'@!$(RMMOD)!g; \
+                       s!@'TAR'@!$(TAR)!g; \
+                       s!@'UMOUNT'@!$(UMOUNT)!g; \
+                       s!@'VCONFIG'@!$(VCONFIG)!g; \
                        s!@'WC'@!$(WC)!g; \
                        s!@'WGET'@!$(WGET)!g; \
-                       s!@'TAR'@!$(TAR)!g; \
+                       s!@'XSLTPROC'@!$(XSLTPROC)!g; \
                        s!@'ENSC_HAVE_C99_COMPILER_TRUE'@!\@ENSC_HAVE_C99_COMPILER_TRUE@ !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; \
@@ -217,11 +230,11 @@ _install-vshelperlink:
 _install-vserverdir:
                        $(mkinstalldirs) $(DESTDIR)$(vserverdir) $(DESTDIR)$(vserverpkgdir)
 
-if USE_DIETLIBC
-$(addsuffix $(EXEEXT), $(DIETPROGS)) \
-$(addsuffix $(OBJEXT), $(DIETPROGS)) \
-               :               LIBTOOL=$(DIET_LIBTOOL)
+.fixups:               config.status util-vserver.spec
+                       chmod a-w util-vserver.spec
+                       touch $@
 
+if USE_DIETLIBC
 $(addsuffix $(EXEEXT), $(DIETPROGS)) \
 $(addsuffix $(OBJEXT), $(DIETPROGS)) \
                :               CC=$(DIET_CC)
@@ -237,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