8 files changed, 127 insertions, 5 deletions
diff --git a/user_call/Makefile.am b/user_call/Makefile.am
index 5aedbd3..0a176b9 100644
--- a/user_call/Makefile.am
+++ b/user_call/Makefile.am
@@ -6,5 +6,7 @@ sbin_PROGRAMS = ax25_call netrom_call rose_call
 
 man_MANS = ax25_call.8 netrom_call.8 rose_call.8
 
-DATA_EXTRA = $(man_MANS)
+EXTRA_DIST = $(man_MANS)
+
+LDADD = $(AX25_LIB)
 
diff --git a/user_call/Makefile.in b/user_call/Makefile.in
index 232f104..cf78c65 100644
--- a/user_call/Makefile.in
+++ b/user_call/Makefile.in
@@ -58,17 +58,23 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 AWK = @AWK@
+AX25IO_LIB = @AX25IO_LIB@
+AX25_LIB = @AX25_LIB@
 CC = @CC@
 MAKEINFO = @MAKEINFO@
 NCURSES_LIB = @NCURSES_LIB@
 PACKAGE = @PACKAGE@
+UTIL_LIB = @UTIL_LIB@
 VERSION = @VERSION@
+Z_LIB = @Z_LIB@
 
 sbin_PROGRAMS = ax25_call netrom_call rose_call
 
 man_MANS = ax25_call.8 netrom_call.8 rose_call.8
 
-DATA_EXTRA = $(man_MANS)
+EXTRA_DIST = $(man_MANS)
+
+LDADD = $(AX25_LIB)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -266,9 +272,9 @@ distdir: $(DISTFILES)
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-ax25_call.o: ax25_call.c
-netrom_call.o: netrom_call.c
-rose_call.o: rose_call.c
+ax25_call.o: ax25_call.c ../config.h
+netrom_call.o: netrom_call.c ../config.h
+rose_call.o: rose_call.c ../config.h
 
 info-am:
 info: info-am
diff --git a/user_call/ax25_call.8 b/user_call/ax25_call.8
new file mode 100644
index 0000000..ab93de0
--- /dev/null
+++ b/user_call/ax25_call.8
@@ -0,0 +1,24 @@
+.TH AX25_CALL 8 "11 December 1996" Linux "Linux Programmer's Manual"
+.SH NAME
+ax25_call \- make an AX.25 connection
+.SH SYNOPSIS
+.B ax25_call port local_call remote_call [digipeaters ...]
+.SH DESCRIPTION
+.LP
+.B ax25_call
+establishes an AX.25 connection in a manner suitable for calling from either
+the
+.B ax25d
+program directly, or from the
+.B node
+program as an external command. By setting the command line arguments
+appropriately it is possible to set the local callsign from which the call
+will be made. No translation of the end of lines is performed by this
+program.
+.SH FILES
+.br
+/etc/ax25/axports
+.SH "SEE ALSO"
+.BR ax25 (4).
+.SH AUTHOR
+Jonathan Naylor G4KLX <g4klx@g4klx.demon.co.uk>
diff --git a/user_call/ax25_call.c b/user_call/ax25_call.c
index aaa47ce..235feb9 100644
--- a/user_call/ax25_call.c
+++ b/user_call/ax25_call.c
@@ -4,12 +4,23 @@
 #include <errno.h>
 #include <signal.h>
 
+#include <config.h>
+
 #include <sys/time.h>
 #include <sys/types.h>
 
 #include <sys/socket.h>
+#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
+#else
+#include <netax25/kernel_ax25.h>
+#endif
+#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
+#else 
+#include <netax25/kernel_rose.h>
+#endif
+
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
 
diff --git a/user_call/netrom_call.8 b/user_call/netrom_call.8
new file mode 100644
index 0000000..1a11989
--- /dev/null
+++ b/user_call/netrom_call.8
@@ -0,0 +1,28 @@
+.TH NETROM_CALL 8 "11 December 1996" Linux "Linux Programmer's Manual"
+.SH NAME
+netrom_call \- make a NET/ROM connection
+.SH SYNOPSIS
+.B netrom_call port local_call remote_addr
+.SH DESCRIPTION
+.LP
+.B netrom_call
+establishes a NET/ROM connection in a manner suitable for calling from either
+the
+.B ax25d
+program directly, or from the
+.B node
+program as an external command. By setting the command line arguments
+appropriately it is possible to set the local callsign from which the call
+will be made. No translation of the end of line conventions is performed by
+this program.
+.sp 1
+The remote_addr parameter may either be in the form of a single callsign or
+as a NET/ROM alias and callsign pair seperated by colon. For example
+NMCLUS:GB7BPQ.
+.SH FILES
+.br
+/etc/ax25/nrports
+.SH "SEE ALSO"
+.BR netrom (4).
+.SH AUTHOR
+Jonathan Naylor G4KLX <g4klx@g4klx.demon.co.uk>
diff --git a/user_call/netrom_call.c b/user_call/netrom_call.c
index 004b109..deb877e 100644
--- a/user_call/netrom_call.c
+++ b/user_call/netrom_call.c
@@ -4,13 +4,27 @@
 #include <errno.h>
 #include <signal.h>
 
+#include <config.h>
+
 #include <sys/time.h>
 #include <sys/types.h>
 
 #include <sys/socket.h>
+#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
+#else
+#include <netax25/kernel_ax25.h>
+#endif
+#ifdef HAVE_NETROM_NETROM_H
 #include <netrom/netrom.h>
+#else
+#include <netax25/kernel_netrom.h>
+#endif
+#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
+#else 
+#include <netax25/kernel_rose.h>
+#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/user_call/rose_call.8 b/user_call/rose_call.8
new file mode 100644
index 0000000..9eb888e
--- /dev/null
+++ b/user_call/rose_call.8
@@ -0,0 +1,26 @@
+.TH ROSE_CALL 8 "11 December 1996" Linux "Linux Programmer's Manual"
+.SH NAME
+rose_call \- make a ROSE connection
+.SH SYNOPSIS
+.B rose_call port local_call remote_call remote_rose_addr
+.SH DESCRIPTION
+.LP
+.B rose_call
+establishes a ROSE connection in a manner suitable for calling from either
+the
+.B ax25d
+program directly, or from the
+.B node
+program as an external command. By setting the command line arguments
+appropriately it is possible to set the local callsign from which the call
+will be made. No translation of the end of line conventions is performed by
+this program.
+.sp 1
+The remote_rose_addr parameter must be in the form of a ten digit ROSE address.
+.SH FILES
+.br
+/etc/ax25/rsports
+.SH "SEE ALSO"
+.BR rose (4).
+.SH AUTHOR
+Jonathan Naylor G4KLX <g4klx@g4klx.demon.co.uk>
diff --git a/user_call/rose_call.c b/user_call/rose_call.c
index 606284d..10e235b 100644
--- a/user_call/rose_call.c
+++ b/user_call/rose_call.c
@@ -4,12 +4,23 @@
 #include <errno.h>
 #include <signal.h>
 
+#include <config.h>
+
 #include <sys/time.h>
 #include <sys/types.h>
 
 #include <sys/socket.h>
+#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
+#else
+#include <netax25/kernel_ax25.h>
+#endif
+#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
+#else 
+#include <netax25/kernel_rose.h>
+#endif
+
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
 #include <netax25/rsconfig.h>