merged with 0.26.90
[util-vserver.git] / util-vserver / Makefile.am
index 2f85191..17ff7bb 100644 (file)
@@ -24,17 +24,21 @@ CVS2CL_AMFLAGS              =  $(CVS2CL_TAG) -U cvsusers.map --show-dead
 CVS2CL_ALLFLAGS        :=  $(CVS2CL_AMFLAGS) $(CVS2CL_FLAGS)
 
 confdir                        =  $(sysconfdir)/vservers
+confdefaultsdir                =  $(confdir)/.defaults
 sbincfgdir             =  $(sbindir)
+legacydir              =  $(pkglibdir)/legacy
 
 include_HEADERS                =  $(lib_HDRS)
 noinst_HEADERS         =  $(src_HDRS) $(lib_XHDRS) compat.h
 
 lib_LIBRARIES          =  $(lib_lib_LIBS)
-#lib_LTLIBRARIES               =  $(lib_lib_LTLIBS)
+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)
 
 sbincfg_DATA           =  $(scripts_sbincfg_DTA)
 
@@ -45,24 +49,26 @@ noinst_PROGRAMS             =  $(test_PRGS)
 initrd_SCRIPTS         =  $(sysv_SCRPTS)
 sysconf_DATA           =  $(sysv_CFG)
 
-DIETPROGS              =  $(src_DIETPROGS) $(tests_DIETPROGS)
+DIETPROGS              =  $(src_DIETPROGS) $(tests_DIETPROGS) $(lib_DIETPROGS)
 
 BUILT_SOURCES          =  linuxcaps.h pathconfig.h linuxvirtual.h
 
 man_MANS               =  $(man_DATMAN)
 
-m4_FILES               =  m4/ensc_cflags.m4 m4/ensc_kerneldir.m4 \
-                          m4/ensc_changelog.m4 m4/ensc_uv_vrootdir.m4 \
-                          m4/ensc_fpicsyscall.m4 m4/ensc_cxxcompiler.m4
-
 EXTRA_PROGRAMS         =  $(src_EXTRA_PROGS)
 EXTRA_DIST             =  $(sysv_XTRAS) $(sysv_CFG) \
                            $(doc_DAT) $(man_DATMAN) \
-                          $(scripts_XTRAS) $(m4_FILES) \
+                          $(scripts_XTRAS) $(src_XTRAS) \
                           pathconfig.h.pathsubst \
                           util-vserver.spec \
                           THANKS
 
+check_PROGRAMS         =  $(src_check_PRGS)
+check_SCRIPTS          =  $(src_check_SCRPTS)
+TESTS                  =  $(src_TSTS)
+
+TESTS_ENVIRONMENT      =  $(src_TESTS_ENV)
+
 AM_CPPFLAGS            =  -I $(top_srcdir)/lib -D _GNU_SOURCE $(RELEASE_CPPFLAGS)
 
 CLEANFILES             =  $(sysv_GENSCRPTS) $(scripts_CLEANFILES) $(BUILT_SOURCES) \
@@ -77,26 +83,35 @@ if USE_DIETLIBC
 DIET                   =  diet
 DIET_FLAGS             =
 DIET_CC                       :=  $(DIET) $(DIET_FLAGS) $(CC)
+DIET_LIBTOOL          :=  $(LIBTOOL) --tag CC
+VSERVER_LDFLAGS               :=  -static
+else
+VSERVER_LDFLAGS               :=
 endif
 
 linuxcaps.h:           ${kernelincludedir}/linux/capability.h Makefile
                        @rm -f $@
                        echo '#include <stdint.h>' >$@.tmp
-                       sed -e 's!^#include .*!!g;s!\<__u32\>!uint32_t!g' $< >>$@.tmp
+                       sed -e 's!^#include .*!!g;s!\<__u32\>!uint32_t!g;s!\<__user\>!!g;' $< >>$@.tmp
                        @-chmod --reference $< $@.tmp &>/dev/null
                        mv -f $@.tmp $@
                        @chmod a-w $@
 
 
 linuxvirtual.h:
+if ENSC_ENABLE_INTERNAL_HEADERS
+                       ln -sf '$(top_srcdir)/lib/virtual.h' '$@'
+else
                        ln -sf '$(kernelincludedir)/linux/virtual.h' '$@' && test -e '$@' || \
                        ln -sf '$(top_srcdir)/lib/virtual.h' '$@'
+endif
 
 pathsubst_RULES                =  s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
                           s!@'SBINDIR'@!$(sbindir)!g; \
                           s!@'CONFDIR'@!$(confdir)!g; \
                           s!@'SYSCONFDIR'@!$(sysconfdir)!g; \
                           s!@'PKGSTATEDIR'@!$(pkgstatedir)!g; \
+                          s!@'PKGSTATEREVDIR'@!$(pkgstaterevdir)!g; \
                           s!@'VSERVERDIR'@!$(vserverdir)!g; \
                           s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \
                           s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \
@@ -133,16 +148,22 @@ pathconfig.h:             .pathconfig.h.pathsubst.stamp
                        @touch '$@'
 
 pkgstatedir            =  $(localstatedir)/run/vservers
+pkgstaterevdir         =  $(pkgstatedir).rev
 vserverpkgdir          =  $(vserverdir)/.pkg
 
 install-data-hook:
-                       $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir)/rev
+                       $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir) $(DESTDIR)$(pkgstaterevdir)
+                       $(mkinstalldirs) -m 755 $(DESTDIR)$(confdefaultsdir)/{apps/pkgmgmt,files}
+                       f=$(DESTDIR)$(confdefaultsdir)/vdirbase; test -e "$$f" || ln -s '$(vserverdir)'     "$$f"
+                       f=$(DESTDIR)$(confdefaultsdir)/run.rev;  test -e "$$f" || ln -s '$(pkgstaterevdir)' "$$f"
 
 install-vserverdir:
                        $(mkinstalldirs) $(DESTDIR)$(vserverdir) $(DESTDIR)$(vserverpkgdir)
 
 if USE_DIETLIBC
-$(DIETPROGS):          LIBTOOL=$(LIBTOOL) --tag CC
+$(addsuffix $(EXEEXT), $(DIETPROGS)) \
+$(addsuffix $(OBJEXT), $(DIETPROGS)) \
+               :               LIBTOOL=$(DIET_LIBTOOL)
 
 $(addsuffix $(EXEEXT), $(DIETPROGS)) \
 $(addsuffix $(OBJEXT), $(DIETPROGS)) \