diff options
Diffstat (limited to 'netrom')
-rw-r--r-- | netrom/Makefile.am | 2 | ||||
-rw-r--r-- | netrom/Makefile.in | 12 | ||||
-rw-r--r-- | netrom/netromd.c | 16 | ||||
-rw-r--r-- | netrom/netromr.c | 15 | ||||
-rw-r--r-- | netrom/netromt.c | 15 | ||||
-rw-r--r-- | netrom/nodesave.c | 6 | ||||
-rw-r--r-- | netrom/nrattach.c | 19 | ||||
-rw-r--r-- | netrom/nrparms.c | 16 |
8 files changed, 92 insertions, 9 deletions
diff --git a/netrom/Makefile.am b/netrom/Makefile.am index 03f0c0d..c5845b8 100644 --- a/netrom/Makefile.am +++ b/netrom/Makefile.am @@ -12,6 +12,8 @@ installconf: sbin_PROGRAMS = netromd nodesave nrattach nrparms nrsdrv +LDADD = $(AX25_LIB) + man_MANS = netrom.4 nrports.5 nrbroadcast.5 netromd.8 nodesave.8 \ nrattach.8 nrparms.8 nrsdrv.8 diff --git a/netrom/Makefile.in b/netrom/Makefile.in index 80c3c9c..810c407 100644 --- a/netrom/Makefile.in +++ b/netrom/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@ etcfiles = nrbroadcast nrports etcdir = $(sysconfdir)/ax25 sbin_PROGRAMS = netromd nodesave nrattach nrparms nrsdrv +LDADD = $(AX25_LIB) + man_MANS = netrom.4 nrports.5 nrbroadcast.5 netromd.8 nodesave.8 nrattach.8 nrparms.8 nrsdrv.8 @@ -359,9 +365,9 @@ distdir: $(DISTFILES) fi; \ done netromd.o: netromd.c ../config.h ../pathnames.h netromd.h -netromr.o: netromr.c ../pathnames.h netromd.h -netromt.o: netromt.c ../pathnames.h netromd.h -nodesave.o: nodesave.c +netromr.o: netromr.c ../config.h ../pathnames.h netromd.h +netromt.o: netromt.c ../config.h ../pathnames.h netromd.h +nodesave.o: nodesave.c ../config.h nrattach.o: nrattach.c ../config.h ../pathnames.h nrparms.o: nrparms.c ../config.h nrsdrv.o: nrsdrv.c ../config.h ../pathnames.h diff --git a/netrom/netromd.c b/netrom/netromd.c index fa80c9b..5fab52d 100644 --- a/netrom/netromd.c +++ b/netrom/netromd.c @@ -5,6 +5,8 @@ #include <syslog.h> #include <signal.h> +#include <config.h> + #include <sys/types.h> #include <sys/ioctl.h> #include <sys/time.h> @@ -14,17 +16,27 @@ #include <net/if.h> #include <net/ethernet.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> #include <netax25/daemon.h> #include <netax25/nrconfig.h> -#include <config.h> - #include "../pathnames.h" #include "netromd.h" diff --git a/netrom/netromr.c b/netrom/netromr.c index eafd225..90e775a 100644 --- a/netrom/netromr.c +++ b/netrom/netromr.c @@ -4,6 +4,8 @@ #include <unistd.h> #include <syslog.h> +#include <config.h> + #include <sys/types.h> #include <sys/ioctl.h> @@ -12,9 +14,22 @@ #include <net/if.h> #include <net/ethernet.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 "../pathnames.h" diff --git a/netrom/netromt.c b/netrom/netromt.c index d22caf1..3b37d5f 100644 --- a/netrom/netromt.c +++ b/netrom/netromt.c @@ -5,13 +5,28 @@ #include <ctype.h> #include <syslog.h> +#include <config.h> + #include <sys/types.h> #include <sys/ioctl.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/netrom/nodesave.c b/netrom/nodesave.c index 3eab61b..a677422 100644 --- a/netrom/nodesave.c +++ b/netrom/nodesave.c @@ -2,11 +2,17 @@ #include <stdio.h> #include <errno.h> +#include <config.h> + #include <sys/types.h> #include <sys/stat.h> #include <sys/socket.h> +#ifdef HAVE_NETAX25_AX25_H #include <netax25/ax25.h> +#else +#include <netax25/kernel_ax25.h> +#endif #include <netax25/axconfig.h> diff --git a/netrom/nrattach.c b/netrom/nrattach.c index aee0936..ecbbd56 100644 --- a/netrom/nrattach.c +++ b/netrom/nrattach.c @@ -8,17 +8,32 @@ #include <ctype.h> #include <netdb.h> +#include <config.h> + #include <sys/ioctl.h> #include <sys/socket.h> #include <net/if.h> #include <net/if_arp.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> -#include <netax25/axlib.h> +#else +#include <netax25/kernel_rose.h> +#endif -#include <config.h> +#include <netax25/nrconfig.h> #include "../pathnames.h" diff --git a/netrom/nrparms.c b/netrom/nrparms.c index 7e89ff9..bc5803b 100644 --- a/netrom/nrparms.c +++ b/netrom/nrparms.c @@ -4,20 +4,32 @@ #include <ctype.h> #include <unistd.h> +#include <config.h> + #include <sys/types.h> #include <sys/ioctl.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> #include <netax25/nrconfig.h> -#include <config.h> - char nodes_usage[] = "usage: nrparms -nodes nodecall +|- ident quality count port neighbour [digicall...]\n"; char routes_usage[] = "usage: nrparms -routes port nodecall [digicall...] +|- pathquality\n"; |