From 455eb7c6e8c37a303a5dba5ddb147fde7b7bba93 Mon Sep 17 00:00:00 2001 From: "mjudge%netscape.com" Date: Tue, 24 Nov 1998 19:26:45 +0000 Subject: [PATCH] changing makefiles to build test apps on win32 --- editor/txmgr/makefile.win | 2 +- editor/txmgr/src/makefile.win | 11 +++++++---- editor/txmgr/tests/makefile.win | 17 ++++++++++------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/editor/txmgr/makefile.win b/editor/txmgr/makefile.win index afb09e0a2bf7..d96d11b37cbf 100644 --- a/editor/txmgr/makefile.win +++ b/editor/txmgr/makefile.win @@ -18,6 +18,6 @@ DEPTH=..\.. IGNORE_MANIFEST=1 -DIRS=public src +DIRS=public src tests include <$(DEPTH)\config\rules.mak> diff --git a/editor/txmgr/src/makefile.win b/editor/txmgr/src/makefile.win index a17217a7be7d..0ac017093daa 100644 --- a/editor/txmgr/src/makefile.win +++ b/editor/txmgr/src/makefile.win @@ -18,7 +18,7 @@ DEPTH=..\..\.. IGNORE_MANIFEST=1 -LIBRARY_NAME=ender +LIBRARY_NAME=txmgr CPPSRCS = \ nsTransactionManager.cpp \ @@ -32,9 +32,12 @@ CPP_OBJS = \ MODULE=txmgr -REQUIRES=xpcom +REQUIRES=xpcom base raptor -LINCS=-I$(PUBLIC)\xpcom +LINCS=-I$(PUBLIC)\xpcom \ + -I$(PUBLIC)\txmgr \ + -I$(PUBLIC)\base \ + -I$(PUBLIC)\raptor MAKE_OBJ_TYPE = DLL DLLNAME = txmgr @@ -48,7 +51,7 @@ LCFLAGS = \ DEFINES = $(DEFINES) -DNOT_PRODUCTION_CODE -DUSE_EXPERIMENTAL_SMART_POINTERS # These are the libraries we need to link with to create the dll -LLIBS=$(DIST)\lib\xpcom32.lib +LLIBS=$(DIST)\lib\xpcom32.lib $(DIST)\lib\raptorbase.lib !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib diff --git a/editor/txmgr/tests/makefile.win b/editor/txmgr/tests/makefile.win index ee467d58b130..9761533d391f 100644 --- a/editor/txmgr/tests/makefile.win +++ b/editor/txmgr/tests/makefile.win @@ -15,25 +15,28 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -DEPTH=..\.. +DEPTH=..\..\.. IGNORE_MANIFEST=1 -DIRS = dynamic windows services - MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\TestTXMgr.exe PROGRAMS = $(PROG1) LCFLAGS=-DUSE_NSREG -REQUIRES=libraptorbase +REQUIRES=xpcom raptor dom base -LINCS=-I..\public +LINCS=-I$(PUBLIC)\txmgr \ + -I$(PUBLIC)\xpcom \ + -I$(PUBLIC)\raptor \ + -I$(PUBLIC)\js \ + -I$(PUBLIC)\dom \ + -I..\src LLIBS= \ - $(DIST)\lib\txmgr32.lib \ - $(DIST)\lib\raptorbase32.lib \ + $(DIST)\lib\txmgr.lib \ + $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\xpcom32.lib !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib