X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=52dd450ff31216a52cb62648c67624a2b60b2041;hb=1c06f3a52e3719e75d2d5919d3bc513d3f432831;hp=3bac059f8889e6dec690886c17093283219a38c5;hpb=ad303aa34f61d70d7fff58c044e259d48fc0f2d1;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 3bac059..52dd450 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -1,6 +1,6 @@ ## $Id$ -# Copyright (C) 2003 Enrico Scholz +# Copyright (C) 2003,2004 Enrico Scholz # # 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 @@ -24,50 +24,59 @@ 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 +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) \ @@ -77,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 @@ -89,10 +102,15 @@ linuxcaps.h: ${kernelincludedir}/linux/capability.h Makefile 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!@'LEGACYDIR'@!$(legacydir)!g; \ s!@'SBINDIR'@!$(sbindir)!g; \ s!@'CONFDIR'@!$(confdir)!g; \ s!@'SYSCONFDIR'@!$(sysconfdir)!g; \ @@ -103,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; \ @@ -116,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 @@ -139,12 +159,17 @@ vserverpkgdir = $(vserverdir)/.pkg install-data-hook: $(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)) \ @@ -158,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