PATCH: 2.3.0-test3/fs/partitions/Makefile cleanup

From: Adam J. Richter (adam@yggdrasil.com)
Date: Tue Jul 11 2000 - 04:47:38 EST


        A couple of months ago, I modularized fs/partitions/*.o and
posted the changes to linux-kernel. Everyone was pretty happy with it,
modulo a few stylistic suggestions, which I have since fixed. I would
like to move forward integrating these changes into the stock kernel.

        I want to do this in two steps to make it easier for you
to see the changes. First, I am submitting a patch to
fs/partitions/Makefile that changes it into the "new style"
that is used in many other places in the kernel. This is a patch that
you should apply even if you do not want to incorporate modularization
of fs/partitions/*.o. This change also requires that you do the
following:

        mv fs/partitions/msdos.c fs/partitions/msdos_part.c

        This will avoid a name collision with the msdos filesystem when
the msdos partitioning format is built as a module.

        Anyhow, I would appreciate it if you could incorporate this
small cleanup into your next test-pre release, and tne I will submit
the remainder of the modularization patch separately.

Adam J. Richter __ ______________ 4880 Stevens Creek Blvd, Suite 104
adam@yggdrasil.com \ / San Jose, California 95129-1034
+1 408 261-6630 | g g d r a s i l United States of America
fax +1 408 261-6631 "Free Software For The Rest Of Us."

--- linux-2.4.0-test3/fs/partitions/Makefile Wed Apr 12 09:47:30 2000
+++ linux/fs/partitions/Makefile Mon Jul 10 21:45:03 2000
@@ -8,47 +8,24 @@
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
 O_TARGET := partitions.o
-O_OBJS := check.o
+OX_OBJS := check.o
 
-ifeq ($(CONFIG_ACORN_PARTITION),y)
-O_OBJS += acorn.o
-endif
-
-ifeq ($(CONFIG_AMIGA_PARTITION),y)
-O_OBJS += amiga.o
-endif
-
-ifeq ($(CONFIG_ATARI_PARTITION),y)
-O_OBJS += atari.o
-endif
+obj-$(CONFIG_ACORN_PARTITION) += acorn.o
+obj-$(CONFIG_AMIGA_PARTITION) += amiga.o
+obj-$(CONFIG_ATARI_PARTITION) += atari.o
+obj-$(CONFIG_MAC_PARTITION) += mac.o
+obj-$(CONFIG_MSDOS_PARTITION) += msdos_part.o
+obj-$(CONFIG_OSF_PARTITION) += osf.o
+obj-$(CONFIG_SGI_PARTITION) += sgi.o
+obj-$(CONFIG_SUN_PARTITION) += sun.o
+obj-$(CONFIG_ULTRIX_PARTITION) += ultrix.o
 
+O_OBJS += $(obj-y)
+M_OBJS += $(obj-m)
 ifeq ($(CONFIG_IBM_PARTITION),y)
 O_OBJS += ibm.o
 endif
 
-ifeq ($(CONFIG_MAC_PARTITION),y)
-O_OBJS += mac.o
-endif
-
-ifeq ($(CONFIG_MSDOS_PARTITION),y)
-O_OBJS += msdos.o
-endif
-
-ifeq ($(CONFIG_OSF_PARTITION),y)
-O_OBJS += osf.o
-endif
-
-ifeq ($(CONFIG_SGI_PARTITION),y)
-O_OBJS += sgi.o
-endif
-
-ifeq ($(CONFIG_SUN_PARTITION),y)
-O_OBJS += sun.o
-endif
-
-ifeq ($(CONFIG_ULTRIX_PARTITION),y)
-O_OBJS += ultrix.o
-endif
-
 
 include $(TOPDIR)/Rules.make
+

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sat Jul 15 2000 - 21:00:12 EST