patch-2.4.0-test5 linux/fs/nls/Makefile

• Lines: 365
• Date: Tue Jul 18 22:48:32 2000
• Orig file: v2.4.0-test4/linux/fs/nls/Makefile
• Orig date: Thu Aug 26 13:05:40 1999

diff -u --recursive --new-file v2.4.0-test4/linux/fs/nls/Makefile linux/fs/nls/Makefile
@@ -4,313 +4,59 @@
 
 MOD_LIST_NAME := NLS_MODULES
 
-NLS = nls_base.o
+obj-y	:=	nls_base.o
+obj-m	:=
+obj-n	:=
+obj-	:=
+
+obj-$(CONFIG_NLS_CODEPAGE_437)	+= nls_cp437.o
+obj-$(CONFIG_NLS_CODEPAGE_737)	+= nls_cp737.o
+obj-$(CONFIG_NLS_CODEPAGE_775)	+= nls_cp775.o
+obj-$(CONFIG_NLS_CODEPAGE_850)	+= nls_cp850.o
+obj-$(CONFIG_NLS_CODEPAGE_852)	+= nls_cp852.o
+obj-$(CONFIG_NLS_CODEPAGE_855)	+= nls_cp855.o
+obj-$(CONFIG_NLS_CODEPAGE_857)	+= nls_cp857.o
+obj-$(CONFIG_NLS_CODEPAGE_860)	+= nls_cp860.o
+obj-$(CONFIG_NLS_CODEPAGE_861)	+= nls_cp861.o
+obj-$(CONFIG_NLS_CODEPAGE_862)	+= nls_cp862.o
+obj-$(CONFIG_NLS_CODEPAGE_863)	+= nls_cp863.o
+obj-$(CONFIG_NLS_CODEPAGE_864)	+= nls_cp864.o
+obj-$(CONFIG_NLS_CODEPAGE_865)	+= nls_cp865.o
+obj-$(CONFIG_NLS_CODEPAGE_866)	+= nls_cp866.o
+obj-$(CONFIG_NLS_CODEPAGE_869)	+= nls_cp869.o
+obj-$(CONFIG_NLS_CODEPAGE_874)	+= nls_cp874.o
+obj-$(CONFIG_NLS_CODEPAGE_932)	+= nls_cp932.o nls_sjis.o nls_euc-jp.o
+obj-$(CONFIG_NLS_CODEPAGE_936)	+= nls_cp936.o nls_gb2312.o
+obj-$(CONFIG_NLS_CODEPAGE_949)	+= nls_cp949.o nls_euc-kr.o
+obj-$(CONFIG_NLS_CODEPAGE_950)	+= nls_cp950.o nls_big5.o
+obj-$(CONFIG_NLS_CODEPAGE_1250)	+= nls_cp1250.o
+obj-$(CONFIG_NLS_CODEPAGE_1251)	+= nls_cp1251.o
+obj-$(CONFIG_NLS_CODEPAGE_1252)	+= nls_cp1252.o
+obj-$(CONFIG_NLS_CODEPAGE_1253)	+= nls_cp1253.o
+obj-$(CONFIG_NLS_CODEPAGE_1254)	+= nls_cp1254.o
+obj-$(CONFIG_NLS_CODEPAGE_1255)	+= nls_cp1255.o
+obj-$(CONFIG_NLS_CODEPAGE_1256)	+= nls_cp1256.o
+obj-$(CONFIG_NLS_CODEPAGE_1257)	+= nls_cp1257.o
+obj-$(CONFIG_NLS_CODEPAGE_1258)	+= nls_cp1258.o
+obj-$(CONFIG_NLS_ISO8859_1)	+= nls_iso8859-1.o
+obj-$(CONFIG_NLS_ISO8859_2)	+= nls_iso8859-2.o
+obj-$(CONFIG_NLS_ISO8859_3)	+= nls_iso8859-3.o
+obj-$(CONFIG_NLS_ISO8859_4)	+= nls_iso8859-4.o
+obj-$(CONFIG_NLS_ISO8859_5)	+= nls_iso8859-5.o
+obj-$(CONFIG_NLS_ISO8859_6)	+= nls_iso8859-6.o
+obj-$(CONFIG_NLS_ISO8859_7)	+= nls_iso8859-7.o
+obj-$(CONFIG_NLS_ISO8859_8)	+= nls_iso8859-8.o
+obj-$(CONFIG_NLS_ISO8859_9)	+= nls_iso8859-9.o
+obj-$(CONFIG_NLS_ISO8859_10)	+= nls_iso8859-10.o
+obj-$(CONFIG_NLS_ISO8859_14)	+= nls_iso8859-14.o
+obj-$(CONFIG_NLS_ISO8859_15)	+= nls_iso8859-15.o
+obj-$(CONFIG_NLS_KOI8_R)	+= nls_koi8-r.o
+obj-$(CONFIG_NLS_ABC)		+= nls_abc.o
+obj-$(CONFIG_NLS_UTF8)		+= nls_utf8.o
 
