General cleanup.

intl/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,14 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS		= uconv unicharutil locale strres lwbrk chardet
 
 include $(topsrcdir)/config/rules.mk
+

intl/chardet/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,14 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS		= public src
 
 include $(topsrcdir)/config/rules.mk
+

intl/chardet/public/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -39,3 +40,4 @@ EXPORTS		= \
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+

intl/chardet/src/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,8 +26,7 @@ MODULE		= chardet
 LIBRARY_NAME	= chardet
 IS_COMPONENT	= 1
 
-CSRCS		= \
+REQUIRES	= libxpcom
-		  $(NULL)
 
 CPPSRCS		= \
 		nsCharDetDll.cpp \
@@ -39,10 +39,5 @@ CPPSRCS		= \
 		nsCyrillicDetector.cpp \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-CFLAGS		+= -DUSE_NSREG -D__STDC__
-
-REQUIRES	= $(MODULE) libxpcom
-
 include $(topsrcdir)/config/rules.mk
+

intl/chardet/src/classic/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@@ -25,8 +26,7 @@ MODULE		= chardetc
 LIBRARY_NAME	= chardetc
 IS_COMPONENT	= 1
 
-CSRCS		= \
+REQUIRES	= libxpcom
-		  $(NULL)
 
 CPPSRCS		= \
 		nsClassicCharDetDll.cpp \
@@ -35,8 +35,5 @@ CPPSRCS		= \
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-CFLAGS		+= -DUSE_NSREG -D__STDC__
-
-REQUIRES	= $(MODULE) libxpcom
-
 include $(topsrcdir)/config/rules.mk
+

intl/chardet/tests/Makefile.in

@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -21,18 +22,13 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS		= DetectCharset.cpp 
-
-include $(topsrcdir)/config/config.mk
-
-#DEFINES		+= -DUSE_NSREG
-INCLUDES	+= -I$(srcdir)/../public -I$(DIST)/include
-
-LIBS	= \
-	-lxpcom \
-	$(NSPR_LIBS) \
-	$(NULL)
-
 PROGRAM		= DetectCharset
 
+CPPSRCS		= DetectCharset.cpp
+
+LIBS		= -lxpcom $(NSPR_LIBS)
+
 include $(topsrcdir)/config/rules.mk
+
+INCLUDES	+= -I$(srcdir)/../public -I$(DIST)/include
+

intl/compatibility/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,14 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS		= idl src
 
 include $(topsrcdir)/config/rules.mk
+

intl/compatibility/idl/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,18 +13,18 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= intlcmpt
 
-XPIDLSRCS =                             \
+XPIDLSRCS	= nsII18nCompatibility.idl
-	nsII18nCompatibility.idl        \
-	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+

intl/compatibility/src/Makefile.in

@@ -1,3 +1,4 @@
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -12,26 +13,27 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE		= intlcmpt
 LIBRARY_NAME	= intlcmpt
 IS_COMPONENT	= 1
 
-MODULE = intlcmpt 
-
 REQUIRES	= xpcom
 
-INCLUDES+= -I..
-
 CPPSRCS		= \
 		nsI18nCompatibility.cpp \
 		nsCSIDtoCharsetName.cpp \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
+INCLUDES	+= -I..
+

intl/locale/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,18 +13,20 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS		= public idl src
 
-ifdef ENABLE_TESTS
+#ifdef ENABLE_TESTS
-# DIRS += tests
+#DIRS		+= tests
-endif
+#endif
 
 include $(topsrcdir)/config/rules.mk
+

intl/locale/idl/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,11 +13,12 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -30,3 +31,4 @@ XPIDLSRCS = \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+

intl/locale/public/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,11 +13,12 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -34,3 +35,4 @@ EXPORTS = \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+

intl/locale/src/Makefile.in

@@ -1,3 +1,4 @@
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -12,21 +13,19 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
+MODULE		= locale
-
-DIRS = unix
-
 LIBRARY_NAME	= nslocale_s
 
