You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2020/06/15 17:32:22 UTC
[tomcat-connectors] branch master updated: Make pcre.lib as
pseudotarget, so nmake can check for changes
This is an automated email from the ASF dual-hosted git repository.
mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new d06318a Make pcre.lib as pseudotarget, so nmake can check for changes
d06318a is described below
commit d06318a17009cd86f7e83700df8a3f6de09e1619
Author: Mladen Turk <mt...@apache.org>
AuthorDate: Mon Jun 15 19:32:40 2020 +0200
Make pcre.lib as pseudotarget, so nmake can check for changes
---
native/iis/Makefile.vc | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/native/iis/Makefile.vc b/native/iis/Makefile.vc
index 21c7f87..4422af0 100644
--- a/native/iis/Makefile.vc
+++ b/native/iis/Makefile.vc
@@ -74,7 +74,7 @@ OBJECTS = \
$(WORKDIR)\jk_util.obj \
$(WORKDIR)\jk_worker.obj
-all : $(WORKDIR) $(PCRELIB) $(BUILDBIN)
+all : libpcre $(WORKDIR) $(BUILDBIN)
$(WORKDIR) :
@$(MAKEWORKDIR)
@@ -88,20 +88,18 @@ $(WORKDIR) :
$(BUILDRES): ..\common\jk.rc
$(RC) /l 0x409 /n /i ..\common /d JK_ISAPI /d NDEBUG /fo $(BUILDRES) ..\common\jk.rc
-$(PCRELIB):
+libpcre:
@cd .\pcre
- $(MAKE) -f Makefile.vc WINVER=$(WINVER) BUILD_CPU=$(BUILD_CPU) CPUFLAGS="$(CPUFLAGS)"
- @if not ERRORLEVEL 0 exit /B 1
+ @$(MAKE) -f Makefile.vc WINVER=$(WINVER) BUILD_CPU=$(BUILD_CPU) CPUFLAGS="$(CPUFLAGS)"
@cd ..
-$(BUILDBIN): $(PCRELIB) $(WORKDIR) $(OBJECTS) $(BUILDRES)
+$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(PCRELIB) $(BUILDRES) $(LDLIBS) /def:isapi.def /out:$(BUILDBIN) /pdb:$(BUILDPDB)
@if exist $(BUILDMFT) \
$(MT) -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
clean:
@cd .\pcre
- $(MAKE) -f Makefile.vc clean
- @if not ERRORLEVEL 0 exit /B 1
+ @$(MAKE) -f Makefile.vc clean
@cd ..
@-$(CLEANTARGET) 2>NUL
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org