Make modules work again part 1: linkup "net" and rename Makefile.module files
authorMatthew Dillon <dillon@dragonflybsd.org>
Fri, 15 Aug 2003 07:03:12 +0000 (07:03 +0000)
committerMatthew Dillon <dillon@dragonflybsd.org>
Fri, 15 Aug 2003 07:03:12 +0000 (07:03 +0000)
to Makefile.  Still more to come...

sys/net/Makefile [new file with mode: 0644]
sys/net/ip_mroute/Makefile
sys/net/ppp_layer/Makefile
sys/net/sl/Makefile
sys/net/sppp/Makefile

diff --git a/sys/net/Makefile b/sys/net/Makefile
new file mode 100644 (file)
index 0000000..af09cc7
--- /dev/null
@@ -0,0 +1,8 @@
+# $DragonFly: src/sys/net/Makefile,v 1.1 2003/08/15 07:03:09 dillon Exp $
+#
+
+SUBDIR=accf_data accf_http disc ef faith gif gre sl stf tap tun \
+       vlan bridge dummynet ipfilter ipfw ip6fw ip_mroute \
+       sppp ppp_layer
+
+.include <bsd.subdir.mk>
index a827abc..56314b6 100644 (file)
@@ -1,10 +1,16 @@
 # $FreeBSD: src/sys/modules/ip_mroute_mod/Makefile,v 1.5 1999/08/28 00:47:20 peter Exp $
-# $DragonFly: src/sys/net/ip_mroute/Makefile,v 1.2 2003/06/17 04:28:44 dillon Exp $
+# $DragonFly: src/sys/net/ip_mroute/Makefile,v 1.3 2003/08/15 07:03:10 dillon Exp $
 
 .PATH: ${.CURDIR}/../../netinet
 KMOD=  ip_mroute
-SRCS=  ip_mroute.c
+SRCS=  ip_mroute.c opt_mrouting.h opt_random_ip_id.h
 NOMAN=
 CFLAGS+= -DMROUTE_LKM -DMROUTING
 
+opt_mrouting.h:
+       echo "#define MROUTING 1" > ${.TARGET}
+
+opt_random_ip_id.h:
+       echo > ${.TARGET}
+
 .include <bsd.kmod.mk>
index 56d3277..8e1cdb8 100644 (file)
@@ -1,10 +1,10 @@
 # $FreeBSD: src/sys/modules/if_ppp/Makefile,v 1.21 1999/11/28 18:52:51 bde Exp $
-# $DragonFly: src/sys/net/ppp_layer/Makefile,v 1.2 2003/06/17 04:28:44 dillon Exp $
+# $DragonFly: src/sys/net/ppp_layer/Makefile,v 1.3 2003/08/15 07:03:11 dillon Exp $
 
-.PATH:  ${.CURDIR}/../../net
+.PATH:  ${.CURDIR}/.. ${.CURDIR}/../ppp
 KMOD=   if_ppp
 SRCS=  if_ppp.c ppp_tty.c slcompress.c \
-       ppp.h opt_inet.h opt_ipx.h opt_ppp.h vnode_if.h
+       use_ppp.h opt_inet.h opt_ipx.h opt_ppp.h vnode_if.h
 NOMAN=
 
 NPPP?=         2
@@ -23,10 +23,10 @@ SRCS+=      bsd_comp.c
 SRCS+= ppp_deflate.c zlib.c
 .endif
 
-CLEANFILES=    ppp.h
+CLEANFILES=    use_ppp.h
 
-ppp.h:
-       echo "#define NPPP ${NPPP}" > ppp.h
+use_ppp.h:
+       echo "#define NPPP ${NPPP}" > use_ppp.h
 
 opt_inet.h:
        touch opt_inet.h
index ce56c71..fe006a6 100644 (file)
@@ -1,21 +1,21 @@
 # $FreeBSD: src/sys/modules/if_sl/Makefile,v 1.13 1999/11/28 18:52:53 bde Exp $
-# $DragonFly: src/sys/net/sl/Makefile,v 1.2 2003/06/17 04:28:44 dillon Exp $
+# $DragonFly: src/sys/net/sl/Makefile,v 1.3 2003/08/15 07:03:11 dillon Exp $
 
-.PATH:  ${.CURDIR}/../../net
+.PATH:  ${.CURDIR}/../ppp_layer
 KMOD=   if_sl
-SRCS=   if_sl.c slcompress.c opt_inet.h sl.h
+SRCS=   if_sl.c slcompress.c opt_inet.h use_sl.h
 NOMAN=
 
 NSL?=          2
 PROTOS?=       -DINET
 
 CFLAGS+= ${PROTOS}
-CLEANFILES=    sl.h
+CLEANFILES=    use_sl.h
 
 opt_inet.h:
        echo "#define INET 1" > opt_inet.h
 
-sl.h:
-       echo "#define NSL ${NSL}" > sl.h
+use_sl.h:
+       echo "#define NSL ${NSL}" > use_sl.h
 
 .include <bsd.kmod.mk>
index 901a314..655d849 100644 (file)
@@ -1,7 +1,7 @@
 # $FreeBSD: src/sys/modules/sppp/Makefile,v 1.5.2.1 2002/06/17 06:14:40 jhay Exp $
-# $DragonFly: src/sys/net/sppp/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
+# $DragonFly: src/sys/net/sppp/Makefile,v 1.3 2003/08/15 07:03:12 dillon Exp $
 
-.PATH: ${.CURDIR}/../../net
+.PATH: ${.CURDIR}/../ppp_layer
 
 KMOD=  sppp
 SRCS=  if_spppsubr.c slcompress.c