From 0631fb7567da72e2a9df393beff22fbb98b67011 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Sat, 23 Apr 2011 10:44:53 -0400
Subject: [PATCH] cmd: Make the original test suite build

Make the original, command line driven, test suite build again

Change-Id: I57f0ebb5b1d13acf0809c7fa005e3556e3edb798
Reviewed-on: http://gerrit.openafs.org/4537
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---
 src/cmd/test/.gitignore  | 3 +++
 src/cmd/test/Makefile.in | 3 +--
 src/cmd/test/ctest.c     | 4 ++--
 src/cmd/test/dtest.c     | 4 ++--
 src/cmd/test/itest.c     | 8 ++++----
 5 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 src/cmd/test/.gitignore

diff --git a/src/cmd/test/.gitignore b/src/cmd/test/.gitignore
new file mode 100644
index 000000000..128ca68bd
--- /dev/null
+++ b/src/cmd/test/.gitignore
@@ -0,0 +1,3 @@
+ctest
+dtest
+itest
diff --git a/src/cmd/test/Makefile.in b/src/cmd/test/Makefile.in
index d1bdb43b1..934ec64c3 100644
--- a/src/cmd/test/Makefile.in
+++ b/src/cmd/test/Makefile.in
@@ -14,8 +14,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L..
-LIBS=-lcmd -lcom_err -lafsutil
+LIBS=-lcmd $(TOP_LIBDIR)/libcom_err.a -lafsutil $(LIB_roken) $(XLIBS)
 
 all: test
 test tests: ctest dtest itest
diff --git a/src/cmd/test/ctest.c b/src/cmd/test/ctest.c
index 5e0ef76f8..e9220c8a5 100644
--- a/src/cmd/test/ctest.c
+++ b/src/cmd/test/ctest.c
@@ -10,9 +10,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include "cmd.h"
-#include <stdio.h>
+#include <afs/cmd.h>
 
 static int
 cproc1(struct cmd_syndesc *as, void *arock)
diff --git a/src/cmd/test/dtest.c b/src/cmd/test/dtest.c
index a5201da36..4ab45742d 100644
--- a/src/cmd/test/dtest.c
+++ b/src/cmd/test/dtest.c
@@ -10,9 +10,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include "cmd.h"
-#include <stdio.h>
+#include <afs/cmd.h>
 
 static int
 cproc(struct cmd_syndesc *as, void *arock)
diff --git a/src/cmd/test/itest.c b/src/cmd/test/itest.c
index 5f402aafb..bb0eaf631 100644
--- a/src/cmd/test/itest.c
+++ b/src/cmd/test/itest.c
@@ -10,10 +10,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include "cmd.h"
-#include <stdio.h>
-#include <com_err.h>
+#include <afs/com_err.h>
+#include <afs/cmd.h>
 
 static int
 cproc1(struct cmd_syndesc *as, void *arock)
@@ -49,7 +49,7 @@ main(int argc, char **argv)
 {
     struct cmd_syndesc *ts;
     char tline[1000];
-    long tc;
+    afs_int32 tc;
     char *tp;
     long code;
     char *tv[100];
-- 
2.39.5