Move all header files to be installed to new subdirectory netax25.

22 files changed, 40 insertions, 77 deletions

diff --git a/Makefile.am b/Makefile.am
index 85d87f6..0ceed26 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,51 +1,51 @@
 lib_LTLIBRARIES = libax25.la libax25io.la
 
-libax25includedir = $(includedir)/netax25
-libax25ioincludedir = $(includedir)/netax25
+libax25includedir = $(includedir)
+libax25ioincludedir = $(includedir)
 
 INCLUDES = -DAX25_SYSCONFDIR=\""$(sysconfdir)/ax25/"\" \
 	   -DAX25_LOCALSTATEDIR=\""$(localstatedir)/ax25/"\" 
 
-libax25include_HEADERS = 	\
-	axlib.h		\
-	axconfig.h	\
-	nrconfig.h	\
-	rsconfig.h	\
-	daemon.h	\
-	ttyutils.h	\
-	procutils.h	\
-	kernel_ax25.h	\
-	kernel_rose.h	\
-	kernel_netrom.h	\
-	mheard.h	
+nobase_libax25include_HEADERS = 	\
+	netax25/axlib.h			\
+	netax25/axconfig.h		\
+	netax25/nrconfig.h		\
+	netax25/rsconfig.h		\
+	netax25/daemon.h		\
+	netax25/ttyutils.h		\
+	netax25/procutils.h		\
+	netax25/kernel_ax25.h		\
+	netax25/kernel_rose.h		\
+	netax25/kernel_netrom.h		\
+	netax25/mheard.h	
 
-libax25ioinclude_HEADERS = 	\
-	ax25io.h
+nobase_libax25ioinclude_HEADERS = 	\
+	netax25/ax25io.h
 
 libax25_la_SOURCES = \
 	axconfig.c \
-	axconfig.h \
-	axlib.h \
+	netax25/axconfig.h \
+	netax25/axlib.h \
 	axutils.c \
 	config.h \
 	daemon.c \
-	daemon.h \
-	mheard.h \
+	netax25/daemon.h \
+	netax25/mheard.h \
 	nrconfig.c \
-	nrconfig.h \
+	netax25/nrconfig.h \
 	pathnames.h \
 	procutils.c \
-	procutils.h \
+	netax25/procutils.h \
 	rsconfig.c \
-	rsconfig.h \
+	netax25/rsconfig.h \
 	ttyutils.c \
-	ttyutils.h  \
-	kernel_ax25.h \
-	kernel_rose.h
+	netax25/ttyutils.h  \
+	netax25/kernel_ax25.h \
+	netax25/kernel_rose.h
 	
 libax25io_la_SOURCES = \
 	ax25io.c \
-	ax25io.h 
+	netax25/ax25io.h 
 
 man_MANS = ax25.3 rose.3 axports.5 rsports.5 nrports.5
 
diff --git a/ax25io.c b/ax25io.c
index 0ee2ccb..7090075 100644
--- a/ax25io.c
+++ b/ax25io.c
@@ -5,9 +5,9 @@
 #include <stdarg.h>
 #include <string.h>
 #include <arpa/telnet.h>
+#include <netax25/ax25io.h>
 
 #include "config.h"
-#include "ax25io.h"
 
 static inline int send_iac_iac(ax25io *p);
 static inline int send_iac_cmd(ax25io *p, unsigned char cmd, unsigned char opt);
diff --git a/axconfig.c b/axconfig.c
index 572df99..ceb8490 100644
--- a/axconfig.c
+++ b/axconfig.c
@@ -13,19 +13,11 @@
 
 #include <net/if.h>
 #include <net/if_arp.h>
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include "kernel_ax25.h"
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
+#include <netax25/axconfig.h>
+#include <netax25/axlib.h>
 #include <netrose/rose.h>
-#else
-#include "kernel_rose.h"
-#endif
-#include "axlib.h"
 #include "pathnames.h"
-#include "axconfig.h"
 
 typedef struct _axport
 {
diff --git a/axutils.c b/axutils.c
index 0e8f806..3fbaa3e 100644
--- a/axutils.c
+++ b/axutils.c
@@ -7,18 +7,9 @@
 #include <sys/socket.h>
 #include <config.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include "kernel_ax25.h"
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
+#include <netax25/axlib.h>
 #include <netrose/rose.h>
-#else
-#include "kernel_rose.h"
-#endif
-
-#include "axlib.h"
 
 ax25_address null_ax25_address = {{0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00}};
 
diff --git a/configure.ac b/configure.ac
index 71b0fac..7e56c65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.59)
 AC_INIT(libax25, 0.0.12-rc1, linux-hams@vger.kernel.org)
