pull up r24469, r24530, r24533, r24534, r24535, r24537 from trunk

[krb5.git] / src / tests / shlib / Makefile.in

diff --git a/src/tests/shlib/Makefile.in b/src/tests/shlib/Makefile.in
index 93da98bdc26b2342ebe023eb4904cf98d07f4a6a..d569cacd73e54d739386dc5b6116c403c904d5c0 100644 (file)
--- a/src/tests/shlib/Makefile.in
+++ b/src/tests/shlib/Makefile.in
@@ -1,24 +1,19 @@
-thisconfigdir=./..
-myfulldir=tests/shlib
-mydir=shlib
+mydir=tests$(S)shlib
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
 RUN_SETUP = @KRB5_RUN_ENV@
 
-VALGRIND=valgrind
-VALGRINDFLAGS=--tool=memcheck --leak-check=yes --show-reachable=yes
+#VALGRIND=valgrind
+#VALGRINDFLAGS=--tool=memcheck --leak-check=yes --show-reachable=yes
 
 SRCS=$(srcdir)/t_loader.c
 
 all::
 
 run-t_loader: t_loader
-       $(RUN_SETUP) ./t_loader
-
-valgrind-t_loader: t_loader
-       $(RUN_SETUP) $(VALGRIND) $(VALGRINDFLAGS) ./t_loader
+       $(RUN_SETUP) $(VALGRIND) ./t_loader
 
 t_loader: t_loader.o
        $(CC_LINK) -o t_loader t_loader.o $(DL_LIB)
@@ -30,11 +25,3 @@ install::
 clean::
        $(RM) t_loader.o t_loader
 
-# +++ Dependency line eater +++
-# 
-# Makefile dependencies follow.  This must be the last section in
-# the Makefile.in file
-#
-$(OUTPRE)t_loader.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/krb5.h \
-  $(COM_ERR_DEPS) t_loader.c