added support for 'fstab.local' files
[util-vserver.git] / util-vserver / Makefile.am
index a809480..9ad9487 100644 (file)
@@ -28,75 +28,79 @@ confdefaultsdir             =  $(confdir)/.defaults
 sbincfgdir             =  $(sbindir)
 legacydir              =  $(pkglibdir)/legacy
 
-include_HEADERS                =  $(lib_HDRS)
-noinst_HEADERS         =  $(src_HDRS) $(lib_XHDRS) \
-                          $(ENSC_VECTOR_HDRS) $(ENSC_VECTOR_XHDRS) \
-                          $(ENSC_WRAPPERS_HDRS) \
-                          compat.h compat-c99.h
+include_HEADERS =
+noinst_HEADERS =       $(ENSC_VECTOR_HDRS) \
+                       compat.h compat-c99.h
 
-noinst_LIBRARIES       =  $(src_lib_LIBS) $(ENSC_VECTOR_LIBS)
-lib_LIBRARIES          =  $(lib_lib_LIBS)
-lib_LTLIBRARIES                =  $(lib_lib_LTLIBS) $(src_lib_LTLIBS)
-pkglib_LTLIBRARIES     =  $(src_pkglib_LTLIBS)
+noinst_LIBRARIES =     $(ENSC_VECTOR_LIBS)
+lib_LIBRARIES =
+lib_LTLIBRARIES =
+pkglib_LTLIBRARIES =
 
-pkglib_SCRIPTS         =  $(scripts_pkglib_SCRPTS)
-pkglib_DATA            =  $(scripts_pkglib_DTA)
-pkglib_PROGRAMS                =  $(src_pkglib_PRGS)
-legacy_SCRIPTS         =  $(scripts_legacy_SCRPTS)
+pkglib_SCRIPTS =
+pkglib_DATA =          FEATURES.txt
+pkglib_PROGRAMS =
+legacy_SCRIPTS =
+legacy_PROGRAMS =
 
-sbincfg_DATA           =  $(scripts_sbincfg_DTA)
+sbin_SCRIPTS =
+sbin_PROGRAMS =
+noinst_PROGRAMS =
+noinst_DATA =
 
-sbin_SCRIPTS           =  $(scripts_sbin_PRGS) $(src_sbin_SCRPTS)
-sbin_PROGRAMS          =  $(src_sbin_PRGS)
-noinst_PROGRAMS                =  $(test_PRGS)
-noinst_DATA            =  $(contrib_DTA) $(doc_DAT)
+initrd_SCRIPTS =
+sysconf_DATA =
 
-initrd_SCRIPTS         =  $(sysv_SCRPTS)
-sysconf_DATA           =  $(sysv_CFG)
-
-DIETPROGS              =  $(src_DIETPROGS) $(tests_DIETPROGS) $(lib_DIETPROGS) \
-                          $(ENSC_VECTOR_LIBS)
+DIETPROGS =            $(ENSC_VECTOR_LIBS)
 
 BUILT_SOURCES =                linuxcaps.h pathconfig.h linuxvirtual.h
 
-man_MANS =             $(man_DATMAN)
+man_MANS =
 
-EXTRA_PROGRAMS =       $(src_EXTRA_PROGS)
-EXTRA_DIST =           $(sysv_XTRAS) $(sysv_CFG) \
-                        $(doc_DAT) $(man_DATMAN) \
-                       $(scripts_XTRAS) $(src_XTRAS) \
-                       $(contrib_XTRAS) \
-                       pathconfig.h.pathsubst \
+EXTRA_PROGRAMS =
+EXTRA_DIST =           pathconfig.h.pathsubst \
                        util-vserver.spec \
                        THANKS
 
-check_PROGRAMS         =  $(src_check_PRGS) $(ENSC_VECTOR_TESTSUITE_PRGS)
-check_SCRIPTS          =  $(src_check_SCRPTS)
-TESTS                  =  $(src_TSTS) $(ENSC_VECTOR_TESTSUITE_TSTS)
+check_PROGRAMS =
+check_SCRIPTS =
+TESTS =
 
-TESTS_ENVIRONMENT      =  $(src_TESTS_ENV)
+TESTS_ENVIRONMENT =
 
 AM_CPPFLAGS            =  -I $(top_srcdir)/lib -I $(top_srcdir)/ensc_wrappers -D _GNU_SOURCE $(RELEASE_CPPFLAGS)
 
-CLEANFILES =           $(sysv_GENSCRPTS) $(scripts_CLEANFILES) $(BUILT_SOURCES) \
-                       $(contrib_CLEANFILES) \
+CLEANFILES =           $(BUILT_SOURCES) \
                        .*.pathsubst.stamp */.*.pathsubst.stamp */*/.*.pathsubst.stamp \
                        linuxcaps.h pathconfig.h
 
-AM_INSTALLCHECK_STD_OPTIONS_EXEMPT     =  $(src_OPTIONS_EXEMPT) \
-                                          $(scripts_OPTIONS_EXEMPT) \
-                                          $(sysv_OPTIONS_EXEMPT)
+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) --tag CC
+DIET_LIBTOOL          :=  $(LIBTOOL_CC)
 VSERVER_LDFLAGS               :=  -static
 else
 VSERVER_LDFLAGS               :=
 endif
 
+if USE_DIETLIBC_COMPAT
+DIET_COMPAT_LDADDS =   -lcompat
+else
+DIET_COMPAT_LDADDS =
+endif
+
+VSERVER_LDADDS =       lib/libvserver.la  $(DIET_COMPAT_LDADDS)
+
+
 linuxcaps.h:           ${kernelincludedir}/linux/capability.h Makefile
                        @rm -f $@
                        echo '#include <stdint.h>' >$@.tmp
@@ -143,7 +147,11 @@ pathsubst_RULES            =  s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
                           s!@'VCONFIG'@!$(VCONFIG)!g; \
                           s!@'PS'@!$(PS)!g; \
                           s!@'WC'@!$(WC)!g; \
-                          s!@'WGET'@!$(WGET)!g
+                          s!@'WGET'@!$(WGET)!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;
 
 pathconfig.h:          .pathconfig.h.pathsubst.stamp
 .%.pathsubst.stamp:    %.pathsubst Makefile
@@ -166,7 +174,8 @@ vserverpkgdir               =  $(vserverdir)/.pkg
 
 fix_SCRPTS             =  $(addprefix $(pkglibdir)/, $(notdir $(pkglib_SCRIPTS))) \
                           $(addprefix $(legacydir)/, $(notdir $(legacy_SCRIPTS))) \
-                          $(addprefix $(sbindir)/,   $(notdir $(sbin_SCRIPTS)))
+                          $(addprefix $(sbindir)/,   $(notdir $(sbin_SCRIPTS))) \
+                          $(addprefix $(initrddir)/, $(notdir $(initrd_SCRIPTS)))
 
 install-data-hook:     install-fix-script-paths install-create-dirs
 
@@ -208,6 +217,7 @@ 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)/lib_internal/Makefile-files
 
 include $(top_srcdir)/m4/gpgsig.am
 include $(top_srcdir)/m4/validate.am