From 36a36125533349cf67dfdf309d3a7b97645f5177 Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Wed, 10 Oct 2001 23:38:36 +0000 Subject: [PATCH] part of bug 100214 - turn on unicharutil_s on all platforms. r=cls (build-only change, and unicharutil_s is #if 0'd out) --- build/mac/build_scripts/MozillaBuildList.pm | 2 ++ intl/Makefile.in | 2 +- intl/makefile.win | 26 ------------------ intl/unicharutil/Makefile.in | 2 +- intl/unicharutil/makefile.win | 30 --------------------- 5 files changed, 4 insertions(+), 58 deletions(-) diff --git a/build/mac/build_scripts/MozillaBuildList.pm b/build/mac/build_scripts/MozillaBuildList.pm index f9db7922ebf..74cd6784940 100644 --- a/build/mac/build_scripts/MozillaBuildList.pm +++ b/build/mac/build_scripts/MozillaBuildList.pm @@ -540,6 +540,8 @@ sub BuildClientDist() #UNICHARUTIL InstallFromManifest(":mozilla:intl:unicharutil:public:MANIFEST", "$distdirectory:unicharutil"); + InstallFromManifest(":mozilla:intl:unicharutil:util:MANIFEST", + "$distdirectory:unicharutil"); # InstallFromManifest(":mozilla:intl:unicharutil:public:MANIFEST_IDL", "$distdirectory:idl:"); #LOCALE diff --git a/intl/Makefile.in b/intl/Makefile.in index 87830a68f50..3fd48120130 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = uconv unicharutil locale strres lwbrk chardet +DIRS = unicharutil uconv locale strres lwbrk chardet include $(topsrcdir)/config/rules.mk diff --git a/intl/makefile.win b/intl/makefile.win index 3e4c3413519..e69de29bb2d 100644 --- a/intl/makefile.win +++ b/intl/makefile.win @@ -1,26 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Netscape 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 http://www.mozilla.org/NPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): - -DEPTH=.. - -DIRS=uconv unicharutil locale strres lwbrk chardet compatibility - -include <$(DEPTH)\config\rules.mak> diff --git a/intl/unicharutil/Makefile.in b/intl/unicharutil/Makefile.in index 88a8f96dfd7..6c2408500f8 100644 --- a/intl/unicharutil/Makefile.in +++ b/intl/unicharutil/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = idl public src tables +DIRS = idl public util src tables ifdef ENABLE_TESTS DIRS += tests diff --git a/intl/unicharutil/makefile.win b/intl/unicharutil/makefile.win index 968e0e42392..e69de29bb2d 100644 --- a/intl/unicharutil/makefile.win +++ b/intl/unicharutil/makefile.win @@ -1,30 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Netscape 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 http://www.mozilla.org/NPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -DEPTH=..\.. - - -DIRS= idl public src tables \ -!if !defined(DISABLE_TESTS) - tests \ -!endif - $(NULL) - -include <$(DEPTH)\config\rules.mak>