X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftestsuite%2FMakefile-files;h=480302ee64d1f3a77e878a680348ab869eaead9b;hb=be766a320397bace4e8ad1a02d543393dd633d9c;hp=3e9b2a161b40fa8caab4cbb22d6c6c13e9be8d99;hpb=9c78378bebc1a9f3d400f422df8ede9efea57dea;p=util-vserver.git diff --git a/src/testsuite/Makefile-files b/src/testsuite/Makefile-files index 3e9b2a1..480302e 100644 --- a/src/testsuite/Makefile-files +++ b/src/testsuite/Makefile-files @@ -1,16 +1,16 @@ ## $Id$ --*- makefile -*-- ## Copyright (C) 2003 Enrico Scholz -## +## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; version 2 of the License. -## +## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -## +## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -22,7 +22,7 @@ src_testsuite_check_active_PRGS = src/testsuite/vunify-functest \ src_testsuite_check_passive_PRGS = src/testsuite/rpm-fake-test if ENSC_HAVE_C99_COMPILER -if ENSC_HAVE_BEECRYPT +if ENSC_HAVE_CRYPTO src_testsuite_check_passive_PRGS += src/testsuite/hashcalc \ src/testsuite/hashcalc-plain endif @@ -33,7 +33,7 @@ check_PROGRAMS += $(src_testsuite_check_passive_PRGS) \ if ENSC_HAVE_C99_COMPILER src_testsuite_check_src_C99_SCRPTS = src/testsuite/vunify-test.sh -if ENSC_HAVE_BEECRYPT +if ENSC_HAVE_CRYPTO src_testsuite_check_src_C99_SCRPTS += src/testsuite/hashcalc-plain.sh \ src/testsuite/hashcalc.sh endif @@ -57,34 +57,43 @@ EXTRA_DIST += $(src_testsuite_check_src_SCRPTS) \ src/testsuite/hashcalc-plain.sh \ src/testsuite/vwait-test.sh +DIETPROGS += src/testsuite/vunify-functest \ + src/testsuite/chcontext-test \ + src/testsuite/chbind-test \ + src/testsuite/rpm-fake-test + src_testsuite_rpm_fake_test_SOURCES = src/testsuite/rpm-fake-test.c src_testsuite_vunify_functest_SOURCES = src/testsuite/vunify-functest.c src_testsuite_vunify_functest_LDADD = $(LIBINTERNAL) src_testsuite_vunify_functest_CPPFLAGS= $(AM_CPPFLAGS) $(src_testsuite_CPPFLAGS) - src_testsuite_chcontext_test_SOURCES = src/testsuite/chcontext-test.c -src_testsuite_chcontext_test_LDADD = lib/libvserver.la $(LIBINTERNAL) - +src_testsuite_chcontext_test_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL) src_testsuite_chbind_test_SOURCES = src/testsuite/chbind-test.c -src_testsuite_chbind_test_LDADD = lib/libvserver.la +src_testsuite_chbind_test_LDADD = $(LIBVSERVER) 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_CFLAGS = $(AM_CFLAGS) $(ENSC_CRYPTO_CFLAGS) +src_testsuite_hashcalc_plain_CFLAGS = $(AM_CFLAGS) $(ENSC_CRYPTO_CFLAGS) + +if ENSC_CAN_CRYPTO_WITH_DIETLIBC +DIETPROGS += src/testsuite/hashcalc \ + src/testsuite/hashcalc-plain + +src_testsuite_hashcalc_LDADD = $(LIBINTERNAL) $(LIBENSCVECTOR) $(ENSC_CRYPTO_LIB) $(VSERVER_LDADDS) src_testsuite_hashcalc_LDFLAGS = $(VSERVER_LDFLGS) -src_testsuite_hashcalc_plain_LDADD = $(LIBINTERNAL) $(LIBENSCVECTOR) -lbeecrypt $(VSERVER_LDADDS) +src_testsuite_hashcalc_plain_LDADD = $(LIBINTERNAL) $(LIBENSCVECTOR) $(ENSC_CRYPTO_LIB) $(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_LDADD = $(LIBINTERNAL_GLIBC) $(LIBENSCVECTOR_GLIBC) $(LIBVSERVER_GLIBC) $(ENSC_CRYPTO_LIB) +src_testsuite_hashcalc_LDFLAGS = -Wl,--as-needed -src_testsuite_hashcalc_plain_LDADD = $(LIBINTERNAL_GLIBC) $(LIBENSCVECTOR_GLIBC) $(LIBVSERVER_GLIBC) -lbeecrypt -src_testsuite_hashcalc_plain_LDFLAGS = +src_testsuite_hashcalc_plain_LDADD = $(LIBINTERNAL_GLIBC) $(LIBENSCVECTOR_GLIBC) $(LIBVSERVER_GLIBC) $(ENSC_CRYPTO_LIB) +src_testsuite_hashcalc_plain_LDFLAGS = -Wl,--as-needed endif src_testsuite_CPPFLAGS = -I $(top_srcdir)/src -D ENSC_TESTSUITE