Virtualization
/
SLOF
mirror of https://gitlab.com/qemu-project/SLOF.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

net-snk: Get rid of netlib and netapps prefixes in include statements 

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>
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
This commit is contained in:
Thomas Huth 2016-06-10 10:33:29 +02:00 committed by Alexey Kardashevskiy
parent 4202498ebf
commit c7e03a58c1
17 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/net-snk/app/Makefile
View File

@ -16,7 +16,7 @@ export TOP
endif endif
include $(TOP)/make.rules include $(TOP)/make.rules
CFLAGS +=$(ADDCFLAGS) CFLAGS +=$(ADDCFLAGS) -Inetlib
OBJS = main.o OBJS = main.o
OBJDIRS = netlib/netlib.o netapps/netboot.o OBJDIRS = netlib/netlib.o netapps/netboot.o

2
clients/net-snk/app/netapps/Makefile
View File

@ -16,7 +16,7 @@ ifndef TOP
endif endif
include $(TOP)/make.rules 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 OBJS = netboot.o ping.o args.o

2
clients/net-snk/app/netapps/netapps.h
View File

@ -13,7 +13,7 @@
#ifndef _NETAPPS_H_ #ifndef _NETAPPS_H_
#define _NETAPPS_H_ #define _NETAPPS_H_
#include <netlib/tftp.h> #include <tftp.h>
#define F_IPV4 4 #define F_IPV4 4
#define F_IPV6 6 #define F_IPV6 6

16
clients/net-snk/app/netapps/netboot.c
View File

@ -10,21 +10,21 @@
* IBM Corporation - initial implementation * IBM Corporation - initial implementation
*****************************************************************************/ *****************************************************************************/
#include <netlib/tftp.h> #include <tftp.h>
#include <netlib/ethernet.h> #include <ethernet.h>
#include <netlib/dhcp.h> #include <dhcp.h>
#include <netlib/dhcpv6.h> #include <dhcpv6.h>
#include <netlib/ipv4.h> #include <ipv4.h>
#include <netlib/ipv6.h> #include <ipv6.h>
#include <netlib/dns.h> #include <dns.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netapps/args.h>
#include <libbootmsg/libbootmsg.h> #include <libbootmsg/libbootmsg.h>
#include <of.h> #include <of.h>
#include "args.h"
#include "netapps.h" #include "netapps.h"
#define IP_INIT_DEFAULT 5 #define IP_INIT_DEFAULT 5

8
clients/net-snk/app/netapps/ping.c
View File