-AC_CONFIG_SRCDIR(axlib.h)
+AC_CONFIG_SRCDIR(axconfig.c)
 AM_INIT_AUTOMAKE([foreign no-define])
 
 AM_CONFIG_HEADER(config.h)
diff --git a/daemon.c b/daemon.c
index 31cb71a..01511b6 100644
--- a/daemon.c
+++ b/daemon.c
@@ -9,7 +9,7 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 
-#include "daemon.h"
+#include <netax25/daemon.h>
 
 int daemon_start(int ignsigcld)
 {
diff --git a/ax25io.h b/netax25/ax25io.h
index b699bcd..b699bcd 100644
--- a/ax25io.h
+++ b/netax25/ax25io.h
diff --git a/axconfig.h b/netax25/axconfig.h
index 116f985..116f985 100644
--- a/axconfig.h
+++ b/netax25/axconfig.h
diff --git a/axlib.h b/netax25/axlib.h
index 1164059..1164059 100644
--- a/axlib.h
+++ b/netax25/axlib.h
diff --git a/daemon.h b/netax25/daemon.h
index cd9c220..cd9c220 100644
--- a/daemon.h
+++ b/netax25/daemon.h
diff --git a/kernel_ax25.h b/netax25/kernel_ax25.h
index e1b6abb..e1b6abb 100644
--- a/kernel_ax25.h
+++ b/netax25/kernel_ax25.h
diff --git a/kernel_netrom.h b/netax25/kernel_netrom.h
index 4984772..4984772 100644
--- a/kernel_netrom.h
+++ b/netax25/kernel_netrom.h
diff --git a/kernel_rose.h b/netax25/kernel_rose.h
index e4ba7d7..e4ba7d7 100644
--- a/kernel_rose.h
+++ b/netax25/kernel_rose.h
diff --git a/mheard.h b/netax25/mheard.h
index 7e7875f..7e7875f 100644
--- a/mheard.h
+++ b/netax25/mheard.h
diff --git a/nrconfig.h b/netax25/nrconfig.h
index ffe7668..ffe7668 100644
--- a/nrconfig.h
+++ b/netax25/nrconfig.h
diff --git a/procutils.h b/netax25/procutils.h
index eabea20..eabea20 100644
--- a/procutils.h
+++ b/netax25/procutils.h
diff --git a/rsconfig.h b/netax25/rsconfig.h
index cff212c..cff212c 100644
--- a/rsconfig.h
+++ b/netax25/rsconfig.h
diff --git a/ttyutils.h b/netax25/ttyutils.h
index d16996a..d16996a 100644
--- a/ttyutils.h
+++ b/netax25/ttyutils.h
diff --git a/nrconfig.c b/nrconfig.c
index 3c9a40b..1aa0d12 100644
--- a/nrconfig.c
+++ b/nrconfig.c
@@ -13,20 +13,12 @@
 
 #include <net/if.h>
 #include <net/if_arp.h>
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include "kernel_ax25.h"
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else
-#include "kernel_rose.h"
-#endif
 
 #include "pathnames.h"
-#include "axlib.h"
-#include "nrconfig.h"
+#include <netax25/axlib.h>
+#include <netax25/nrconfig.h>
 
 typedef struct _nrport
 {
diff --git a/procutils.c b/procutils.c
index f1d68c5..bb65ffe 100644
--- a/procutils.c
+++ b/procutils.c
@@ -4,15 +4,11 @@
 #include <string.h>
 #include <config.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>		/* Needed by nrconfig.h */
-#else
-#include "kernel_ax25.h"
-#endif
+#include <netax25/nrconfig.h>
+#include <netax25/procutils.h>
 
 #include "pathnames.h"
-#include "nrconfig.h"
-#include "procutils.h"
 
 #define min(a,b) ((a) < (b) ? (a) : (b))
 
diff --git a/rsconfig.c b/rsconfig.c
index f15dbee..8f65404 100644
--- a/rsconfig.c
+++ b/rsconfig.c
@@ -14,20 +14,12 @@
 
 #include <net/if.h>
 #include <net/if_arp.h>
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include "kernel_ax25.h"
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
+#include <netax25/axlib.h>
 #include <netrose/rose.h>
-#else
-#include "kernel_rose.h"
-#endif
+#include <netax25/rsconfig.h>
 
 #include "pathnames.h"
-#include "axlib.h"
-#include "rsconfig.h"
 
 typedef struct _rsport
 {
diff --git a/ttyutils.c b/ttyutils.c
index 584371b..2037330 100644
--- a/ttyutils.c
+++ b/ttyutils.c
@@ -5,7 +5,7 @@
 #include <fcntl.h>
 #include <signal.h>
 
-#include "ttyutils.h"
+#include <netax25/ttyutils.h>
 #include "pathnames.h"
 
 static struct speed_struct {