use different files for 'bcap' and 'ccap' for now
[util-vserver.git] / util-vserver / Makefile.am
index 2f1dea2..6ea30f8 100644 (file)
@@ -30,20 +30,22 @@ legacydir           =  $(pkglibdir)/legacy
 
 include_HEADERS =      $(lib_HDRS)
 noinst_HEADERS =       $(src_HDRS) $(lib_XHDRS) \
-                       $(lib_internal_libinternal_a_XHDRS)
+                       $(lib_internal_libinternal_a_XHDRS) \
                        $(ENSC_VECTOR_HDRS) $(ENSC_VECTOR_XHDRS) \
                        $(ENSC_WRAPPERS_HDRS) \
                        compat.h compat-c99.h
 
-noinst_LIBRARIES       =  $(src_lib_LIBS) $(ENSC_VECTOR_LIBS)
-lib_LIBRARIES          =  $(lib_lib_LIBS) $(lib_internal_LIBS)
+noinst_LIBRARIES       =  $(src_lib_LIBS) $(ENSC_VECTOR_LIBS) $(lib_internal_LIBS)
+lib_LIBRARIES          =  $(lib_lib_LIBS)
 lib_LTLIBRARIES                =  $(lib_lib_LTLIBS) $(src_lib_LTLIBS)
 pkglib_LTLIBRARIES     =  $(src_pkglib_LTLIBS)
 
 pkglib_SCRIPTS         =  $(scripts_pkglib_SCRPTS)
-pkglib_DATA            =  $(scripts_pkglib_DTA)
-pkglib_PROGRAMS                =  $(src_pkglib_PRGS)
-legacy_SCRIPTS         =  $(scripts_legacy_SCRPTS)
+pkglib_DATA            =  $(scripts_pkglib_DTA) \
+                          FEATURES.txt
+pkglib_PROGRAMS =      $(src_pkglib_PRGS)
+legacy_SCRIPTS =       $(scripts_legacy_SCRPTS) $(src_legacy_SCRPTS)
+legacy_PROGRAMS =      $(src_legacy_PRGS)
 
 sbincfg_DATA           =  $(scripts_sbincfg_DTA)
 
@@ -52,8 +54,8 @@ sbin_PROGRAMS         =  $(src_sbin_PRGS)
 noinst_PROGRAMS                =  $(test_PRGS)
 noinst_DATA            =  $(contrib_DTA) $(doc_DAT)
 
-initrd_SCRIPTS         =  $(sysv_SCRPTS)
-sysconf_DATA           =  $(sysv_CFG)
+initrd_SCRIPTS =
+sysconf_DATA =
 
 DIETPROGS =            $(src_DIETPROGS) $(tests_DIETPROGS) $(lib_DIETPROGS) \
                        $(lib_internal_DIETPROGS)
@@ -64,8 +66,7 @@ BUILT_SOURCES =               linuxcaps.h pathconfig.h linuxvirtual.h
 man_MANS =             $(man_DATMAN)
 
 EXTRA_PROGRAMS =       $(src_EXTRA_PROGS)
-EXTRA_DIST =           $(sysv_XTRAS) $(sysv_CFG) \
-                        $(doc_DAT) $(man_DATMAN) \
+EXTRA_DIST =            $(doc_DAT) $(man_DATMAN) \
                        $(scripts_XTRAS) $(src_XTRAS) \
                        $(contrib_XTRAS) \
                        pathconfig.h.pathsubst \
@@ -82,25 +83,39 @@ TESTS_ENVIRONMENT   =  $(src_TESTS_ENV)
 
 AM_CPPFLAGS            =  -I $(top_srcdir)/lib -I $(top_srcdir)/ensc_wrappers -D _GNU_SOURCE $(RELEASE_CPPFLAGS)
 
-CLEANFILES =           $(sysv_GENSCRPTS) $(scripts_CLEANFILES) $(BUILT_SOURCES) \
+CLEANFILES =           $(scripts_CLEANFILES) $(BUILT_SOURCES) \
                        $(contrib_CLEANFILES) \
                        .*.pathsubst.stamp */.*.pathsubst.stamp */*/.*.pathsubst.stamp \
                        linuxcaps.h pathconfig.h
 
+DISTCLEANFILES =       FEATURES.txt
+
+
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT     =  $(src_OPTIONS_EXEMPT) \
-                                          $(scripts_OPTIONS_EXEMPT) \
-                                          $(sysv_OPTIONS_EXEMPT)
+                                          $(scripts_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
@@ -174,7 +189,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