diff options
Diffstat (limited to 'ax25')
-rw-r--r-- | ax25/Makefile.am | 3 | ||||
-rw-r--r-- | ax25/Makefile.in | 10 | ||||
-rw-r--r-- | ax25/ax25d.c | 15 | ||||
-rw-r--r-- | ax25/axctl.c | 12 | ||||
-rw-r--r-- | ax25/axparms.c | 11 | ||||
-rw-r--r-- | ax25/axspawn.c | 11 | ||||
-rw-r--r-- | ax25/beacon.c | 12 | ||||
-rw-r--r-- | ax25/mheard.c | 13 | ||||
-rw-r--r-- | ax25/mheardd.c | 12 | ||||
-rw-r--r-- | ax25/rxecho.c | 13 |
10 files changed, 98 insertions, 14 deletions
diff --git a/ax25/Makefile.am b/ax25/Makefile.am index 55dc33d..6bfe46a 100644 --- a/ax25/Makefile.am +++ b/ax25/Makefile.am @@ -19,6 +19,9 @@ sbin_PROGRAMS = ax25d axctl axparms axspawn beacon bpqparms mheardd rxecho bin_PROGRAMS = mheard +LDADD = $(AX25_LIB) +axspawn_LDADD = $(AX25_LIB) $(UTIL_LIB) + man_MANS = ax25.4 ax25d.conf.5 axports.5 axspawn.conf.5 rxecho.conf.5 \ ax25d.8 axctl.8 axparms.8 axspawn.8 beacon.8 bpqparms.8 \ mheard.1 mheardd.8 rxecho.8 diff --git a/ax25/Makefile.in b/ax25/Makefile.in index ef14c64..2331d82 100644 --- a/ax25/Makefile.in +++ b/ax25/Makefile.in @@ -58,11 +58,15 @@ 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 = ax25.profile ax25d.conf axspawn.conf rxecho.conf varfiles = mheard.dat @@ -71,6 +75,9 @@ sbin_PROGRAMS = ax25d axctl axparms axspawn beacon bpqparms mheardd rxecho bin_PROGRAMS = mheard +LDADD = $(AX25_LIB) +axspawn_LDADD = $(AX25_LIB) $(UTIL_LIB) + man_MANS = ax25.4 ax25d.conf.5 axports.5 axspawn.conf.5 rxecho.conf.5 ax25d.8 axctl.8 axparms.8 axspawn.8 beacon.8 bpqparms.8 mheard.1 mheardd.8 rxecho.8 @@ -116,7 +123,6 @@ axparms_LDADD = $(LDADD) axparms_DEPENDENCIES = axparms_LDFLAGS = axspawn_OBJECTS = axspawn.o -axspawn_LDADD = $(LDADD) axspawn_DEPENDENCIES = axspawn_LDFLAGS = beacon_OBJECTS = beacon.o @@ -459,7 +465,7 @@ distdir: $(DISTFILES) ax25d.o: ax25d.c ../config.h ../pathnames.h axctl.o: axctl.c ../config.h axparms.o: axparms.c ../config.h ../pathnames.h -axspawn.o: axspawn.c ../pathnames.h +axspawn.o: axspawn.c ../config.h ../pathnames.h beacon.o: beacon.c ../config.h bpqparms.o: bpqparms.c ../config.h mheard.o: mheard.c ../config.h ../pathnames.h diff --git a/ax25/ax25d.c b/ax25/ax25d.c index 8d45713..86d3895 100644 --- a/ax25/ax25d.c +++ b/ax25/ax25d.c @@ -113,6 +113,8 @@ #include <syslog.h> #include <errno.h> +#include <config.h> + #include <sys/time.h> #include <sys/types.h> #include <sys/fcntl.h> @@ -121,9 +123,21 @@ #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> @@ -131,7 +145,6 @@ #include <netax25/rsconfig.h> #include <netax25/daemon.h> -#include <config.h> #include "../pathnames.h" diff --git a/ax25/axctl.c b/ax25/axctl.c index 84422fd..3d7c780 100644 --- a/ax25/axctl.c +++ b/ax25/axctl.c @@ -5,19 +5,27 @@ #include <unistd.h> #include <pwd.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_NETROSE_ROSE_H +#include <netrose/rose.h> +#else #include <netrose/rose.h> +#endif #include <netax25/axlib.h> #include <netax25/axconfig.h> -#include <config.h> - int main(int argc, char **argv) { struct ax25_ctl_struct ax25_ctl; diff --git a/ax25/axparms.c b/ax25/axparms.c index 5683d46..dbcae8f 100644 --- a/ax25/axparms.c +++ b/ax25/axparms.c @@ -5,18 +5,27 @@ #include <unistd.h> #include <pwd.h> +#include <config.h> + #include <sys/types.h> #include <sys/socket.h> #include <sys/ioctl.h> #include <net/if.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 <config.h> #include "../pathnames.h" diff --git a/ax25/axspawn.c b/ax25/axspawn.c index 88381cf..35724a4 100644 --- a/ax25/axspawn.c +++ b/ax25/axspawn.c @@ -130,10 +130,21 @@ #include <sys/ioctl.h> #include <sys/file.h> +#include <config.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 "../pathnames.h" diff --git a/ax25/beacon.c b/ax25/beacon.c index c9b989e..b36f979 100644 --- a/ax25/beacon.c +++ b/ax25/beacon.c @@ -4,18 +4,26 @@ #include <syslog.h> #include <signal.h> +#include <config.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/daemon.h> -#include <config.h> - static int logging = FALSE; static int mail = FALSE; static int single = FALSE; diff --git a/ax25/mheard.c b/ax25/mheard.c index 2ab582c..6b3f21a 100644 --- a/ax25/mheard.c +++ b/ax25/mheard.c @@ -6,13 +6,22 @@ #include <sys/types.h> #include <sys/socket.h> +#include <config.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/mheard.h> -#include <config.h> - #include "../pathnames.h" struct PortRecord { diff --git a/ax25/mheardd.c b/ax25/mheardd.c index 2d98fad..a2b3b21 100644 --- a/ax25/mheardd.c +++ b/ax25/mheardd.c @@ -8,6 +8,8 @@ #include <errno.h> #include <fcntl.h> +#include <config.h> + #include <sys/types.h> #include <sys/ioctl.h> #include <sys/param.h> @@ -17,16 +19,22 @@ #include <net/ethernet.h> #include <netinet/in.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/daemon.h> #include <netax25/mheard.h> -#include <config.h> - #include "../pathnames.h" #define KISS_MASK 0x0F diff --git a/ax25/rxecho.c b/ax25/rxecho.c index 31334aa..633509e 100644 --- a/ax25/rxecho.c +++ b/ax25/rxecho.c @@ -53,18 +53,27 @@ #include <signal.h> #include <sys/types.h> +#include <config.h> + #include <sys/socket.h> #include <net/ethernet.h> #include <netinet/in.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/daemon.h> -#include <config.h> - #include "../pathnames.h" #define MAXCALLS 8 |