-MODULE = locale
+DIRS		= unix
 
 REQUIRES	= xpcom unicharutil
 
@@ -48,3 +47,4 @@ override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
+

intl/locale/src/os2/Makefile.in

@@ -1,3 +1,4 @@
+#
 # The contents of this file are subject to the Mozilla Public License
 # Version 1.1 (the "License"); you may not use this file except in
 # compliance with the License. You may obtain a copy of the License at
@@ -13,22 +14,24 @@
 # The Initial Developer of the Original Code is John Fairhurst,
 # <john_fairhurst@iname.com>.  Portions created by John Fairhurst are
 # Copyright (C) 1999 John Fairhurst. All Rights Reserved.
+#
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = nglocale
-
 MODULE		= locale
+LIBRARY_NAME	= nglocale
+IS_COMPONENT	= 1
+OS2_IMPLIB	= 1
+OS2_LIBRARYNAME	= nglocale
+OS2_LIBS	= libuni xpcom ngbase libnslocale_s
 
 REQUIRES	= xpcom unicharutil
 
-EXPORTS = nsILocaleOS2.h
-
 CPPSRCS		= \
 		nsLocaleOS2.cpp \
 		nsLocaleFactoryOS2.cpp \
@@ -37,13 +40,11 @@ CPPSRCS =                  \
 		nsLocaleDllOS2.cpp \
 		$(NULL)
 
-IS_COMPONENT=1
+EXPORTS		= nsILocaleOS2.h
 
-OS2_IMPLIB = 1
+include $(topsrcdir)/config/rules.mk
-OS2_LIBRARYNAME = nglocale
-OS2_LIBS = libuni xpcom ngbase libnslocale_s
-OS_LIBS += $(NSPR_LIBS)
 
 INCLUDES	+= $(srcdir) $(srcdir)/..
 
-include $(topsrcdir)/config/rules.mk
+OS_LIBS		+= $(NSPR_LIBS)
+

intl/locale/src/unix/Makefile.in

@@ -1,3 +1,4 @@
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -12,25 +13,21 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE		= locale
 LIBRARY_NAME	= nslocale
 IS_COMPONENT	= 1
 
-MODULE = locale
-
 REQUIRES	= xpcom unicharutil
 
-EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lnslocale_s
-
-INCLUDES+= -I..
-
 CPPSRCS		= \
 		nsCollationUnix.cpp \
 		nsDateTimeFormatUnix.cpp \
@@ -40,4 +37,9 @@ CPPSRCS = \
 		nsPosixLocaleFactory.cpp \
 		$(NULL)
 
+EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lnslocale_s
+
 include $(topsrcdir)/config/rules.mk
+
+INCLUDES	+= -I..
+

intl/locale/tests/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,11 +13,12 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -27,14 +28,10 @@ CPPSRCS = \
 		$(NULL)
 
 SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
+
 LOCAL_INCLUDES	= -I$(srcdir)/../src
 
-include $(topsrcdir)/config/config.mk
+LIBS		= -lxpcom $(NSPR_LIBS)
-
-LIBS = \
-	-lxpcom \
-	$(NSPR_LIBS) \
-	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 

intl/lwbrk/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,11 +13,12 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -28,3 +29,4 @@ DIRS += tests
 endif
 
 include $(topsrcdir)/config/rules.mk
+

intl/lwbrk/public/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -37,3 +38,4 @@ EXPORTS		= \
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+

intl/lwbrk/src/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,9 +26,9 @@ MODULE		= lwbrk
 LIBRARY_NAME	= lwbrk
 IS_COMPONENT	= 1
 
-CSRCS		= \
+REQUIRES	= libxpcom
-                  rulebrk.c \
+
-		  $(NULL)
+CSRCS		= rulebrk.c
 
 CPPSRCS		= \
 		nsJISx4501LineBreaker.cpp \
@@ -38,8 +39,7 @@ CPPSRCS		=  \
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
+include $(topsrcdir)/config/rules.mk
+
 CFLAGS		+= -DUSE_NSREG -D__STDC__
 
