@@ -16,7 +16,7 @@ export TOP
endif
include $(TOP)/make.rules
-CFLAGS +=$(ADDCFLAGS)
+CFLAGS +=$(ADDCFLAGS) -Inetlib
OBJS = main.o
OBJDIRS = netlib/netlib.o netapps/netboot.o
@@ -16,7 +16,7 @@ ifndef TOP
endif
include $(TOP)/make.rules
-CFLAGS += -I../ -I../../../../lib/ -Wall -W
+CFLAGS += -I.. -I../netlib -I../../../../lib/ -Wall -W
OBJS = netboot.o ping.o args.o
@@ -13,7 +13,7 @@
#ifndef _NETAPPS_H_
#define _NETAPPS_H_
-#include <netlib/tftp.h>
+#include <tftp.h>
#define F_IPV4 4
#define F_IPV6 6
@@ -10,21 +10,21 @@
* IBM Corporation - initial implementation
*****************************************************************************/
-#include <netlib/tftp.h>
-#include <netlib/ethernet.h>
-#include <netlib/dhcp.h>
-#include <netlib/dhcpv6.h>
-#include <netlib/ipv4.h>
-#include <netlib/ipv6.h>
-#include <netlib/dns.h>
+#include <tftp.h>
+#include <ethernet.h>
+#include <dhcp.h>
+#include <dhcpv6.h>
+#include <ipv4.h>
+#include <ipv6.h>
+#include <dns.h>
#include <string.h>
#include <stdio.h>
#include <time.h>
#include <stdlib.h>
#include <sys/socket.h>
-#include <netapps/args.h>
#include <libbootmsg/libbootmsg.h>
#include <of.h>
+#include "args.h"
#include "netapps.h"
#define IP_INIT_DEFAULT 5
@@ -10,15 +10,15 @@
* IBM Corporation - initial implementation
*****************************************************************************/
-#include <netlib/ipv4.h>
-#include <netlib/dhcp.h>
-#include <netlib/ethernet.h>
+#include <ipv4.h>
+#include <dhcp.h>
+#include <ethernet.h>
#include <sys/socket.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
-#include <netapps/args.h>
+#include "args.h"
#include "netapps.h"
struct ping_args {
@@ -16,7 +16,7 @@ ifndef TOP
endif
include $(TOP)/make.rules
-CFLAGS += -I../
+CFLAGS += -I../netapps
ifeq ($(SNK_USE_MTFTP), 1)
CFLAGS += -DUSE_MTFTP
@@ -48,7 +48,7 @@
#include <ipv4.h>
#include <udp.h>
#include <dns.h>
-#include <netapps/args.h>
+#include <args.h>
#include <stdio.h>
#include <string.h>
@@ -16,9 +16,9 @@
#include <stdint.h>
#ifdef USE_MTFTP
-#include <netlib/mtftp.h>
+#include <mtftp.h>
#else
-#include <netlib/tftp.h>
+#include <tftp.h>
#endif
/** \struct btphdr
@@ -16,12 +16,12 @@
#include <stdint.h>
#include <sys/socket.h>
#include <time.h>
-#include <netlib/ethernet.h>
-#include <netlib/ipv6.h>
-#include <netlib/udp.h>
-#include <netlib/dhcpv6.h>
-#include <netlib/tftp.h>
-#include <netlib/dns.h>
+#include "ethernet.h"
+#include "ipv6.h"
+#include "udp.h"
+#include "dhcpv6.h"
+#include "tftp.h"
+#include "dns.h"
static uint8_t tid[3];
static uint32_t dhcpv6_state = -1;
@@ -14,7 +14,7 @@
#define _DHCPV6_H_
#include <stdint.h>
-#include <netlib/ethernet.h>
+#include "ethernet.h"
#define DHCPV6_STATELESS 0
#define DHCPV6_STATEFUL 1
@@ -15,11 +15,11 @@
#include <stdio.h>
#include <string.h>
#include <sys/socket.h>
-#include <netlib/ethernet.h>
-#include <netlib/ipv6.h>
-#include <netlib/icmpv6.h>
-#include <netlib/ndp.h>
-#include <netlib/dhcpv6.h>
+#include "ethernet.h"
+#include "ipv6.h"
+#include "icmpv6.h"
+#include "ndp.h"
+#include "dhcpv6.h"
static int ra_received = 0;
@@ -14,8 +14,8 @@
#define _ICMPV6_H_
#include <stdint.h>
-#include <netlib/ethernet.h>
-#include <netlib/ipv6.h>
+#include "ethernet.h"
+#include "ipv6.h"
#define __ICMPV6_DEBUG__
@@ -17,11 +17,11 @@
#include <time.h>
#include <ctype.h>
#include <sys/socket.h>
-#include <netlib/ethernet.h>
-#include <netlib/ipv6.h>
-#include <netlib/icmpv6.h>
-#include <netlib/ndp.h>
-#include <netlib/udp.h>
+#include "ethernet.h"
+#include "ipv6.h"
+#include "icmpv6.h"
+#include "ndp.h"
+#include "udp.h"
#undef IPV6_DEBUG
//#define IPV6_DEBUG
@@ -14,7 +14,7 @@
#define _IPV6_H_
#include <stdint.h>
-#include <netlib/ethernet.h>
+#include "ethernet.h"
#define __IPV6_DEBUG__
@@ -13,9 +13,9 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <netlib/ipv6.h>
-#include <netlib/icmpv6.h>
-#include <netlib/ndp.h>
+#include "ipv6.h"
+#include "icmpv6.h"
+#include "ndp.h"
/* Neighbor cache */
static struct neighbor *first_neighbor;
@@ -13,7 +13,7 @@
#ifndef _NDP_H_
#define _NDP_H_
-#include <netlib/ipv6.h>
+#include "ipv6.h"
#define __NDP_DEBUG__
@@ -15,7 +15,7 @@
#define _TFTP_H_
#include <stdint.h>
-#include <netlib/ipv6.h>
+#include "ipv6.h"
struct tftphdr {
int16_t th_opcode;
These prefixes prevent that the files can easily be moved to another folder, so let's use proper "-I" statements in the Makefiles instead. Signed-off-by: Thomas Huth <thuth@redhat.com> --- clients/net-snk/app/Makefile | 2 +- clients/net-snk/app/netapps/Makefile | 2 +- clients/net-snk/app/netapps/netapps.h | 2 +- clients/net-snk/app/netapps/netboot.c | 16 ++++++++-------- clients/net-snk/app/netapps/ping.c | 8 ++++---- clients/net-snk/app/netlib/Makefile | 2 +- clients/net-snk/app/netlib/dhcp.c | 2 +- clients/net-snk/app/netlib/dhcp.h | 4 ++-- clients/net-snk/app/netlib/dhcpv6.c | 12 ++++++------ clients/net-snk/app/netlib/dhcpv6.h | 2 +- clients/net-snk/app/netlib/icmpv6.c | 10 +++++----- clients/net-snk/app/netlib/icmpv6.h | 4 ++-- clients/net-snk/app/netlib/ipv6.c | 10 +++++----- clients/net-snk/app/netlib/ipv6.h | 2 +- clients/net-snk/app/netlib/ndp.c | 6 +++--- clients/net-snk/app/netlib/ndp.h | 2 +- clients/net-snk/app/netlib/tftp.h | 2 +- 17 files changed, 44 insertions(+), 44 deletions(-)