use recursive make for distrib: added it to SUBDIRS and remove old
[util-vserver.git] / util-vserver / Makefile.am
index 8c34f66..82c3ffe 100644 (file)
 #  
 
 ACLOCAL_AMFLAGS                =  -I m4
+SUBDIRS                        =  . distrib
 
 sysvdir                        =  $(sysconfdir)/init.d
-vservercfgdir          =  $(sysconfdir)/vservers
+confdir                        =  $(sysconfdir)/vservers
 
 include_HEADERS                =  $(lib_HDRS)
 noinst_HEADERS         =  $(src_HDRS)
 
 lib_LIBRARIES          =  $(lib_lib_LIBS)
 
-pkglib_SCRIPTS         =  $(distrib_SCRPTS) $(scripts_SCRPTS)
-pkglib_DATA            =  $(distrib_DAT) $(scriptscfg_DATA)
+pkglib_SCRIPTS         =  $(scripts_SCRPTS)
+pkglib_DATA            =  $(scriptscfg_DATA)
 pkglib_PROGRAMS                =  $(src_pkglib_PRGS)
 
 sbin_SCRIPTS           =  $(scripts_PRGS)
@@ -37,14 +38,13 @@ noinst_PROGRAMS             =  $(test_PRGS)
 
 sysv_SCRIPTS           =  $(sysv_SCRPTS)
 sysconf_DATA           =  $(sysv_CFG)
-vservercfg_DATA                =  newvserver.defaults
+conf_DATA              =  newvserver.defaults
 
 BUILT_SOURCES          =  linuxcaps.h
 
 man_MANS               =  $(man_DATMAN)
 
-EXTRA_DIST             =  $(distrib_SCRPTS) $(distrib_DAT) \
-                          $(sysv_XTRAS) $(sysv_CFG) \
+EXTRA_DIST             =  $(sysv_XTRAS) $(sysv_CFG) \
                            $(doc_DAT) $(man_DATMAN) \
                           $(scripts_SCRPTS) $(scripts_PRGS) $(scripts_XTRAS) \
                           vserver.spec newvserver.defaults \
@@ -56,6 +56,11 @@ AM_CFLAGS            =  -Wall -pedantic
 
 CLEANFILES             =  $(sysv_GENSCRPTS) $(scripts_GENSCRPTS) linuxcaps.h
 
+if USE_DIETLIBC
+DIET                   =  diet
+DIET_FLAGS             =
+DIET_CC                       :=  $(DIET) $(DIET_FLAGS) $(CC)
+endif
 
 linuxcaps.h:
                ln -sf ${kernelincludedir}/linux/capability.h linuxcaps.h
@@ -63,7 +68,6 @@ linuxcaps.h:
 
 include $(top_srcdir)/lib/Makefile-files
 include $(top_srcdir)/src/Makefile-files
-include $(top_srcdir)/distrib/Makefile-files
 include $(top_srcdir)/doc/Makefile-files
 include $(top_srcdir)/man/Makefile-files
 include $(top_srcdir)/scripts/Makefile-files