IFC @r273206

5 files changed, 6 insertions, 23 deletions

diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile
index 9e2ae97..af8c3c7 100644
--- a/sys/modules/if_gif/Makefile
+++ b/sys/modules/if_gif/Makefile
@@ -6,7 +6,7 @@ SYSDIR?=${.CURDIR}/../..
 .PATH: ${SYSDIR}/net ${SYSDIR}/netinet ${SYSDIR}/netinet6
 
 KMOD=	if_gif
-SRCS=	if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
+SRCS=	if_gif.c in_gif.c opt_inet.h opt_inet6.h
 
 .if defined(KERNBUILDDIR)
 OPT_INET6!= cat ${KERNBUILDDIR}/opt_inet6.h; echo
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index e02ac88..d83a044 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -15,7 +15,8 @@ SRCS=	linux_fork.c linux${SFX}_dummy.c linux_emul.c linux_file.c \
 	linux${SFX}_sysvec.c linux_uid16.c linux_util.c linux_time.c \
 	linux_timer.c \
 	opt_inet6.h opt_compat.h opt_posix.h opt_usb.h vnode_if.h \
-	device_if.h bus_if.h assym.s
+	device_if.h bus_if.h assym.s \
+	linux${SFX}_locore.s linux${SFX}_support.s
 
 # XXX: for assym.s
 SRCS+=  opt_kstack_pages.h opt_nfs.h opt_compat.h opt_hwpmc_hooks.h
@@ -23,8 +24,6 @@ SRCS+=  opt_kstack_pages.h opt_nfs.h opt_compat.h opt_hwpmc_hooks.h
 SRCS+=	opt_apic.h
 .endif
 
-OBJS=	linux${SFX}_locore.o linux${SFX}_support.o
-
 .if ${MACHINE_CPUARCH} == "i386"
 SRCS+=	linux_ptrace.c imgact_linux.c opt_cpu.h
 .endif
@@ -45,15 +44,15 @@ linux${SFX}_assym.h: @/kern/genassym.sh
 .endif
 	sh @/kern/genassym.sh linux${SFX}_genassym.o > ${.TARGET}
 
-linux${SFX}_locore.o: linux${SFX}_locore.s linux${SFX}_assym.h
+linux${SFX}_locore.o: linux${SFX}_assym.h assym.s
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
 	    ${.IMPSRC} -o ${.TARGET}
 
-linux${SFX}_support.o: linux${SFX}_support.s assym.s linux${SFX}_assym.h
+linux${SFX}_support.o: linux${SFX}_assym.h assym.s
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
 	    ${.IMPSRC} -o ${.TARGET}
 
-linux${SFX}_genassym.o: linux${SFX}_genassym.c linux.h @ machine x86
+linux${SFX}_genassym.o:
 	${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC}
 
 .if !defined(KERNBUILDDIR)
diff --git a/sys/modules/qlxgb/Makefile b/sys/modules/qlxgb/Makefile
index 330cef9..caea34a 100644
--- a/sys/modules/qlxgb/Makefile
+++ b/sys/modules/qlxgb/Makefile
@@ -35,9 +35,4 @@ KMOD=	if_qlxgb
 SRCS=	qla_os.c qla_dbg.c qla_hw.c qla_misc.c qla_isr.c qla_ioctl.c
 SRCS+=	device_if.h bus_if.h pci_if.h
 
-clean:
-	rm -f opt_bdg.h device_if.h bus_if.h pci_if.h export_syms
-	rm -f *.o *.kld *.ko
-	rm -f @ machine
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/qlxgbe/Makefile b/sys/modules/qlxgbe/Makefile
index 2cf7d9d..2c6d743 100644
--- a/sys/modules/qlxgbe/Makefile
+++ b/sys/modules/qlxgbe/Makefile
@@ -41,10 +41,4 @@ SRCS+= device_if.h bus_if.h pci_if.h
 
 #CFLAGS += -DQL_DBG
 
-clean:
-	rm -f opt_bdg.h device_if.h bus_if.h pci_if.h export_syms
-	rm -f *.o *.kld *.ko
-	rm -f @ machine x86
-
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/qlxge/Makefile b/sys/modules/qlxge/Makefile
index 98b40fd..b34488a 100644
--- a/sys/modules/qlxge/Makefile
+++ b/sys/modules/qlxge/Makefile
@@ -41,10 +41,5 @@ SRCS+= device_if.h bus_if.h pci_if.h
 
 CFLAGS += -DQL_DBG
 
-clean:
-	rm -f opt_bdg.h device_if.h bus_if.h pci_if.h export_syms
-	rm -f *.o *.kld *.ko
-	rm -f @ machine x86
-
 .include <bsd.kmod.mk>