- moved getFileValue/getFileArray from 'vserver.functions' into 'functions'
[util-vserver.git] / util-vserver / Makefile.am
index df3ac84..77f5409 100644 (file)
@@ -27,7 +27,7 @@ sysvdir                       =  $(sysconfdir)/init.d
 confdir                        =  $(sysconfdir)/vservers
 
 include_HEADERS                =  $(lib_HDRS)
-noinst_HEADERS         =  $(src_HDRS)
+noinst_HEADERS         =  $(src_HDRS) $(lib_XHDRS) compat.h
 
 lib_LIBRARIES          =  $(lib_lib_LIBS)
 
@@ -42,7 +42,9 @@ noinst_PROGRAMS               =  $(test_PRGS)
 sysv_SCRIPTS           =  $(sysv_SCRPTS)
 sysconf_DATA           =  $(sysv_CFG)
 
-BUILT_SOURCES          =  linuxcaps.h pathconfig.h
+DIETPROGS              =  $(src_DIETPROGS) $(tests_DIETPROGS)
+
+BUILT_SOURCES          =  linuxcaps.h pathconfig.h linuxvirtual.h
 
 man_MANS               =  $(man_DATMAN)
 
@@ -57,10 +59,14 @@ EXTRA_DIST          =  $(sysv_XTRAS) $(sysv_CFG) \
 AM_CPPFLAGS            =  -I $(top_srcdir)/lib -D _GNU_SOURCE
 AM_CFLAGS              =  -Wall -pedantic
 
-CLEANFILES             =  $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) \
+CLEANFILES             =  $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) $(BUILT_SOURCES) \
                           .*.pathsubst.stamp */.*.pathsubst.stamp \
                           linuxcaps.h pathconfig.h
 
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT     =  $(src_OPTIONS_EXEMPT) \
+                                          $(scripts_OPTIONS_EXEMPT) \
+                                          $(sysv_OPTIONS_EXEMPT)
+
 if USE_DIETLIBC
 DIET                   =  diet
 DIET_FLAGS             =
@@ -70,28 +76,34 @@ endif
 linuxcaps.h:
                        ln -sf ${kernelincludedir}/linux/capability.h linuxcaps.h
 
+linuxvirtual.h:
+                       ln -sf '$(kernelincludedir)/linux/virtual.h' '$@' && test -e '$@' || \
+                       ln -sf '$(top_srcdir)/lib/virtual.h' '$@'
+
+pathsubst_RULES                =  s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
+                          s!@'SBINDIR'@!$(sbindir)!g; \
+                          s!@'CONFDIR'@!$(confdir)!g; \
+                          s!@'SYSCONFDIR'@!$(sysconfdir)!g; \
+                          s!@'PACKAGE'@!$(PACKAGE)!g; \
+                          s!@'PACKAGE_BUGREPORT'@!$(PACKAGE_BUGREPORT)!g; \
+                          s!@'PACKAGE_NAME'@!$(PACKAGE_NAME)!g; \
+                          s!@'PACKAGE_STRING'@!$(PACKAGE_STRING)!g; \
+                          s!@'PACKAGE_TARNAME'@!$(PACKAGE_TARNAME)!g; \
+                          s!@'PACKAGE_VERSION'@!$(PACKAGE_VERSION)!g; \
+                          s!@'AWK'@!$(AWK)!g; \
+                          s!@'GREP'@!$(GREP)!g; \
+                          s!@'IP'@!$(IP)!g; \
+                          s!@'MOUNT'@!$(MOUNT)!g; \
+                          s!@'UMOUNT'@!$(UMOUNT)!g; \
+                          s!@'NICE'@!$(NICE)!g; \
+                          s!@'VCONFIG'@!$(VCONFIG)!g; \
+                          s!@'WC'@!$(WC)!g
+
 pathconfig.h:          .pathconfig.h.pathsubst.stamp
 .%.pathsubst.stamp:    %.pathsubst Makefile
                        @mkdir -p $$(dirname '$@')
                        @echo "sed -e '...' $*.pathsubst >$*"
-                       @sed -e 's!@'PKGLIBDIR'@!$(pkglibdir)!g; \
-                               s!@'SBINDIR'@!$(sbindir)!g; \
-                               s!@'CONFDIR'@!$(confdir)!g; \
-                               s!@'SYSCONFDIR'@!$(sysconfdir)!g; \
-                               s!@'PACKAGE'@!$(PACKAGE)!g; \
-                               s!@'PACKAGE_BUGREPORT'@!$(PACKAGE_BUGREPORT)!g; \
-                               s!@'PACKAGE_NAME'@!$(PACKAGE_NAME)!g; \
-                               s!@'PACKAGE_STRING'@!$(PACKAGE_STRING)!g; \
-                               s!@'PACKAGE_TARNAME'@!$(PACKAGE_TARNAME)!g; \
-                               s!@'PACKAGE_VERSION'@!$(PACKAGE_VERSION)!g; \
-                               s!@'AWK'@!$(AWK)!g; \
-                               s!@'GREP'@!$(GREP)!g; \
-                               s!@'IP'@!$(IP)!g; \
-                               s!@'MOUNT'@!$(MOUNT)!g; \
-                               s!@'NICE'@!$(NICE)!g; \
-                               s!@'VCONFIG'@!$(VCONFIG)!g; \
-                               s!@'WC'@!$(WC)!g; \
-                              ' '$<' >'$@.tmp'
+                       @sed -e '$(pathsubst_RULES)' '$<' >'$@.tmp'
                        @if cmp -s '$@.tmp' '$*'; then \
                                echo "... no changes, reusing old version"; \
                                rm -f '$@.tmp'; \
@@ -101,6 +113,14 @@ pathconfig.h:              .pathconfig.h.pathsubst.stamp
                        @chmod a-w '$*'
                        @touch '$@'
 
+install-data-local:
+                       $(INSTALL) -d -m755 $(DESTDIR)$(localstatedir)/run/vservers
+
+if USE_DIETLIBC
+$(addsuffix $(EXEEXT), $(DIETPROGS)) \
+$(addsuffix $(OBJEXT), $(DIETPROGS)) \
+               :               CC=$(DIET_CC)
+endif
 
 include $(top_srcdir)/lib/Makefile-files
 include $(top_srcdir)/src/Makefile-files
@@ -113,3 +133,4 @@ include $(top_srcdir)/sysv/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