summaryrefslogtreecommitdiffstats
path: root/fs/isofs/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-01-10 17:17:53 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-01-10 17:17:53 +0000
commitb2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch)
tree954a648692e7da983db1d2470953705f6a729264 /fs/isofs/Makefile
parentc9c06167e7933d93a6e396174c68abf242294abb (diff)
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'fs/isofs/Makefile')
-rw-r--r--fs/isofs/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/isofs/Makefile b/fs/isofs/Makefile
index b6cbdc6af..186492b5b 100644
--- a/fs/isofs/Makefile
+++ b/fs/isofs/Makefile
@@ -8,12 +8,10 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
O_TARGET := isofs.o
-O_OBJS := namei.o inode.o dir.o util.o rock.o
-ifdef CONFIG_JOLIET
-O_OBJS += joliet.o
-endif
+obj-y := namei.o inode.o dir.o util.o rock.o
+obj-$(CONFIG_JOLIET) += joliet.o
-M_OBJS := $(O_TARGET)
+obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make