provide/conflict with vserver-admin
[util-vserver.git] / util-vserver / Makefile.am
index 4a20e80..32d203e 100644 (file)
@@ -27,39 +27,45 @@ noinst_HEADERS              =  $(src_HDRS) $(lib_XHDRS) compat.h
 
 lib_LIBRARIES          =  $(lib_lib_LIBS)
 
-pkglib_SCRIPTS         =  $(distrib_SCRPTS) $(scripts_SCRPTS)
+pkglib_SCRIPTS         =  $(distrib_SCRPTS) $(scripts_SCRPTS) $(src_pkglib_SCRPTS)
 pkglib_DATA            =  $(distrib_DAT) $(scriptscfg_DATA)
 pkglib_PROGRAMS                =  $(src_pkglib_PRGS)
 
-sbin_SCRIPTS           =  $(scripts_PRGS)
+sbin_SCRIPTS           =  $(scripts_PRGS) $(linuxconf_SCRPTS)
 sbin_PROGRAMS          =  $(src_sbin_PRGS)
 noinst_PROGRAMS                =  $(test_PRGS)
 
 sysv_SCRIPTS           =  $(sysv_SCRPTS)
 sysconf_DATA           =  $(sysv_CFG)
-vservercfg_DATA                =  newvserver.defaults
+vservercfg_DATA                =  $(linuxconf_cfg_DTA)
 
-BUILT_SOURCES          =  linuxcaps.h
+BUILT_SOURCES          =  linuxcaps.h linuxvirtual.h
 
-man_MANS               =  $(man_DATMAN)
+man_MANS               =  $(man_DATMAN) $(linuxconf_DATMAN)
 
 EXTRA_DIST             =  $(distrib_SCRPTS) $(distrib_DAT) \
                           $(sysv_XTRAS) $(sysv_CFG) \
-                           $(doc_DAT) $(man_DATMAN) \
-                          $(scripts_SCRPTS) $(scripts_PRGS) $(scripts_XTRAS) \
-                          vserver.spec newvserver.defaults \
-                           m4/ensc_cflags.m4 \
+                           $(doc_DAT) $(man_DATMAN) $(linuxconf_DATMAN) \
+                          $(scripts_SCRPTS) $(scripts_XTRAS) \
+                          $(linuxconf_XTRAS) \
+                          util-vserver.spec \
+                           m4/ensc_cflags.m4 m4/ensc_kerneldir.m4 \
                           THANKS
 
 AM_CPPFLAGS            =  -I $(top_srcdir)/lib -D VERSION=\"$(VERSION)\" -D PKGLIBDIR=\"$(pkglibdir)\" -D _GNU_SOURCE
 AM_CFLAGS              =  -Wall -pedantic
 
-CLEANFILES             =  $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) linuxcaps.h
+CLEANFILES             =  $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) \
+                          $(linuxconf_GENFILES) \
+                          $(BUILT_SOURCES)
 
 
 linuxcaps.h:
                ln -sf ${kernelincludedir}/linux/capability.h linuxcaps.h
 
+linuxvirtual.h:
+               ln -sf '$(kernelincludedir)/linux/virtual.h' '$@' && test -e '$@' || \
+               ln -sf '$(top_srcdir)/lib/virtual.h' '$@'
 
 include $(top_srcdir)/lib/Makefile-files
 include $(top_srcdir)/src/Makefile-files
@@ -69,6 +75,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)/linuxconf/Makefile-files
 
 include $(top_srcdir)/m4/gpgsig.am
 include $(top_srcdir)/m4/validate.am