patch-2.1.61 linux/fs/nls/Makefile

Next file: linux/fs/nls/nls_base.c
Previous file: linux/fs/nls/Config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.60/linux/fs/nls/Makefile linux/fs/nls/Makefile
@@ -4,15 +4,7 @@
 
 MOD_LIST_NAME := NLS_MODULES
 
-ifeq ($(CONFIG_NLS),y)
-NLS += nls_base.o
-O_TARGET = nls.o
-OX_OBJS  = $(NLS)
-else
-  ifeq ($(CONFIG_NLS),m)
-  MX_OBJS += nls_base.o
-  endif
-endif
+NLS = nls_base.o
 
 ifeq ($(CONFIG_NLS_CODEPAGE_437),y)
 NLS += nls_cp437.o
@@ -301,5 +293,8 @@
   M_OBJS += nls_koi8-r.o
   endif
 endif
+
+O_TARGET = nls.o
+OX_OBJS  = $(NLS)
 
 include $(TOPDIR)/Rules.make

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov