Bug 94831, redux. Fix windows static build stuff.

intl/locale/src/dlldeps.cpp

@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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): 
- */
-
-#include "nsIModule.h"
-
-void
-XXXNotCalled()
-{
-  NSGetModule(nsnull, nsnull, nsnull);
-}

intl/locale/src/makefile.win

@@ -24,61 +24,29 @@
 
 DEPTH		= ..\..\..
 
-
 DEFINES		= -D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
 
 MODULE		= locale
+LIBRARY_NAME	= nslocale_s
+
 DIRS		= windows
 
-MAKE_OBJ_TYPE = DLL
-DLLNAME = nslocale
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
-#RESFILE = $(DLLNAME).res
-
-CPPSRCS		=		nsLocale.cpp				\
-				nsLocaleService.cpp			\
-				nsFontPackageService.cpp		\
-				nsFontPackageHandler.cpp		\
-				nsLanguageAtomService.cpp		\
-				nsScriptableDateFormat.cpp			\
-				nsCollation.cpp
-
-
-CPP_OBJS	=	.\$(OBJDIR)\nsLocale.obj			\
-				.\$(OBJDIR)\nsLocaleService.obj		\
-				.\$(OBJDIR)\nsFontPackageService.obj	\
-				.\$(OBJDIR)\nsFontPackageHandler.obj	\
-				.\$(OBJDIR)\nsLanguageAtomService.obj	\
-				.\$(OBJDIR)\nsScriptableDateFormat.obj	\
-				.\$(OBJDIR)\nsCollation.obj		\
-				.\$(OBJDIR)\dlldeps.obj
-
-LINCS		= -I.						\
-			  -I$(PUBLIC)\raptor		\
-			  -I$(PUBLIC)\xpcom 		\
-			  -I$(PUBLIC)\locale		\
-			  -I$(PUBLIC)\uconv			\
-			  -I$(PUBLIC)\unicharutil
-
-
-LLIBS		= $(DIST)\lib\xpcom.lib         \
-                  $(DIST)\lib\nslocalewin_s.lib \
-		  $(LIBNSPR)
-
-LCFLAGS		= $(LCFLAGS) \
-			  $(DEFINES)
+CPP_OBJS	= .\$(OBJDIR)\nsLocale.obj			\
+		  .\$(OBJDIR)\nsLocaleService.obj		\
+		  .\$(OBJDIR)\nsFontPackageService.obj		\
+		  .\$(OBJDIR)\nsFontPackageHandler.obj		\
+		  .\$(OBJDIR)\nsLanguageAtomService.obj		\
+		  .\$(OBJDIR)\nsScriptableDateFormat.obj	\
+		  .\$(OBJDIR)\nsCollation.obj			\
+		  $(NULL)
 
 include <$(DEPTH)\config\rules.mak>
 
 install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
 	$(MAKE_INSTALL) langGroups.properties $(DIST)\bin\res
 	$(MAKE_INSTALL) language.properties $(DIST)\bin\res
   
 clobber::
-	rm -f $(DIST)\bin\components\$(DLLNAME).dll
-	rm -f $(DIST)\lib\$(DLLNAME).lib
 	rm -f $(DIST)\bin\res\langGroups.properties
-  rm -f $(DIST)\bin\res\language.properties
+	rm -f $(DIST)\bin\res\language.properties
 	

intl/locale/src/windows/makefile.win

@@ -20,45 +20,40 @@
 # Contributor(s): 
 
 DEPTH=..\..\..\..
+include <$(DEPTH)/config/config.mak>
 
-LIBRARY_NAME = nslocalewin_s
-
-MODULE=raptor 
+MODULE		= locale
+LIBRARY_NAME	= locale
+MODULE_NAME	= nsLocaleModule
 
 DEFINES=-DWIN32_LEAN_AND_MEAN
 
-OBJS =											\
-	.\$(OBJDIR)\nsCollationWin.obj				\
-	.\$(OBJDIR)\nsDateTimeFormatWin.obj         \
-	.\$(OBJDIR)\nsLocaleDLL.obj					\
-	.\$(OBJDIR)\nsIWin32LocaleImpl.obj			\
+OBJS =						\
+	.\$(OBJDIR)\nsCollationWin.obj		\
+	.\$(OBJDIR)\nsDateTimeFormatWin.obj     \
+	.\$(OBJDIR)\nsLocaleDLL.obj		\
+	.\$(OBJDIR)\nsIWin32LocaleImpl.obj	\
 	$(NULL)
 
 LINCS= \
 		-I..\
         -I$(PUBLIC)\locale		\
         -I$(PUBLIC)\xpcom		\
-        -I$(PUBLIC)\unicharutil \
-        -I$(PUBLIC)\uconv \
+        -I$(PUBLIC)\unicharutil		\
+        -I$(PUBLIC)\uconv		\
         -I$(PUBLIC)\raptor		\
         $(NULL)
 
 LCFLAGS = \
         $(LCFLAGS) \
-		$(DEFINES) \
+	$(DEFINES) \
         $(NULL)
 
-LLIBS=				\
- $(DIST)\lib\xpcom.lib	\
- $(DIST)\lib\nslocale_s.lib		\
-$(LIBNSPR)  
+SUB_LIBRARIES	=  $(DIST)\lib\nslocale_s.lib
 
+LLIBS=					\
+ $(DIST)\lib\xpcom.lib			\
+ $(LIBNSPR)  
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(LIBRARY) 
-	@echo $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib\
-
-clobber::
-        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib