diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
| commit | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch) | |
| tree | 954a648692e7da983db1d2470953705f6a729264 /fs/nls | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'fs/nls')
| -rw-r--r-- | fs/nls/Config.in | 9 | ||||
| -rw-r--r-- | fs/nls/Makefile | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/fs/nls/Config.in b/fs/nls/Config.in index 5c9754aca..8baecf971 100644 --- a/fs/nls/Config.in +++ b/fs/nls/Config.in @@ -2,10 +2,17 @@ # Native language support configuration # +# smb wants NLS +if [ "$CONFIG_SMB_FS" = "m" -o "$CONFIG_SMB_FS" = "y" ]; then + define_bool CONFIG_SMB_NLS y +else + define_bool CONFIG_SMB_NLS n +fi + # msdos and Joliet want NLS if [ "$CONFIG_JOLIET" = "y" -o "$CONFIG_FAT_FS" != "n" \ -o "$CONFIG_NTFS_FS" != "n" -o "$CONFIG_NCPFS_NLS" = "y" \ - -o "$CONFIG_SMB_FS" != "n" ]; then + -o "$CONFIG_SMB_NLS" = "y" ]; then define_bool CONFIG_NLS y else define_bool CONFIG_NLS n diff --git a/fs/nls/Makefile b/fs/nls/Makefile index 893d3e1e9..194a3df8c 100644 --- a/fs/nls/Makefile +++ b/fs/nls/Makefile @@ -52,8 +52,7 @@ obj-$(CONFIG_NLS_KOI8_R) += nls_koi8-r.o obj-$(CONFIG_NLS_ABC) += nls_abc.o obj-$(CONFIG_NLS_UTF8) += nls_utf8.o -OX_OBJS = $(obj-y) -M_OBJS = $(obj-m) +export-objs = $(obj-y) O_TARGET = nls.o |