patch-1.3.63 linux/drivers/cdrom/Makefile

Next file: linux/drivers/cdrom/cdi.c
Previous file: linux/drivers/cdrom/Config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.62/linux/drivers/cdrom/Makefile linux/drivers/cdrom/Makefile
@@ -106,10 +106,24 @@
 
 ifeq ($(CONFIG_SJCD),y)
 L_OBJS += sjcd.o
-#else
-#  ifeq ($(CONFIG_SJCD),m)
-#  M_OBJS += sjcd.o
-#  endif
+else
+  ifeq ($(CONFIG_SJCD),m)
+  M_OBJS += sjcd.o
+  endif
 endif #CONFIG_SJCD
+
+ifeq ($(CONFIG_CDI_INIT),y)
+L_OBJS += cdi.o
+endif #CONFIG_CDI_INIT
+ifeq ($(CONFIG_ISP16_CDI),y)
+L_OBJS += isp16.o
+else
+#  ifeq ($(CONFIG_CDI_INIT),m)
+#  M_OBJS += cdi.o
+#  endif
+  ifeq ($(CONFIG_ISP16_CDI),m)
+  M_OBJS += isp16.o
+  endif
+endif #CONFIG_ISP16_CDI
 
 include $(TOPDIR)/Rules.make

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this