From 140f4fbdf57cd634d8958951b9da154c806e08eb Mon Sep 17 00:00:00 2001 From: "cathleen%netscape.com" Date: Wed, 24 Oct 2001 01:13:51 +0000 Subject: [PATCH] Fix static build bustage. --- editor/composer/src/makefile.win | 15 ++------------- modules/staticmod/meta.mak | 2 ++ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/editor/composer/src/makefile.win b/editor/composer/src/makefile.win index 863e88abc66b..b5927806cbd2 100644 --- a/editor/composer/src/makefile.win +++ b/editor/composer/src/makefile.win @@ -21,8 +21,9 @@ DEPTH=..\..\.. - +MODULE=editor LIBRARY_NAME=composer +MODULE_NAME=nsComposerModule CPPSRCS = \ nsEditorShell.cpp \ @@ -77,11 +78,6 @@ REQUIRES = xpcom \ include <$(DEPTH)/config/config.mak> -MAKE_OBJ_TYPE = DLL -DLLNAME = composer -DLL=.\$(OBJDIR)\$(DLLNAME).dll - - LCFLAGS = \ $(LCFLAGS) \ $(DEFINES) \ @@ -95,10 +91,3 @@ LLIBS = \ include <$(DEPTH)\config\rules.mak> -install:: $(DLL) - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib - -clobber:: - rm -f $(DIST)\bin\components\$(DLLNAME).dll - rm -f $(DIST)\lib\$(DLLNAME).lib diff --git a/modules/staticmod/meta.mak b/modules/staticmod/meta.mak index a8646aefa3e5..7552c5366ec6 100755 --- a/modules/staticmod/meta.mak +++ b/modules/staticmod/meta.mak @@ -22,6 +22,8 @@ DEPTH=..\.. +REQUIRES = xpcom + include <$(DEPTH)/config/config.mak> MAKE_OBJ_TYPE = DLL