@ -10,15 +10,15 @@
* IBM Corporation - initial implementation * IBM Corporation - initial implementation
*****************************************************************************/ *****************************************************************************/
#include <netlib/ipv4.h> #include <ipv4.h>
#include <netlib/dhcp.h> #include <dhcp.h>
#include <netlib/ethernet.h> #include <ethernet.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#include <netapps/args.h> #include "args.h"
#include "netapps.h" #include "netapps.h"
struct ping_args { struct ping_args {

2
clients/net-snk/app/netlib/Makefile
View File

@ -16,7 +16,7 @@ ifndef TOP
endif endif
include $(TOP)/make.rules include $(TOP)/make.rules
CFLAGS += -I../ CFLAGS += -I../netapps
ifeq ($(SNK_USE_MTFTP), 1) ifeq ($(SNK_USE_MTFTP), 1)
CFLAGS += -DUSE_MTFTP CFLAGS += -DUSE_MTFTP

2
clients/net-snk/app/netlib/dhcp.c
View File

@ -48,7 +48,7 @@
#include <ipv4.h> #include <ipv4.h>
#include <udp.h> #include <udp.h>
#include <dns.h> #include <dns.h>
#include <netapps/args.h> #include <args.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

4
clients/net-snk/app/netlib/dhcp.h
View File

@ -16,9 +16,9 @@
#include <stdint.h> #include <stdint.h>
#ifdef USE_MTFTP #ifdef USE_MTFTP
#include <netlib/mtftp.h> #include <mtftp.h>
#else #else
#include <netlib/tftp.h> #include <tftp.h>
#endif #endif
/** \struct btphdr /** \struct btphdr

12
clients/net-snk/app/netlib/dhcpv6.c
View File

@ -16,12 +16,12 @@
#include <stdint.h> #include <stdint.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <time.h> #include <time.h>
#include <netlib/ethernet.h> #include "ethernet.h"
#include <netlib/ipv6.h> #include "ipv6.h"
#include <netlib/udp.h> #include "udp.h"
#include <netlib/dhcpv6.h> #include "dhcpv6.h"
#include <netlib/tftp.h> #include "tftp.h"
#include <netlib/dns.h> #include "dns.h"
static uint8_t tid[3]; static uint8_t tid[3];
static uint32_t dhcpv6_state = -1; static uint32_t dhcpv6_state = -1;

2
clients/net-snk/app/netlib/dhcpv6.h
View File

@ -14,7 +14,7 @@
#define _DHCPV6_H_ #define _DHCPV6_H_
#include <stdint.h> #include <stdint.h>
#include <netlib/ethernet.h> #include "ethernet.h"
#define DHCPV6_STATELESS 0 #define DHCPV6_STATELESS 0
#define DHCPV6_STATEFUL 1 #define DHCPV6_STATEFUL 1

10
clients/net-snk/app/netlib/icmpv6.c
View File

@ -15,11 +15,11 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netlib/ethernet.h> #include "ethernet.h"
#include <netlib/ipv6.h> #include "ipv6.h"
#include <netlib/icmpv6.h> #include "icmpv6.h"
#include <netlib/ndp.h> #include "ndp.h"
#include <netlib/dhcpv6.h> #include "dhcpv6.h"
static int ra_received = 0; static int ra_received = 0;

4
clients/net-snk/app/netlib/icmpv6.h
View File

@ -14,8 +14,8 @@
#define _ICMPV6_H_ #define _ICMPV6_H_
#include <stdint.h> #include <stdint.h>
#include <netlib/ethernet.h> #include "ethernet.h"
#include <netlib/ipv6.h> #include "ipv6.h"
#define __ICMPV6_DEBUG__ #define __ICMPV6_DEBUG__

10
clients/net-snk/app/netlib/ipv6.c
View File

@ -17,11 +17,11 @@
#include <time.h> #include <time.h>
#include <ctype.h> #include <ctype.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netlib/ethernet.h> #include "ethernet.h"
#include <netlib/ipv6.h> #include "ipv6.h"
#include <netlib/icmpv6.h> #include "icmpv6.h"
#include <netlib/ndp.h> #include "ndp.h"
#include <netlib/udp.h> #include "udp.h"
#undef IPV6_DEBUG #undef IPV6_DEBUG
//#define IPV6_DEBUG //#define IPV6_DEBUG

2
clients/net-snk/app/netlib/ipv6.h
View File

@ -14,7 +14,7 @@
#define _IPV6_H_ #define _IPV6_H_
#include <stdint.h> #include <stdint.h>
#include <netlib/ethernet.h> #include "ethernet.h"
#define __IPV6_DEBUG__ #define __IPV6_DEBUG__

6
clients/net-snk/app/netlib/ndp.c
View File

@ -13,9 +13,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <netlib/ipv6.h> #include "ipv6.h"
#include <netlib/icmpv6.h> #include "icmpv6.h"
#include <netlib/ndp.h> #include "ndp.h"
/* Neighbor cache */ /* Neighbor cache */
static struct neighbor *first_neighbor; static struct neighbor *first_neighbor;

2
clients/net-snk/app/netlib/ndp.h
View File

@ -13,7 +13,7 @@
#ifndef _NDP_H_ #ifndef _NDP_H_
#define _NDP_H_ #define _NDP_H_
#include <netlib/ipv6.h> #include "ipv6.h"
#define __NDP_DEBUG__ #define __NDP_DEBUG__

2
clients/net-snk/app/netlib/tftp.h
View File

@ -15,7 +15,7 @@
#define _TFTP_H_ #define _TFTP_H_
#include <stdint.h> #include <stdint.h>
#include <netlib/ipv6.h> #include "ipv6.h"
struct tftphdr { struct tftphdr {
int16_t th_opcode; int16_t th_opcode;