* added support for ENSC_HAVE_C99_COMPILER and conditionalized build
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Tue, 3 Feb 2004 12:57:13 +0000 (12:57 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Tue, 3 Feb 2004 12:57:13 +0000 (12:57 +0000)
  of 'vunify'
* renamed *_CXX_X_* variables to *_CXX_*

git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@758 94cd875c-1c1d-0410-91d2-eb244daf1a30

util-vserver/src/Makefile-files

index fb41421..3091d44 100644 (file)
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ##  
 
-src_sbin_CXX_X_PROGS   =  src/vfiles
-src_pkglib_CXX_X_PROGS =  src/vbuild src/vcheck
+src_sbin_CXX_PROGS =   src/vfiles
+src_pkglib_CXX_PROGS = src/vbuild src/vcheck
+
+src_pkglib_C99_PROGS = src/vunify
+
 
 src_OPTIONS_EXEMPT     =  src/parserpmdump \
                           src/readlink \
@@ -99,8 +102,8 @@ src_pkglib_PRGS =    src/capchroot \
                        src/pipe-sync \
                        src/exec-ulimit \
                        src/rpm-fake-resolver \
-                       src/vunify \
-                       $(src_pkglib_CXX_PROGS)
+                       $(src_pkglib_C99_X_PROGS) \
+                       $(src_pkglib_CXX_X_PROGS)
 
 src_pkglib_LTLIBS      =  src/rpm-fake.la
 src_lib_LTLIBS         =
@@ -123,7 +126,7 @@ src_sbin_PRGS =             src/chbind \
                        src/vrsetup \
                        src/vserver-stat \
                        src/vserver-info \
-                       $(src_sbin_CXX_PROGS)
+                       $(src_sbin_CXX_X_PROGS)
 
 src_capchroot_SOURCES          =  src/capchroot.c
 src_capchroot_LDADD            =  lib/libvserver.la
@@ -229,16 +232,24 @@ src_check_SCRPTS          =  $(src_testsuite_check_SCRPTS)
 src_TSTS                       =  $(src_testsuite_TSTS)
 src_XTRAS                      =  $(src_testsuite_XTRAS)
 
-src_EXTRA_PROGS                        =  $(src_sbin_CXX_X_PROGS) $(src_pkglib_CXX_X_PROGS)
+src_EXTRA_PROGS                        =  $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS)
 
 src_TESTS_ENV                  =  srctestsuitedir=$(top_builddir)/src/testsuite
 
+if ENSC_HAVE_C99_COMPILER
+src_sbin_C99_X_PROGS =         $(src_sbin_C99_PROGS)
+src_pkglib_C99_X_PROGS =       $(src_pkglib_C99_PROGS)
+else
+src_sbin_C99_X_PROGS =
+src_pkglib_C99_X_PROGS =  
+endif
+
 if ENSC_HAVE_CXX_COMPILER
-src_sbin_CXX_PROGS             =  $(src_sbin_CXX_X_PROGS)
-src_pkglib_CXX_PROGS           =  $(src_pkglib_CXX_X_PROGS)
+src_sbin_CXX_X_PROGS =         $(src_sbin_CXX_PROGS)
+src_pkglib_CXX_X_PROGS =       $(src_pkglib_CXX_PROGS)
 else
-src_sbin__PROGS                        =
-src_pkglib_CXX_PROGS           =  
+src_sbin_CXX_X_PROGS =
+src_pkglib_CXX_X_PROGS =  
 endif
 
 install-exec-hook:             src_install_exec_hook