2000-12-14 18:45:49

by Petr Vandrovec

[permalink] [raw]
Subject: [PATCH] 2.4.0-test13-pre1 Makefile fixes

Hi Linus,
test13 pre1 contains
(1) lowercase agp :-(
(2) even if matroxfb is compiled into kernel, you can have some
parts of it compiled as modules (i2c support, g400 second head)
BTW, why both-m rule is not in Rules.make? I copied this one
from drivers/Makefile...
Thanks,
Petr Vandrovec
[email protected]

diff -urdN linux/drivers/char/Makefile linux/drivers/char/Makefile
--- linux/drivers/char/Makefile Thu Dec 14 17:43:18 2000
+++ linux/drivers/char/Makefile Thu Dec 14 17:53:14 2000
@@ -155,7 +155,7 @@
subdir-$(CONFIG_FTAPE) += ftape
subdir-$(CONFIG_DRM) += drm
subdir-$(CONFIG_PCMCIA) += pcmcia
-subdir-$(CONFIG_agp) += agp
+subdir-$(CONFIG_AGP) += agp

ifeq ($(CONFIG_FTAPE),y)
obj-y += ftape/ftape.o
diff -urdN linux/drivers/video/Makefile linux/drivers/video/Makefile
--- linux/drivers/video/Makefile Thu Dec 14 17:43:18 2000
+++ linux/drivers/video/Makefile Thu Dec 14 18:05:03 2000
@@ -6,6 +6,8 @@
O_OBJS :=
M_OBJS :=

+mod-subdirs := matrox
+
# All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.

@@ -119,6 +121,8 @@
obj-$(CONFIG_FBCON_MFB) += fbcon-mfb.o
obj-$(CONFIG_FBCON_VGA) += fbcon-vga.o
obj-$(CONFIG_FBCON_HGA) += fbcon-hga.o
+
+both-m := $(filter $(mod-subdirs), $(subdir-y))

include $(TOPDIR)/Rules.make