Landing the rest of the win32 gmake changes:

* Adds Makefile.ins to win32 specific dirs
* Adds WINNT ifdefs to Makefile.ins
* Causes NSPR to be compiled with --with-mozilla
* Misc general Makefile.in cleanup

Bug #58981 r=mcafee


git-svn-id: svn://10.0.0.236/trunk@110703 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
seawood%netscape.com
2001-12-18 09:14:29 +00:00
parent 1a0670162a
commit 0bd62df729
326 changed files with 3720 additions and 709 deletions

View File

@@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
MODULE = libreg
EXPORTS = VerReg.h NSReg.h
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
include $(topsrcdir)/config/rules.mk

View File

@@ -35,7 +35,7 @@ ifeq ($(OS_ARCH),Darwin)
REQUIRES = macmorefiles
endif
CSRCS = reg.c VerReg.c vr_stubs.c nr_bufio.c
CSRCS = $(MODULES_LIBREG_SRC_LCSRCS) nr_bufio.c
BIN_SRCS = VerReg.c reg.c vr_stubs.c
PROGOBJS = $(addprefix R_,$(BIN_SRCS:.c=.o))
@@ -58,9 +58,5 @@ DEFINES += -DUSE_BUFFERED_REGISTRY_IO
include $(topsrcdir)/config/rules.mk
R_%.o: %.c
ifeq ($(MOZ_OS2_TOOLS),VACPP)
$(CC) -Fo$@ -c $(COMPILE_CFLAGS) -DSTANDALONE_REGISTRY $<
else
$(CC) -o $@ -c $(COMPILE_CFLAGS) -DSTANDALONE_REGISTRY $<
endif
$(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) -DSTANDALONE_REGISTRY $<

View File

@@ -36,6 +36,10 @@ ifeq ($(OS_ARCH),Darwin)
REQUIRES = macmorefiles
endif
ifeq ($(OS_ARCH),WINNT)
USE_NON_MT_LIBS = 1
endif
CSRCS = $(MODULES_LIBREG_SRC_LCSRCS)
FORCE_STATIC_LIB = 1