src_sbin_CXX_PROGS = src/vfiles
src_pkglib_CXX_PROGS = src/vbuild src/vcheck
-src_pkglib_C99_PROGS = src/vunify src/vcopy src/vhashify
+src_pkglib_C99_PROGS = src/vunify src/vcopy
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \
src/vreboot \
src/save_ctxinfo \
src/mask2prefix \
- src/chroot-cat \
src/ifspec \
src/rebootmgr \
src/vdu \
src/vrsetup \
src/vserver-stat \
src/vserver-info \
- src/vdlimit
+ src/vdlimit \
+ src/vwait
-if CAN_BEECRYPT_WITH_DIETLIBC
+if ENSC_CAN_BEECRYPT_WITH_DIETLIBC
DIETPROGS += src/vhashify
endif
src/vunify.h \
src/vunify-init.hc \
src/vhashify.h \
- src/vhashify-init.hc
+ src/vhashify-init.hc \
src/vserver-visitdir.hc \
src/context-sync.hc \
src/vserver.hh
$(src_pkglib_C99_X_PROGS) \
$(src_pkglib_CXX_X_PROGS)
+if ENSC_HAVE_C99_COMPILER
+if ENSC_HAVE_BEECRYPT
+pkglib_PROGRAMS += src/vhashify
+endif ENSC_HAVE_BEECRYPT
+endif ENSC_HAVE_C99_COMPILER
+
legacy_PROGRAMS += src/ifspec \
src/listdevip \
src/parserpmdump \
src/vdu \
src/vattribute \
src/vcontext \
- src/vdlimit \
src/vlimit \
src/vkill \
src/vnamespace \
src/vserver-stat \
src/vserver-info \
src/vuname \
+ src/vwait \
$(src_sbin_CXX_X_PROGS)
+if ENSC_HAVE_C99_COMPILER
+sbin_PROGRAMS += src/vdlimit
+endif
+
+
src_capchroot_SOURCES = src/capchroot.c
src_capchroot_LDADD = $(VSERVER_LDADDS)
src_capchroot_LDFLAGS = $(VSERVER_LDFLGS)
src_vserver_info_LDFLAGS = $(VSERVER_LDFLGS)
src_vserver_stat_SOURCES = src/vserver-stat.c
-src_vserver_stat_LDADD = $(LIBINTERNAL) $(VSERVER_LDADDS) libensc_vector.a
+src_vserver_stat_LDADD = $(LIBINTERNAL) $(VSERVER_LDADDS) $(LIBENSCVECTOR)
src_vserver_stat_LDFLAGS = $(VSERVER_LDFLGS)
src_vfiles_SOURCES = src/vfiles.cc src/vutil.cc src/vserver.cc
src_vcheck_SOURCES = src/vcheck.cc src/vutil.cc src/vserver.cc
src_lsxid_SOURCES = src/fstool.c src/lsxid.c
-src_lsxid_LDADD = $(LIBINTERNAL) $(VSERVER_LDADDS) libensc_vector.a
+src_lsxid_LDADD = $(LIBINTERNAL) $(VSERVER_LDADDS) $(LIBENSCVECTOR)
src_lsxid_LDFLAGS = $(VSERVER_LDFLGS)
src_chxid_SOURCES = src/fstool.c src/chxid.c
src_vunify_LDFLAGS = $(VSERVER_LDFLGS)
src_vhashify_SOURCES = src/vhashify.c
-if CAN_BEECRYPT_WITH_DIETLIBC
-src_vhashify_LDADD = $(LIBINTERNAL) libensc_vector.a -lbeecrypt $(VSERVER_LDADDS)
+if ENSC_CAN_BEECRYPT_WITH_DIETLIBC
+src_vhashify_LDADD = $(LIBINTERNAL) $(LIBENSCVECTOR) -lbeecrypt $(VSERVER_LDADDS)
src_vhashify_LDFLAGS = $(VSERVER_LDFLGS)
else
-src_vhashify_LDADD = $(LIBINTERNAL_GLIBC) libensc_vector.a lib/libvserver.la -lbeecrypt
+src_vhashify_LDADD = $(LIBINTERNAL_GLIBC) $(LIBENSCVECTOR_GLIBC) $(LIBVSERVER_GLIBC) -lbeecrypt
src_vhashify_LDFLAGS =
endif
src_rpm_fake_la_SOURCES = src/rpm-fake.c
src_rpm_fake_la_CFLAGS = $(AM_CFLAGS)
src_rpm_fake_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir)
-src_rpm_fake_la_LIBADD = lib/libvserver.la -ldl
+src_rpm_fake_la_LIBADD = $(LIBVSERVER_GLIBC) -ldl
src_vdlimit_SOURCES = src/vdlimit.c
src_vdlimit_LDADD = $(VSERVER_LDADDS)
src_vdlimit_LDFLAGS = $(VSERVER_LDFLGS)
+src_vwait_SOURCES = src/vwait.c
+src_vwait_LDADD = $(VSERVER_LDADDS)
+src_vwait_LDFLAGS = $(VSERVER_LDFLGS)
+
EXTRA_PROGRAMS += $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS)
TESTS_ENVIRONMENT += srctestsuitedir=$(top_builddir)/src/testsuite