X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftestsuite%2FMakefile-files;h=bd6854edfdd61630b67001df4a9b660b3a6119b0;hb=2822ba293eb308225c50d346930c47bf98d9927b;hp=2000d0b7aee9afa7e5245c91613a01493c49ecea;hpb=2894fc5a4c8335e4d7221311fed0556f33f8047c;p=util-vserver.git

diff --git a/src/testsuite/Makefile-files b/src/testsuite/Makefile-files
index 2000d0b..bd6854e 100644
--- a/src/testsuite/Makefile-files
+++ b/src/testsuite/Makefile-files
@@ -1,4 +1,4 @@
-## $Id: Makefile-files 2245 2006-01-04 17:28:42Z ensc $		--*- makefile -*--
+## $Id: Makefile-files,v 1.9 2005/03/17 14:54:18 ensc Exp $		--*- makefile -*--
 
 ## Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 ##  
@@ -18,25 +18,14 @@
 src_testsuite_check_active_PRGS =	src/testsuite/vunify-functest \
 					src/testsuite/chcontext-test \
 					src/testsuite/chbind-test
-
 src_testsuite_check_passive_PRGS =	src/testsuite/rpm-fake-test
 
-if ENSC_HAVE_C99_COMPILER
-if ENSC_HAVE_BEECRYPT
-src_testsuite_check_passive_PRGS +=	src/testsuite/hashcalc		\
-					src/testsuite/hashcalc-plain
-endif
-endif
 
 check_PROGRAMS +=			$(src_testsuite_check_passive_PRGS) \
 					$(src_testsuite_check_active_PRGS)
 
 if ENSC_HAVE_C99_COMPILER
 src_testsuite_check_src_C99_SCRPTS =	src/testsuite/vunify-test.sh
-if ENSC_HAVE_BEECRYPT
-src_testsuite_check_src_C99_SCRPTS +=	src/testsuite/hashcalc-plain.sh		\
-					src/testsuite/hashcalc.sh
-endif
 else
 src_testsuite_check_src_C99_SCRPTS =
 endif
@@ -51,11 +40,8 @@ TESTS +=				$(src_testsuite_check_active_PRGS) \
 					$(src_testsuite_check_src_SCRPTS) \
 					$(src_testsuite_check_gen_SCRPTS)
 
-EXTRA_DIST +=				$(src_testsuite_check_src_SCRPTS) \
-					src/testsuite/vunify-test.sh \
-					src/testsuite/hashcalc.sh \
-					src/testsuite/hashcalc-plain.sh \
-					src/testsuite/vwait-test.sh
+EXTRA_DIST +=				$(src_testsuite_check_src_SCRPTS)
+
 
 src_testsuite_rpm_fake_test_SOURCES =	src/testsuite/rpm-fake-test.c
 
@@ -71,21 +57,6 @@ src_testsuite_chcontext_test_LDADD =	lib/libvserver.la $(LIBINTERNAL)
 src_testsuite_chbind_test_SOURCES =	src/testsuite/chbind-test.c
 src_testsuite_chbind_test_LDADD =	lib/libvserver.la
 
-src_testsuite_hashcalc_SOURCES =	src/testsuite/hashcalc.c
-src_testsuite_hashcalc_plain_SOURCES =	src/testsuite/hashcalc-plain.c
-if ENSC_CAN_BEECRYPT_WITH_DIETLIBC
-src_testsuite_hashcalc_LDADD =		$(LIBINTERNAL) $(LIBENSCVECTOR) -lbeecrypt $(VSERVER_LDADDS)
-src_testsuite_hashcalc_LDFLAGS =	$(VSERVER_LDFLGS)
-
-src_testsuite_hashcalc_plain_LDADD =	$(LIBINTERNAL) $(LIBENSCVECTOR) -lbeecrypt $(VSERVER_LDADDS)
-src_testsuite_hashcalc_plain_LDFLAGS =	$(VSERVER_LDFLGS)
-else
-src_testsuite_hashcalc_LDADD =		$(LIBINTERNAL_GLIBC) $(LIBENSCVECTOR_GLIBC) $(LIBVSERVER_GLIBC) -lbeecrypt
-src_testsuite_hashcalc_LDFLAGS =
-
-src_testsuite_hashcalc_plain_LDADD =	$(LIBINTERNAL_GLIBC) $(LIBENSCVECTOR_GLIBC) $(LIBVSERVER_GLIBC) -lbeecrypt
-src_testsuite_hashcalc_plain_LDFLAGS =
-endif
 
 src_testsuite_CPPFLAGS =		-I $(top_srcdir)/src -D ENSC_TESTSUITE