Build system: MT_LIBS includes XLIBS

[openafs.git] / src / rxkad / test / Makefile.in

diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in
index e3fdd3d..c4f6c43 100644 (file)
--- a/src/rxkad/test/Makefile.in
+++ b/src/rxkad/test/Makefile.in
@@ -8,11 +8,7 @@
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 include @TOP_OBJDIR@/src/config/Makefile.lwp
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+top_builddir=@TOP_OBJDIR@
 
 
 CFLAGS=-g -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
@@ -27,18 +23,20 @@ LIBS=${TOP_LIBDIR}/libauth.a \
        ${TOP_LIBDIR}/librxkad.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a \
        ${TOP_LIBDIR}/librx.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/util.a
 
-THLIBS= ${TOP_LIBDIR}/libcmd.a  ${TOP_LIBDIR}/libcom_err.a \
+THLIBS= $(top_builddir)/src/cmd/liboafs_cmd.la  \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \
-       ${MT_LIBS} ${ULIBS} ${XLIBS} ${LIBRPC} -lpthread
+       ${MT_LIBS} ${ULIBS} ${LIBRPC} -lpthread
 
 THRULE = ${MT_CC} $(COMMON_CFLAGS) $(MT_CFLAGS)
 
 noversion all test system: stress
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o stress.cs.c stress.ss.c stress.xdr.c stress.h \
                stress_errs.c stress_errs.h stress th_*
 
@@ -51,7 +49,7 @@ th_stress.ss.o: stress.ss.c
 
 th_stress.cs.o: stress.cs.c
        ${THRULE} -c stress.cs.c -o th_stress.cs.o
-       
+
 th_stress.xdr.o: stress.xdr.c stress.h
        ${THRULE} -c stress.xdr.c -o th_stress.xdr.o
 
@@ -72,8 +70,15 @@ stress_errs.o: stress_errs.c
 th_stress_errs.o: stress_errs.c
        ${THRULE} -c $(srcdir)/stress_errs.c -o th_stress_errs.o
 
-stress_errs.c stress_errs.h: stress_errs.et
-       $(RM) -f stress_errs.h stress_errs.c; ${COMPILE_ET} -p ${srcdir} stress_errs -h stress_errs
+stress_errs.c: stress_errs.et
+       ${COMPILE_ET_C} -p ${srcdir} stress_errs
+
+stress_errs.h: stress_errs.et
+       ${COMPILE_ET_H} -p ${srcdir} stress_errs
+
+stress_c.o: stress_errs.h
+stress.o: stress_errs.h
+stress_s.o: stress_errs.h
 
 stress.o: ${HEADERS}
 stress_c.o: ${HEADERS}
@@ -89,7 +94,7 @@ th_stress_s.o: stress_s.c ${HEADERS}
        ${THRULE} -c $(srcdir)/stress_s.c -o th_stress_s.o
 
 stress: stress.o stress.xdr.o stress_c.o stress_s.o stress.cs.o \
-               stress.ss.o stress_errs.o 
+               stress.ss.o stress_errs.o
        $(AFS_LDRULE) stress.o stress.xdr.o stress_c.o \
                stress_s.o stress.cs.o stress.ss.o stress_errs.o \
                ${LIBS} ${XLIBS}
@@ -97,7 +102,7 @@ stress: stress.o stress.xdr.o stress_c.o stress_s.o stress.cs.o \
 th_stress: th_stress.o th_stress.xdr.o th_stress_c.o th_stress_s.o \
                th_stress.cs.o th_stress.ss.o stress_errs.o \
                ${LIBRPC}
-       $(AFS_LDRULE) th_stress.o th_stress.xdr.o th_stress_c.o \
+       $(LT_LDRULE_static) th_stress.o th_stress.xdr.o th_stress_c.o \
                th_stress_s.o th_stress.cs.o th_stress.ss.o stress_errs.o \
-               ${THLIBS} ${XLIBS}
+               ${THLIBS}