From 4c0b995c85e0fa7e7e35b268bafdf829e8f40987 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Thu, 14 Aug 2003 23:26:45 +0000
Subject: [PATCH] Make modules work again part 1: Rename netgraph's
 Makefile.module to Makefile and cleanup the subdirectory makefiles to build
 the netgraph modules.

---
 sys/netgraph/Makefile.inc       | 6 +++---
 sys/netgraph/bpf/Makefile       | 4 ++--
 sys/netgraph/bridge/ng_bridge.c | 6 +++---
 sys/netgraph/sync_ar/Makefile   | 4 ++--
 sys/netgraph/sync_sr/Makefile   | 4 ++--
 sys/netgraph/vjc/Makefile       | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sys/netgraph/Makefile.inc b/sys/netgraph/Makefile.inc
index 4d081e1af9..a1b725d4a5 100644
--- a/sys/netgraph/Makefile.inc
+++ b/sys/netgraph/Makefile.inc
@@ -1,8 +1,8 @@
 # $FreeBSD: src/sys/modules/netgraph/Makefile.inc,v 1.1 1999/10/21 09:05:28 julian Exp $
-# $DragonFly: src/sys/netgraph/Makefile.inc,v 1.2 2003/06/17 04:28:45 dillon Exp $
+# $DragonFly: src/sys/netgraph/Makefile.inc,v 1.3 2003/08/14 23:26:35 dillon Exp $
 # $Whistle: Makefile.inc,v 1.4 1999/01/19 23:46:16 archie Exp $
 
-.PATH:		${.CURDIR}/../../../netgraph
+# .PATH:		${.CURDIR}/../../../netgraph
 CFLAGS+=	-Wall
 
-.include "../Makefile.inc"
+
diff --git a/sys/netgraph/bpf/Makefile b/sys/netgraph/bpf/Makefile
index 3c6181b23f..8e7128a781 100644
--- a/sys/netgraph/bpf/Makefile
+++ b/sys/netgraph/bpf/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD: src/sys/modules/netgraph/bpf/Makefile,v 1.2.4.3 2001/12/21 09:00:47 ru Exp $
-# $DragonFly: src/sys/netgraph/bpf/Makefile,v 1.2 2003/06/17 04:28:45 dillon Exp $
+# $DragonFly: src/sys/netgraph/bpf/Makefile,v 1.3 2003/08/14 23:26:36 dillon Exp $
 # $Whistle: Makefile,v 1.1 1999/12/03 01:44:28 archie Exp $
 
 KMOD=		ng_bpf
 SRCS= 		ng_bpf.c bpf_filter.c
 KMODDEPS=	netgraph
 
-.PATH:		${.CURDIR}/../../../net
+.PATH:		${.CURDIR}/../../net
 
 .include <bsd.kmod.mk>
diff --git a/sys/netgraph/bridge/ng_bridge.c b/sys/netgraph/bridge/ng_bridge.c
index d978b2653d..4d60265973 100644
--- a/sys/netgraph/bridge/ng_bridge.c
+++ b/sys/netgraph/bridge/ng_bridge.c
@@ -37,7 +37,7 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $FreeBSD: src/sys/netgraph/ng_bridge.c,v 1.1.2.5 2002/07/02 23:44:02 archie Exp $
- * $DragonFly: src/sys/netgraph/bridge/ng_bridge.c,v 1.4 2003/08/07 21:54:32 dillon Exp $
+ * $DragonFly: src/sys/netgraph/bridge/ng_bridge.c,v 1.5 2003/08/14 23:26:38 dillon Exp $
  */
 
 /*
@@ -72,13 +72,13 @@
 #include <net/ethernet.h>
 
 #include <netinet/in.h>
-#include <net/ipwf/ip_fw.h>
+#include <net/ipfw/ip_fw.h>
 
 #include <netgraph/ng_message.h>
 #include <netgraph/netgraph.h>
 #include <netgraph/ng_parse.h>
 #include "ng_bridge.h"
-#include <netgraph/ng_ether.h>
+#include <netgraph/ether/ng_ether.h>
 
 /* Per-link private data */
 struct ng_bridge_link {
diff --git a/sys/netgraph/sync_ar/Makefile b/sys/netgraph/sync_ar/Makefile
index 8e88f2f41f..e9d44f7d4e 100644
--- a/sys/netgraph/sync_ar/Makefile
+++ b/sys/netgraph/sync_ar/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD: src/sys/modules/netgraph/sync_ar/Makefile,v 1.2.2.1 2002/06/17 15:11:04 jhay Exp $
-# $DragonFly: src/sys/netgraph/sync_ar/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
+# $DragonFly: src/sys/netgraph/sync_ar/Makefile,v 1.3 2003/08/14 23:26:43 dillon Exp $
  
-.PATH:  ${.CURDIR}/../../../dev/ar
+.PATH:  ${.CURDIR}/../../dev/netif/ar
 KMOD    = ng_sync_ar
 SRCS    = if_ar.c if_ar_isa.c if_ar_pci.c
 SRCS    += device_if.h bus_if.h pci_if.h isa_if.h opt_netgraph.h
diff --git a/sys/netgraph/sync_sr/Makefile b/sys/netgraph/sync_sr/Makefile
index 9a37778dc9..002fe537b6 100644
--- a/sys/netgraph/sync_sr/Makefile
+++ b/sys/netgraph/sync_sr/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD: src/sys/modules/netgraph/sync_sr/Makefile,v 1.1.2.1 2002/06/17 15:11:05 jhay Exp $
-# $DragonFly: src/sys/netgraph/sync_sr/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
+# $DragonFly: src/sys/netgraph/sync_sr/Makefile,v 1.3 2003/08/14 23:26:44 dillon Exp $
  
-.PATH:  ${.CURDIR}/../../../dev/sr
+.PATH:  ${.CURDIR}/../../dev/netif/sr
 KMOD    = ng_sync_sr
 SRCS    = if_sr.c if_sr_isa.c if_sr_pci.c
 SRCS    += device_if.h bus_if.h pci_if.h isa_if.h opt_netgraph.h
diff --git a/sys/netgraph/vjc/Makefile b/sys/netgraph/vjc/Makefile
index 57985d8690..d4d40b10c2 100644
--- a/sys/netgraph/vjc/Makefile
+++ b/sys/netgraph/vjc/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD: src/sys/modules/netgraph/vjc/Makefile,v 1.2.2.3 2001/12/21 09:00:50 ru Exp $
-# $DragonFly: src/sys/netgraph/vjc/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
+# $DragonFly: src/sys/netgraph/vjc/Makefile,v 1.3 2003/08/14 23:26:45 dillon Exp $
 # $Whistle: Makefile,v 1.1 1999/01/24 06:48:07 archie Exp $
 
 KMOD=		ng_vjc
 SRCS= 		ng_vjc.c slcompress.c
 KMODDEPS=	netgraph
 
-.PATH:		${.CURDIR}/../../../net
+.PATH:		${.CURDIR}/../../net/ppp_layer
 
 .include <bsd.kmod.mk>
-- 
2.41.0