bug 221666 : remove redundant copy of nsCompressedCharMap.(h|cpp) and move them to intl/unicharutil out of gfx (r=smontagu, sr=rbs)

gfx/public/Makefile.in

@@ -32,7 +32,6 @@ EXPORTS		= \
 		nsColor.h \
 		nsColorNames.h \
 		nsColorNameList.h \
-		nsCompressedCharMap.h \
 		nsCoord.h \
 		nsFont.h \
 		nsRect.h \

gfx/src/Makefile.in

@@ -100,7 +100,6 @@ CPPSRCS = \
 
 ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
 REQUIRES += uconv
-CPPSRCS += nsCompressedCharMap.cpp
 endif
 
 ifneq (,$(filter gtk gtk2 xlib os2,$(MOZ_WIDGET_TOOLKIT)))

gfx/src/freetype/Makefile.in

@@ -33,6 +33,7 @@ REQUIRES	= xpcom \
 		  string \
 		  pref \
 		  uconv \
+		  unicharutil \
 		  $(NULL)
 
 CPPSRCS	= \

gfx/src/ps/Makefile.in

@@ -43,6 +43,7 @@ REQUIRES	= xpcom \
 		  view \
 		  necko \
 		  imglib2 \
+		  unicharutil \
 		  $(NULL)
 EXTRA_DSO_LIBS += gkgfx
 

gfx/src/windows/Makefile.in

@@ -65,7 +65,6 @@ CPPSRCS		= \
 		nsPrintOptionsWin.cpp \
 		nsPrintSettingsWin.cpp \
 		nsGfxFactoryWin.cpp \
-		nsCompressedCharMap.cpp \
 		nsNativeThemeWin.cpp \
 		nsUnicodeRange.cpp \
 		$(NULL)
@@ -86,21 +85,9 @@ _OS_LIBS	+= gdi32
 endif
 OS_LIBS		+= $(call EXPAND_LIBNAME,$(_OS_LIBS))
 
-GARBAGE		+= nsCompressedCharMap.cpp
-
-ifeq ($(OS_ARCH),WINNT)
-GARBAGE		+= $(srcdir)/nsCompressedCharMap.cpp
-endif
 
 include $(topsrcdir)/config/rules.mk
 
-export:: ../nsCompressedCharMap.cpp
-ifeq ($(OS_ARCH),WINNT)
-	$(INSTALL) $(srcdir)/../nsCompressedCharMap.cpp $(srcdir)
-else
-	$(INSTALL) $(srcdir)/../nsCompressedCharMap.cpp .
-endif
-
 libs:: fontEncoding.properties
 	$(INSTALL) $^ $(DIST)/bin/res/fonts
 

intl/unicharutil/util/Makefile.in

@@ -32,14 +32,18 @@ include $(DEPTH)/config/autoconf.mk
 
 EXPORTS = \
 	nsUnicharUtils.h \
+	nsCompressedCharMap.h \
 	$(NULL)
 
 LIBRARY_NAME=unicharutil_s
 REQUIRES=xpcom \
 		string \
+		uconv \
 		$(NULL)
 
-CPPSRCS	= nsUnicharUtils.cpp
+CPPSRCS	= nsUnicharUtils.cpp \
+	  nsCompressedCharMap.cpp \
+	  $(NULL)
 
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1