use the VCMD_* macros instead of the VC_CMD(...) macros
[util-vserver.git] / util-vserver / Makefile.am
index 746a9cd..52dd450 100644 (file)
@@ -1,6 +1,6 @@
 ## $Id$
 
-# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+# Copyright (C) 2003,2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 #  
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,49 +26,57 @@ 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
+noinst_HEADERS         =  $(src_HDRS) $(lib_XHDRS) compat.h compat-c99.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)
 
-sbin_SCRIPTS           =  $(scripts_sbin_PRGS)
+sbin_SCRIPTS           =  $(scripts_sbin_PRGS) $(src_sbin_SCRPTS)
 sbin_PROGRAMS          =  $(src_sbin_PRGS)
 noinst_PROGRAMS                =  $(test_PRGS)
+noinst_DATA            =  $(contrib_DTA)
 
 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) $(src_XTRAS) \
+                       $(contrib_XTRAS) \
+                       pathconfig.h.pathsubst \
+                       util-vserver.spec \
+                       THANKS
 
-EXTRA_PROGRAMS         =  $(src_EXTRA_PROGS)
-EXTRA_DIST             =  $(sysv_XTRAS) $(sysv_CFG) \
-                           $(doc_DAT) $(man_DATMAN) \
-                          $(scripts_XTRAS) $(m4_FILES) \
-                          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) \
-                          .*.pathsubst.stamp */.*.pathsubst.stamp \
-                          linuxcaps.h pathconfig.h
+CLEANFILES =           $(sysv_GENSCRPTS) $(scripts_CLEANFILES) $(BUILT_SOURCES) \
+                       $(contrib_CLEANFILES) \
+                       .*.pathsubst.stamp */.*.pathsubst.stamp */*/.*.pathsubst.stamp \
+                       linuxcaps.h pathconfig.h
 
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT     =  $(src_OPTIONS_EXEMPT) \
                                           $(scripts_OPTIONS_EXEMPT) \
@@ -78,6 +86,10 @@ 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
@@ -98,6 +110,7 @@ else
 endif
 
 pathsubst_RULES                =  s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
+                          s!@'LEGACYDIR'@!$(legacydir)!g; \
                           s!@'SBINDIR'@!$(sbindir)!g; \
                           s!@'CONFDIR'@!$(confdir)!g; \
                           s!@'SYSCONFDIR'@!$(sysconfdir)!g; \
@@ -108,6 +121,7 @@ pathsubst_RULES             =  s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
                           s!@'VSERVERPKGDIR'@!$(vserverpkgdir)!g; \
                           s!@'INITRDDIR'@!$(initrddir)!g; \
                           s!@'LIBDIR'@!$(libdir)!g; \
+                          s!@'MANDIR'@!$(mandir)!g; \
                           s!@'INCLUDEDIR'@!$(includedir)!g; \
                           s!@'PACKAGE_BUGREPORT'@!$(PACKAGE_BUGREPORT)!g; \
                           s!@'PACKAGE_NAME'@!$(PACKAGE_NAME)!g; \
@@ -121,6 +135,7 @@ pathsubst_RULES             =  s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
                           s!@'UMOUNT'@!$(UMOUNT)!g; \
                           s!@'NICE'@!$(NICE)!g; \
                           s!@'VCONFIG'@!$(VCONFIG)!g; \
+                          s!@'PS'@!$(PS)!g; \
                           s!@'WC'@!$(WC)!g
 
 pathconfig.h:          .pathconfig.h.pathsubst.stamp
@@ -152,7 +167,9 @@ 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)) \
@@ -166,6 +183,7 @@ include $(top_srcdir)/man/Makefile-files
 include $(top_srcdir)/scripts/Makefile-files
 include $(top_srcdir)/tests/Makefile-files
 include $(top_srcdir)/sysv/Makefile-files
+include $(top_srcdir)/contrib/Makefile-files
 
 include $(top_srcdir)/m4/gpgsig.am
 include $(top_srcdir)/m4/validate.am