net: Move also files from clients/net-snk/app/netapps/ to lib/libnet/

These files should go into libnet, too, so we can later link
them to paflof instead of net-snk.

Note: A "make distclean" is required after applying this patch
to make sure that the dependencies for the moved files are
properly re-generated.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>

9 files changed, 2 insertions, 33 deletions

diff --git a/clients/net-snk/app/Makefile b/clients/net-snk/app/Makefile
index 41d4bf7..52d446c 100644
--- a/clients/net-snk/app/Makefile
+++ b/clients/net-snk/app/Makefile
@@ -19,9 +19,6 @@ include $(TOP)/make.rules
 CFLAGS +=$(ADDCFLAGS) -I$(LIBCMNDIR)/libnet
 
 OBJS = main.o
-OBJDIRS = netapps/netboot.o
-OBJDIRS += netapps/ping.o
-OBJDIRS += netapps/args.o
 
 ifeq ($(SNK_BIOSEMU_APPS), 1)
 OBJDIRS += biosemu/biosemu_app.o
diff --git a/clients/net-snk/app/main.c b/clients/net-snk/app/main.c
index 90e14b3..22aeba7 100644
--- a/clients/net-snk/app/main.c
+++ b/clients/net-snk/app/main.c
@@ -13,7 +13,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <of.h>
-#include <netapps/netapps.h>
+#include <netapps.h>
 #include <libbootmsg.h>
 
 #ifdef SNK_BIOSEMU_APPS
diff --git a/clients/net-snk/app/netapps/Makefile b/clients/net-snk/app/netapps/Makefile
deleted file mode 100644
index 5d95346..0000000
--- a/clients/net-snk/app/netapps/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# *****************************************************************************
-# * Copyright (c) 2004, 2008 IBM Corporation
-# * All rights reserved.
-# * This program and the accompanying materials
-# * are made available under the terms of the BSD License
-# * which accompanies this distribution, and is available at
-# * http://www.opensource.org/licenses/bsd-license.php
-# *
-# * Contributors:
-# *     IBM Corporation - initial implementation
-# ****************************************************************************/
-
-ifndef TOP
-  TOP = $(shell while ! test -e make.rules; do cd ..  ; done; pwd)
-  export TOP
-endif
-include $(TOP)/make.rules
-
-CFLAGS += -I.. -I$(LIBCMNDIR)/libnet -I$(LIBCMNDIR) -Wall -W
-
-OBJS    = netboot.o ping.o args.o
-
-all: $(OBJS) 
-
-clean:
-	$(RM) -f *.o *.a *.i
-
-include $(TOP)/make.depend
diff --git a/lib/libnet/Makefile b/lib/libnet/Makefile
index 14c29d3..2c9b7c2 100644
--- a/lib/libnet/Makefile
+++ b/lib/libnet/Makefile
@@ -20,7 +20,7 @@ CFLAGS += -I. -I.. -I../libc/include
 CFLAGS += -I../../clients/net-snk/app/netapps -I../../clients/net-snk/include
 
 SRCS =	ethernet.c ipv4.c udp.c tcp.c dns.c bootp.c dhcp.c tftp.c \
-	ipv6.c dhcpv6.c icmpv6.c ndp.c
+	ipv6.c dhcpv6.c icmpv6.c ndp.c netload.c ping.c args.c
 
 OBJS = $(SRCS:%.c=%.o)
 
diff --git a/clients/net-snk/app/netapps/args.c b/lib/libnet/args.c
index 3f057c3..3f057c3 100644
--- a/clients/net-snk/app/netapps/args.c
+++ b/lib/libnet/args.c
diff --git a/clients/net-snk/app/netapps/args.h b/lib/libnet/args.h
index 1ede9a8..1ede9a8 100644
--- a/clients/net-snk/app/netapps/args.h
+++ b/lib/libnet/args.h
diff --git a/clients/net-snk/app/netapps/netapps.h b/lib/libnet/netapps.h
index d3f7eb2..d3f7eb2 100644
--- a/clients/net-snk/app/netapps/netapps.h
+++ b/lib/libnet/netapps.h
diff --git a/clients/net-snk/app/netapps/netboot.c b/lib/libnet/netload.c
index d99aa29..d99aa29 100644
--- a/clients/net-snk/app/netapps/netboot.c
+++ b/lib/libnet/netload.c
diff --git a/clients/net-snk/app/netapps/ping.c b/lib/libnet/ping.c
index def3179..def3179 100644
--- a/clients/net-snk/app/netapps/ping.c
+++ b/lib/libnet/ping.c