From patchwork Fri Jun 10 08:33:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 633576 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rQwSB00j5z9sDC for ; Fri, 10 Jun 2016 18:33:46 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rQwS96BTFzDqVv for ; Fri, 10 Jun 2016 18:33:45 +1000 (AEST) X-Original-To: slof@lists.ozlabs.org Delivered-To: slof@lists.ozlabs.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rQwS32fn1zDqJV for ; Fri, 10 Jun 2016 18:33:39 +1000 (AEST) Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B9A7D461C3 for ; Fri, 10 Jun 2016 08:33:37 +0000 (UTC) Received: from thh440s.fritz.box (vpn1-6-25.ams2.redhat.com [10.36.6.25]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5A8XXTi002623 for ; Fri, 10 Jun 2016 04:33:37 -0400 From: Thomas Huth To: slof@lists.ozlabs.org Date: Fri, 10 Jun 2016 10:33:31 +0200 Message-Id: <1465547612-2529-4-git-send-email-thuth@redhat.com> In-Reply-To: <1465547612-2529-1-git-send-email-thuth@redhat.com> References: <1465547612-2529-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 10 Jun 2016 08:33:37 +0000 (UTC) Subject: [SLOF] [PATCH v2 3/4] net: Move also files from clients/net-snk/app/netapps/ to lib/libnet/ X-BeenThere: slof@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Patches for https://github.com/aik/SLOF" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "SLOF" 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 --- clients/net-snk/app/Makefile | 3 --- clients/net-snk/app/main.c | 2 +- clients/net-snk/app/netapps/Makefile | 28 ---------------------- lib/libnet/Makefile | 2 +- {clients/net-snk/app/netapps => lib/libnet}/args.c | 0 {clients/net-snk/app/netapps => lib/libnet}/args.h | 0 .../net-snk/app/netapps => lib/libnet}/netapps.h | 0 .../app/netapps/netboot.c => lib/libnet/netload.c | 0 {clients/net-snk/app/netapps => lib/libnet}/ping.c | 0 9 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 clients/net-snk/app/netapps/Makefile rename {clients/net-snk/app/netapps => lib/libnet}/args.c (100%) rename {clients/net-snk/app/netapps => lib/libnet}/args.h (100%) rename {clients/net-snk/app/netapps => lib/libnet}/netapps.h (100%) rename clients/net-snk/app/netapps/netboot.c => lib/libnet/netload.c (100%) rename {clients/net-snk/app/netapps => lib/libnet}/ping.c (100%) 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 #include #include -#include +#include #include #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 similarity index 100% rename from clients/net-snk/app/netapps/args.c rename to lib/libnet/args.c diff --git a/clients/net-snk/app/netapps/args.h b/lib/libnet/args.h similarity index 100% rename from clients/net-snk/app/netapps/args.h rename to lib/libnet/args.h diff --git a/clients/net-snk/app/netapps/netapps.h b/lib/libnet/netapps.h similarity index 100% rename from clients/net-snk/app/netapps/netapps.h rename to lib/libnet/netapps.h diff --git a/clients/net-snk/app/netapps/netboot.c b/lib/libnet/netload.c similarity index 100% rename from clients/net-snk/app/netapps/netboot.c rename to lib/libnet/netload.c diff --git a/clients/net-snk/app/netapps/ping.c b/lib/libnet/ping.c similarity index 100% rename from clients/net-snk/app/netapps/ping.c rename to lib/libnet/ping.c