use ENSC_PATHPROG & friends
[util-vserver.git] / util-vserver / Makefile.am
index 5a20d15..949f41a 100644 (file)
@@ -59,6 +59,9 @@ BUILT_SOURCES =               linuxcaps.h pathconfig.h linuxvirtual.h \
 man_MANS =
 
 kernel_HDRS =          kernel/context.h \
+                       kernel/cvirt.h \
+                       kernel/debug.h \
+                       kernel/dlimit.h \
                        kernel/inode.h \
                        kernel/legacy.h \
                        kernel/limit.h \
@@ -66,7 +69,8 @@ kernel_HDRS =         kernel/context.h \
                        kernel/network.h \
                        kernel/sched.h \
                        kernel/signal.h \
-                       kernel/switch.h
+                       kernel/switch.h \
+                       kernel/xid.h
 
 EXTRA_PROGRAMS =
 EXTRA_DIST =           pathconfig.h.pathsubst \
@@ -92,17 +96,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
@@ -126,7 +126,7 @@ silent.%:           FORCE
 linuxcaps.h:           ${kernelincludedir}/linux/capability.h Makefile
                        @rm -f $@
                        echo '#include <stdint.h>' >$@.tmp
-                       $(SED) -e 's!^#include .*!!g;s!\<__u32\>!uint32_t!g;s!\<__user\>!!g;' $< >>$@.tmp
+                       $(SED) -e 's!^#include .*!!g;' $< >>$@.tmp
                        @-chmod --reference $< $@.tmp &>/dev/null
                        mv -f $@.tmp $@
                        @chmod a-w $@
@@ -161,27 +161,11 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
                        s!@'PACKAGE_STRING'@!$(PACKAGE_STRING)!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!@'NAMEIF'@!$(NAMEIF)!g; \
-                       s!@'NICE'@!$(NICE)!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!@'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; \
-                       s!@'ENSC_HAVE_CXX_COMPILER_FALSE'@!\@ENSC_HAVE_CXX_COMPILER_FALSE@ !g;
+                       s!@'ENSC_HAVE_CXX_COMPILER_FALSE'@!\@ENSC_HAVE_CXX_COMPILER_FALSE@ !g; \
+                       $(ENSC_PATHPROG_SED)
 
 pathconfig.h:          .pathconfig.h.pathsubst.stamp
 .%.pathsubst.stamp:    %.pathsubst Makefile
@@ -208,6 +192,9 @@ fix_SCRPTS          =  $(addprefix $(pkglibdir)/, $(notdir $(pkglib_SCRIPTS))) \
                           $(addprefix $(sbindir)/,   $(notdir $(sbin_SCRIPTS))) \
                           $(addprefix $(initrddir)/, $(notdir $(initrd_SCRIPTS)))
 
+update-doc:            doc
+                       $(top_srcdir)/update-doc
+
 install-data-hook:     install-fix-script-paths install-create-dirs
 
 install-create-dirs:
@@ -241,10 +228,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
 
@@ -267,4 +250,4 @@ include $(top_srcdir)/m4/validate.am
 include $(top_srcdir)/m4/changelog.am
 include $(top_srcdir)/m4/pkgconfig.am
 
-.PHONY:                FORCE
+.PHONY:                FORCE update-doc