Autogen update

12 files changed, 103 insertions, 5 deletions

diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644
index 0000000..c4c9875
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,5 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = getiversion getkversion locktest rpcdebug rpcgen nlmtest
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/tools/getiversion/Makefile.am b/tools/getiversion/Makefile.am
new file mode 100644
index 0000000..7d7172e
--- /dev/null
+++ b/tools/getiversion/Makefile.am
@@ -0,0 +1,12 @@
+## Process this file with automake to produce Makefile.in
+
+CC=$(CC_FOR_BUILD)
+LIBTOOL = @LIBTOOL@ --tag=CC
+
+noinst_PROGRAMS = getiversion
+getiversion_SOURCES = getiversion.c
+getiversion_CFLAGS=$(CFLAGS_FOR_BUILD)
+getiversion_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
+getiversion_LDFLAGS=$(LDFLAGS_FOR_BUILD)
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/tools/getiversion/getiversion.c b/tools/getiversion/getiversion.c
index e9cb391..fdaf102 100644
--- a/tools/getiversion/getiversion.c
+++ b/tools/getiversion/getiversion.c
@@ -4,11 +4,22 @@
  * Get version number for an inode on an ext2 file system.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+
 #include <stdio.h>
 #include <sys/fs/ext2fs.h>
 
diff --git a/tools/getkversion/Makefile.am b/tools/getkversion/Makefile.am
new file mode 100644
index 0000000..4f89892
--- /dev/null
+++ b/tools/getkversion/Makefile.am
@@ -0,0 +1,12 @@
+## Process this file with automake to produce Makefile.in
+
+CC=$(CC_FOR_BUILD)
+LIBTOOL = @LIBTOOL@ --tag=CC
+
+noinst_PROGRAMS = getkversion
+getkversion_SOURCES = getkversion.c
+getkversion_CFLAGS=$(CFLAGS_FOR_BUILD)
+getkversion_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+getkversion_LDFLAGS=$(LDFLAGS_FOR_BUILD)
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/tools/getkversion/getkversion.c b/tools/getkversion/getkversion.c
index f8faf0a..abe1705 100644
--- a/tools/getkversion/getkversion.c
+++ b/tools/getkversion/getkversion.c
@@ -4,7 +4,9 @@
  * running on a different kernel.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <linux/version.h>
 #include <stdio.h>
diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am
new file mode 100644
index 0000000..3156815
--- /dev/null
+++ b/tools/locktest/Makefile.am
@@ -0,0 +1,12 @@
+## Process this file with automake to produce Makefile.in
+
+CC=$(CC_FOR_BUILD)
+LIBTOOL = @LIBTOOL@ --tag=CC
+
+noinst_PROGRAMS = testlk
+testlk_SOURCES = testlk.c
+testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
+testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/tools/locktest/testlk.c b/tools/locktest/testlk.c
index 47eb40a..b392f71 100644
--- a/tools/locktest/testlk.c
+++ b/tools/locktest/testlk.c
@@ -1,4 +1,6 @@
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/tools/nlmtest/Makefile.am b/tools/nlmtest/Makefile.am
new file mode 100644
index 0000000..fbf9fb3
--- /dev/null
+++ b/tools/nlmtest/Makefile.am
@@ -0,0 +1,7 @@
+## Process this file with automake to produce Makefile.in
+
+EXTRA_DIST = \
+	README \
+	host.h \
+	nlm_prot.x \
+	nlmtest.c
diff --git a/tools/rpcdebug/Makefile.am b/tools/rpcdebug/Makefile.am
new file mode 100644
index 0000000..409c98f
--- /dev/null
+++ b/tools/rpcdebug/Makefile.am
@@ -0,0 +1,14 @@
+## Process this file with automake to produce Makefile.in
+
+CC=$(CC_FOR_BUILD)
+LIBTOOL = @LIBTOOL@ --tag=CC
+
+EXTRA_DIST= neat_idea.c
+
+noinst_PROGRAMS = rpcdebug
+rpcdebug_SOURCES = rpcdebug.c
+rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD)
+rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
+rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/tools/rpcdebug/neat_idea.c b/tools/rpcdebug/neat_idea.c
index ddaee2e..7ca9d6f 100644
--- a/tools/rpcdebug/neat_idea.c
+++ b/tools/rpcdebug/neat_idea.c
@@ -11,7 +11,9 @@
  * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/rpcdebug/rpcdebug.c b/tools/rpcdebug/rpcdebug.c
index bbe57b1..89e0f35 100644
--- a/tools/rpcdebug/rpcdebug.c
+++ b/tools/rpcdebug/rpcdebug.c
@@ -15,7 +15,7 @@
  *
  */
 
-#include "config.h"
+/* #include "config.h" */
 
 #include <sys/types.h>
 #include <stdio.h>
@@ -23,6 +23,7 @@
 #include <getopt.h>
 #include <unistd.h>
 #include <string.h>
+#include <malloc.h>
 #include <fcntl.h>
 #include <ctype.h>
 /* RPC debug flags
diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am
new file mode 100644
index 0000000..51a2bfa
--- /dev/null
+++ b/tools/rpcgen/Makefile.am
@@ -0,0 +1,18 @@
+## Process this file with automake to produce Makefile.in
+
+CC=$(CC_FOR_BUILD)
+LIBTOOL = @LIBTOOL@ --tag=CC
+
+noinst_PROGRAMS = rpcgen
+rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
+	       	 rpc_parse.c rpc_scan.c rpc_svcout.c rpc_tblout.c \
+		 rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
+		 rpc_scan.h rpc_util.h
+
+rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
+rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
+rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
+
+MAINTAINERCLEANFILES = Makefile.in
+
+EXTRA_DIST = rpcgen.new.1