-REQUIRES	= $(MODULE) libxpcom
-
-include $(topsrcdir)/config/rules.mk

intl/lwbrk/tests/Makefile.in

@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -21,18 +22,13 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS		= TestLineBreak.cpp 
-
-include $(topsrcdir)/config/config.mk
-
-#DEFINES		+= -DUSE_NSREG
-INCLUDES	+= -I$(srcdir)/../public -I$(DIST)/include
-
-LIBS	= \
-	-lxpcom \
-	$(NSPR_LIBS) \
-	$(NULL)
-
 PROGRAM		= TestLineBreak
 
+CPPSRCS		= TestLineBreak.cpp
+
+LIBS		= -lxpcom $(NSPR_LIBS)
+
 include $(topsrcdir)/config/rules.mk
+
+INCLUDES	+= -I$(srcdir)/../public -I$(DIST)/include
+

intl/strres/Makefile.in

@@ -29,3 +29,4 @@ DIRS		+= tests
 endif
 
 include $(topsrcdir)/config/rules.mk
+

intl/strres/public/Makefile.in

@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -14,22 +13,18 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH=../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+MODULE		= intl
 
-MODULE=intl
+XPIDLSRCS	= nsIStringBundle.idl
-
-include $(topsrcdir)/config/config.mk
-
-XPIDLSRCS = \
-	nsIStringBundle.idl \
-	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+

intl/strres/src/Makefile.in

@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -14,30 +13,22 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH=../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+MODULE		= intl
 LIBRARY_NAME	= strres
 IS_COMPONENT	= 1
 
 CPPSRCS		= nsStringBundle.cpp
 
-MODULE=intl
+EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lneckoutil_s
-
-include $(topsrcdir)/config/config.mk
-
-TARGET = $(LIBARY)
-
-EXTRA_DSO_LDOPTS =\
-				-L$(DIST)/lib -lneckoutil_s \
-				$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-test:
-	@echo OS_ARCH = $(OS_ARCH)

intl/uconv/Makefile.in

@@ -1,5 +1,4 @@
-# Generated automatically from Makefile.in by configure.
+#
-#!gmake
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -14,20 +13,20 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS	= public src
+DIRS		= public src ucvja ucvcn ucvlatin ucvtw ucvtw2 ucvko
 
-DIRS += ucvja ucvcn ucvlatin ucvtw ucvtw2 ucvko
+#ifdef ENABLE_TESTS
-
+#DIRS		+= tests
-ifdef ENABLE_TESTS
+#endif
-# DIRS += tests
-endif
 
 include $(topsrcdir)/config/rules.mk
+

intl/uconv/public/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -41,3 +42,4 @@ EXPORTS		= \
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+

intl/uconv/src/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,6 +26,8 @@ MODULE		= uconv
 LIBRARY_NAME	= uconv
 IS_COMPONENT	= 1
 
+REQUIRES	= libxpcom
+
 CSRCS		= \
 		ugen.c \
 		uscan.c \
@@ -43,26 +46,19 @@ CPPSRCS		= \
 		nsMappingCache.cpp \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-CFLAGS		+= -DUSE_NSREG -D__STDC__
-
-REQUIRES	= $(MODULE) libxpcom 
-
-EXTRA_DSO_LDOPTS =\
-		-L$(DIST)/lib -lneckoutil_s \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES        += -I$(srcdir)/../ucvlatin \
-                   -I$(srcdir)/../ucvja
-
-
 EXPORT_RESOURCE	= \
 		$(srcdir)/unixcharset.properties \
 		$(srcdir)/charsetalias.properties \
 		$(NULL)
 
+EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lneckoutil_s
+
+include $(topsrcdir)/config/rules.mk
+
+CFLAGS		+= -DUSE_NSREG -D__STDC__
+
+INCLUDES	+= -I$(srcdir)/../ucvlatin -I$(srcdir)/../ucvja
+
 install::
 	$(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/res
+

intl/uconv/tests/Makefile.in

@@ -22,9 +22,11 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS		= nsTestUConv.cpp  \
+CPPSRCS		= \
+		nsTestUConv.cpp \
 		nsconv.cpp \
-		  plattest.cpp
+		plattest.cpp \
+		$(NULL)
 
 SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
 
@@ -43,3 +45,4 @@ ifneq ($(OS_RELEASE),1.2)
 OS_LIBS		+= /usr/lib/libdl.so
 endif
 endif
+

intl/uconv/ucvcn/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,8 +26,7 @@ MODULE		= ucvcn
 LIBRARY_NAME	= ucvcn
 IS_COMPONENT	= 1
 
-CSRCS		=  \
+REQUIRES	= libxpcom
-		  $(NULL)
 
 CPPSRCS		= \
 		nsGB2312ToUnicodeV2.cpp \
@@ -46,14 +46,8 @@ CPPSRCS		= \
 		nsUCvCnDll.cpp \
 		$(NULL)
 
-EXPORTS         = \
+EXPORTS		= nsUCvCnCID.h
-                  nsUCvCnCID.h \
-		  $(NULL)
-
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-CFLAGS		+= -DUSE_NSREG -D__STDC__
-
-REQUIRES	= $(MODULE) libxpcom 
-
 include $(topsrcdir)/config/rules.mk
+

intl/uconv/ucvja/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,8 +26,7 @@ MODULE		= ucvja
 LIBRARY_NAME	= ucvja
 IS_COMPONENT	= 1
 
-CSRCS		=  \
+REQUIRES	= libxpcom
-		  $(NULL)
 
 CPPSRCS		= \
 		nsJapaneseToUnicode.cpp \
@@ -52,8 +52,5 @@ EXPORTS         = \
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-CFLAGS		+= -DUSE_NSREG -D__STDC__
-
-REQUIRES	= $(MODULE) libxpcom
-
 include $(topsrcdir)/config/rules.mk
+

intl/uconv/ucvko/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,8 +26,7 @@ MODULE		= ucvko
 LIBRARY_NAME	= ucvko
 IS_COMPONENT	= 1
 
-CSRCS		=  \
+REQUIRES	= libxpcom
-		  $(NULL)
 
 CPPSRCS		= \
 		nsEUCKRToUnicode.cpp \
@@ -41,14 +41,8 @@ CPPSRCS		= \
 		nsUCvKODll.cpp \
 		$(NULL)
 
-EXPORTS         = \
+EXPORTS		= nsUCvKOCID.h
-                  nsUCvKOCID.h \
-		  $(NULL)
-                
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-CFLAGS		+= -DUSE_NSREG -D__STDC__
-
-REQUIRES	= $(MODULE) libxpcom
-
 include $(topsrcdir)/config/rules.mk
+

intl/uconv/ucvlatin/Makefile.in

@@ -26,6 +26,8 @@ MODULE		= ucvlatin
 LIBRARY_NAME	= ucvlatin
 IS_COMPONENT	= 1
 
+REQUIRES	= libxpcom
+
 CPPSRCS		= \
 		nsUEscapeToUnicode.cpp \
 		nsAsciiToUnicode.cpp \
@@ -140,14 +142,8 @@ CPPSRCS		= \
 		nsUCvLatinDll.cpp \
 		$(NULL)
 
-EXPORTS         = \
+EXPORTS		= nsUCvLatinCID.h
-                  nsUCvLatinCID.h \
-		  $(NULL)
-
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-CFLAGS		+= -DUSE_NSREG -D__STDC__
-
-REQUIRES	= $(MODULE) libxpcom 
-
 include $(topsrcdir)/config/rules.mk
+

intl/uconv/ucvtw/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,8 +26,7 @@ MODULE		= ucvtw
 LIBRARY_NAME	= ucvtw
 IS_COMPONENT	= 1
 
-CSRCS		=  \
+REQUIRES	= libxpcom
-		  $(NULL)
 
 CPPSRCS		= \
 		nsBIG5ToUnicode.cpp \
@@ -38,14 +38,8 @@ CPPSRCS		= \
 		nsUCvTWDll.cpp \
 		$(NULL)
 
-EXPORTS         = \
+EXPORTS		= nsUCvTWCID.h
-                  nsUCvTWCID.h \
-		  $(NULL)
-                
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-CFLAGS		+= -DUSE_NSREG -D__STDC__
-
-REQUIRES	= $(MODULE) libxpcom
-
 include $(topsrcdir)/config/rules.mk
+

intl/uconv/ucvtw2/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,8 +26,7 @@ MODULE		= ucvtw2
 LIBRARY_NAME	= ucvtw2
 IS_COMPONENT	= 1
 
-CSRCS		=  \
+REQUIRES	= $(MODULE) libxpcom
-		  $(NULL)
 
 CPPSRCS		= \
 		nsEUCTWToUnicode.cpp \
@@ -42,14 +42,8 @@ CPPSRCS		= \
 		nsUCvTW2Dll.cpp \
 		$(NULL)
 
-EXPORTS         = \
+EXPORTS		= nsUCvTW2CID.h
-                  nsUCvTW2CID.h \
-		  $(NULL)
-                
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-CFLAGS		+= -DUSE_NSREG -D__STDC__
-
-REQUIRES	= $(MODULE) libxpcom
-
 include $(topsrcdir)/config/rules.mk
+

intl/unicharutil/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,11 +13,12 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -28,3 +29,4 @@ DIRS += tests
 endif
 
 include $(topsrcdir)/config/rules.mk
+

intl/unicharutil/idl/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,18 +13,18 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= unicharutil
 
-XPIDLSRCS = \
+XPIDLSRCS	= nsIEntityConverter.idl
-	nsIEntityConverter.idl		\
-	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+

intl/unicharutil/public/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -37,3 +38,4 @@ EXPORTS		= \
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+

intl/unicharutil/src/Makefile.in

@@ -1,4 +1,4 @@
-#!gmake
+#
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,24 +26,17 @@ MODULE		= unicharutil
 LIBRARY_NAME	= unicharutil
 IS_COMPONENT	= 1
 
-CSRCS		= \
+REQUIRES	= libxpcom
-		  $(NULL)
 
-CPPSRCS		= nsCaseConversionImp2.cpp \
+CPPSRCS		= \
+		nsCaseConversionImp2.cpp \
 		nsUnicharUtilFactory.cpp \
 		nsCategoryImp.cpp \
 		nsHankakuToZenkaku.cpp \
 		nsEntityConverter.cpp \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lneckoutil_s
-
-CFLAGS		+= -DUSE_NSREG -D__STDC__
-
-REQUIRES	= $(MODULE) libxpcom
-
-EXTRA_DSO_LDOPTS =\
-				-L$(DIST)/lib -lneckoutil_s \
-				$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+

intl/unicharutil/tables/Makefile.in

@@ -22,12 +22,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORT_RESOURCE	= \
-		$(srcdir)/html40Latin1.properties \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 install::
-	$(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/res/entityTables
+	$(INSTALL) $(srcdir)/html40Latin1.properties $(DIST)/bin/res/entityTables
 

intl/unicharutil/tools/Makefile.in

@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -14,30 +13,25 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= ucgendat
-
-CSRCS = \
-	ucgendat.c \
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-
 PROGRAM		= ucgendat
 
-# XXX replace with proper configure test for glib
+CSRCS		= ucgendat.c
-CFLAGS += $(shell $(GLIB-CONFIG) --cflags)
 
 # XXX need configure test
 EX_LIBS		= $(shell $(GLIB-CONFIG) --libs)
 
 include $(topsrcdir)/config/rules.mk
 
+# XXX replace with proper configure test for glib
+CFLAGS		+= $(shell $(GLIB-CONFIG) --cflags)
+