From 98c3d7b35ed5fa3625056ade7f83ad7eabc7d019 Mon Sep 17 00:00:00 2001 From: "dveditz%netscape.com" Date: Tue, 27 Apr 1999 19:18:20 +0000 Subject: [PATCH] link standalone version to static libs git-svn-id: svn://10.0.0.236/trunk@29462 18797224-902f-48f8-a5cc-f745e15eee43 --- .../modules/libreg/standalone/makefile.win | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/mozilla/modules/libreg/standalone/makefile.win b/mozilla/modules/libreg/standalone/makefile.win index 49450f96712..e17b1a35921 100644 --- a/mozilla/modules/libreg/standalone/makefile.win +++ b/mozilla/modules/libreg/standalone/makefile.win @@ -14,14 +14,12 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 #//------------------------------------------------------------------------ #// #// Makefile to build #// #//------------------------------------------------------------------------ - #//------------------------------------------------------------------------ #// #// Specify the depth of the current directory relative to the @@ -30,16 +28,18 @@ IGNORE_MANIFEST=1 #//------------------------------------------------------------------------ DEPTH= ..\..\.. -!ifndef MAKE_OBJ_TYPE -MAKE_OBJ_TYPE=DLL -!endif - #//------------------------------------------------------------------------ #// #// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...) #// #//------------------------------------------------------------------------ +USE_STATIC_LIBS=1 + +!ifndef MAKE_OBJ_TYPE +MAKE_OBJ_TYPE=DLL +!endif + #//------------------------------------------------------------------------ #// #// Define the files necessary to build the target (ie. OBJS) @@ -62,6 +62,7 @@ OBJS= \ LIBNAME=nsreg DLL=$(OBJDIR)\$(LIBNAME).dll +LIBRARY=$(OBJDIR)\$(LIBNAME)_s.lib #//------------------------------------------------------------------------ #// @@ -87,9 +88,10 @@ docopy: $(MAKE_INSTALL) ..\src\*.c . -export:: docopy $(DLL) +export:: docopy $(DLL) $(LIBRARY) $(MAKE_INSTALL) $(DLL) $(DIST)\bin + $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib $(MAKE_INSTALL) $(OBJDIR)\$(LIBNAME).lib $(DIST)\lib $(RM) *.[hc] @@ -98,8 +100,5 @@ clobber:: $(RM) $(DIST)\bin\$(LIBNAME).dll $(RM) $(DIST)\lib\$(LIBNAME).lib - $(RM) $(DEPTH)\modules\libreg\standalone\reg.h - $(RM) $(DEPTH)\modules\libreg\standalone\reg.c - $(RM) $(DEPTH)\modules\libreg\standalone\vr_stubs.h - $(RM) $(DEPTH)\modules\libreg\standalone\vr_stubs.c - $(RM) $(DEPTH)\modules\libreg\standalone\VerReg.c + $(RM) $(DIST)\lib\$(LIBNAME)_s.lib + $(RM) *.[hc]