-ifeq ($(CONFIG_NLS_CODEPAGE_437),y)
-NLS += nls_cp437.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_437),m)
-  M_OBJS += nls_cp437.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_737),y)
-NLS += nls_cp737.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_737),m)
-  M_OBJS += nls_cp737.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_775),y)
-NLS += nls_cp775.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_775),m)
-  M_OBJS += nls_cp775.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_850),y)
-NLS += nls_cp850.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_850),m)
-  M_OBJS += nls_cp850.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_852),y)
-NLS += nls_cp852.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_852),m)
-  M_OBJS += nls_cp852.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_855),y)
-NLS += nls_cp855.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_855),m)
-  M_OBJS += nls_cp855.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_857),y)
-NLS += nls_cp857.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_857),m)
-  M_OBJS += nls_cp857.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_860),y)
-NLS += nls_cp860.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_860),m)
-  M_OBJS += nls_cp860.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_861),y)
-NLS += nls_cp861.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_861),m)
-  M_OBJS += nls_cp861.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_862),y)
-NLS += nls_cp862.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_862),m)
-  M_OBJS += nls_cp862.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_863),y)
-NLS += nls_cp863.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_863),m)
-  M_OBJS += nls_cp863.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_864),y)
-NLS += nls_cp864.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_864),m)
-  M_OBJS += nls_cp864.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_865),y)
-NLS += nls_cp865.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_865),m)
-  M_OBJS += nls_cp865.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_866),y)
-NLS += nls_cp866.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_866),m)
-  M_OBJS += nls_cp866.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_869),y)
-NLS += nls_cp869.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_869),m)
-  M_OBJS += nls_cp869.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_874),y)
-NLS += nls_cp874.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_874),m)
-  M_OBJS += nls_cp874.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_1250),y)
-NLS += nls_cp1250.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_1250),m)
-  M_OBJS += nls_cp1250.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_1251),y)
-NLS += nls_cp1251.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_1251),m)
-  M_OBJS += nls_cp1251.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_1252),y)
-NLS += nls_cp1252.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_1252),m)
-  M_OBJS += nls_cp1252.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_1253),y)
-NLS += nls_cp1253.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_1253),m)
-  M_OBJS += nls_cp1253.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_1254),y)
-NLS += nls_cp1254.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_1254),m)
-  M_OBJS += nls_cp1254.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_1255),y)
-NLS += nls_cp1255.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_1255),m)
-  M_OBJS += nls_cp1255.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_1256),y)
-NLS += nls_cp1256.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_1256),m)
-  M_OBJS += nls_cp1256.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_1257),y)
-NLS += nls_cp1257.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_1257),m)
-  M_OBJS += nls_cp1257.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_CODEPAGE_1258),y)
-NLS += nls_cp1258.o
-else
-  ifeq ($(CONFIG_NLS_CODEPAGE_1258),m)
-  M_OBJS += nls_cp1258.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_ISO8859_1),y)
-NLS += nls_iso8859-1.o
-else
-  ifeq ($(CONFIG_NLS_ISO8859_1),m)
-  M_OBJS += nls_iso8859-1.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_ISO8859_2),y)
-NLS += nls_iso8859-2.o
-else
-  ifeq ($(CONFIG_NLS_ISO8859_2),m)
-  M_OBJS += nls_iso8859-2.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_ISO8859_3),y)
-NLS += nls_iso8859-3.o
-else
-  ifeq ($(CONFIG_NLS_ISO8859_3),m)
-  M_OBJS += nls_iso8859-3.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_ISO8859_4),y)
-NLS += nls_iso8859-4.o
-else
-  ifeq ($(CONFIG_NLS_ISO8859_4),m)
-  M_OBJS += nls_iso8859-4.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_ISO8859_5),y)
-NLS += nls_iso8859-5.o
-else
-  ifeq ($(CONFIG_NLS_ISO8859_5),m)
-  M_OBJS += nls_iso8859-5.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_ISO8859_6),y)
-NLS += nls_iso8859-6.o
-else
-  ifeq ($(CONFIG_NLS_ISO8859_6),m)
-  M_OBJS += nls_iso8859-6.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_ISO8859_7),y)
-NLS += nls_iso8859-7.o
-else
-  ifeq ($(CONFIG_NLS_ISO8859_7),m)
-  M_OBJS += nls_iso8859-7.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_ISO8859_8),y)
-NLS += nls_iso8859-8.o
-else
-  ifeq ($(CONFIG_NLS_ISO8859_8),m)
-  M_OBJS += nls_iso8859-8.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_ISO8859_9),y)
-NLS += nls_iso8859-9.o
-else
-  ifeq ($(CONFIG_NLS_ISO8859_9),m)
-  M_OBJS += nls_iso8859-9.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_ISO8859_10),y)
-NLS += nls_iso8859-10.o
-else
-  ifeq ($(CONFIG_NLS_ISO8859_10),m)
-  M_OBJS += nls_iso8859-10.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_ISO8859_14),y)
-NLS += nls_iso8859-14.o
-else
-  ifeq ($(CONFIG_NLS_ISO8859_14),m)
-  M_OBJS += nls_iso8859-14.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_ISO8859_15),y)
-NLS += nls_iso8859-15.o
-else
-  ifeq ($(CONFIG_NLS_ISO8859_15),m)
-  M_OBJS += nls_iso8859-15.o
-  endif
-endif
-
-ifeq ($(CONFIG_NLS_KOI8_R),y)
-NLS += nls_koi8-r.o
-else
-  ifeq ($(CONFIG_NLS_KOI8_R),m)
-  M_OBJS += nls_koi8-r.o
-  endif
-endif
+OX_OBJS		= $(obj-y)
+M_OBJS		= $(obj-m)
 
 O_TARGET = nls.o
-OX_OBJS  = $(NLS)
 
 include $(TOPDIR)/Rules.make