diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-08-10 05:54:53 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-08-10 05:54:53 +0200 |
| commit | a4cc50373fbe27c973f95628fc142efec14e05cf (patch) | |
| tree | bc163bed95c61b53f1399cb27e1fe9dd60bb6b4f /ax25 | |
| parent | 5f5d1604492ae15967f9d86f41fbeeedcae0ae2b (diff) | |
Import ax25-tools 0.0.4 from tarballax25-tools-0.0.4
Diffstat (limited to 'ax25')
| -rw-r--r-- | ax25/Makefile.in | 14 | ||||
| -rw-r--r-- | ax25/axctl.c | 2 | ||||
| -rw-r--r-- | ax25/bpqparms.c | 6 | ||||
| -rw-r--r-- | ax25/mheardd.c | 16 | ||||
| -rw-r--r-- | ax25/rxecho.c | 6 |
5 files changed, 29 insertions, 15 deletions
diff --git a/ax25/Makefile.in b/ax25/Makefile.in index 5117b0a..2330236 100644 --- a/ax25/Makefile.in +++ b/ax25/Makefile.in @@ -61,6 +61,7 @@ AWK = @AWK@ AX25IO_LIB = @AX25IO_LIB@ AX25_LIB = @AX25_LIB@ CC = @CC@ +DMASCC = @DMASCC@ MAKEINFO = @MAKEINFO@ NCURSES_LIB = @NCURSES_LIB@ PACKAGE = @PACKAGE@ @@ -108,10 +109,6 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_LIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ mheard_OBJECTS = mheard.o mheard_LDADD = $(LDADD) mheard_DEPENDENCIES = @@ -468,15 +465,6 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -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 ../config.h ../pathnames.h -beacon.o: beacon.c ../config.h -bpqparms.o: bpqparms.c ../config.h -mheard.o: mheard.c ../config.h ../pathnames.h -mheardd.o: mheardd.c ../config.h ../pathnames.h -rxecho.o: rxecho.c ../config.h ../pathnames.h info-am: info: info-am diff --git a/ax25/axctl.c b/ax25/axctl.c index 3b453c3..42be556 100644 --- a/ax25/axctl.c +++ b/ax25/axctl.c @@ -20,7 +20,7 @@ #ifdef HAVE_NETROSE_ROSE_H #include <netrose/rose.h> #else -#include <netrose/rose.h> +#include <netax25/kernel_rose.h> #endif #include <netax25/axlib.h> diff --git a/ax25/bpqparms.c b/ax25/bpqparms.c index 1a88fd6..02140c3 100644 --- a/ax25/bpqparms.c +++ b/ax25/bpqparms.c @@ -29,7 +29,11 @@ #include <sys/socket.h> #include <net/if.h> -#include <net/ethernet.h> + +#ifdef __GLIBC__ +#include <net/ethernet.h> // is this really needed ?? +#endif + #include <linux/bpqether.h> /* xlz - dammit, we need this again */ #include <config.h> diff --git a/ax25/mheardd.c b/ax25/mheardd.c index 2d98fad..f1a6aab 100644 --- a/ax25/mheardd.c +++ b/ax25/mheardd.c @@ -14,11 +14,27 @@ #include <sys/stat.h> #include <sys/socket.h> + +#ifdef __GLIBC__ #include <net/ethernet.h> +#else +#include <linux/if_ether.h> +#endif + #include <netinet/in.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/axconfig.h> diff --git a/ax25/rxecho.c b/ax25/rxecho.c index 633509e..0dd601f 100644 --- a/ax25/rxecho.c +++ b/ax25/rxecho.c @@ -56,7 +56,13 @@ #include <config.h> #include <sys/socket.h> + +#ifdef __GLIBC__ #include <net/ethernet.h> +#else +#include <linux/if_ether.h> +#endif + #include <netinet/in.h> #ifdef HAVE_NETAX25_AX25_H |