summaryrefslogtreecommitdiffstats
path: root/Makefile.win
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2000-06-06 03:15:05 +0200
committerWilliam A. Rowe Jr <wrowe@apache.org>2000-06-06 03:15:05 +0200
commitf105e38ff769d93c3ecc78bbc862559573b05ea4 (patch)
tree389c05b01d33dfd285070a0d0bf9cd85b2b6295c /Makefile.win
parentFix typo in configure script when checking for mod_so. bash (diff)
downloadapache2-f105e38ff769d93c3ecc78bbc862559573b05ea4.tar.xz
apache2-f105e38ff769d93c3ecc78bbc862559573b05ea4.zip
PR:
Obtained from: Submitted by: Reviewed by: Fixes 1) The htpasswd and ab binaries, by converting ApacheCore.dsp to a library MSVC project. 2) Creates the ApacheCoreDll.dsp project to produce the dso version ApacheCore.dll 3) Some misc fixups to the original http_main.c -> Apache.exe conversion that misses newly added symbols. Code fixes to follow in a seperate patch. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85435 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.win')
-rw-r--r--Makefile.win2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.win b/Makefile.win
index 39dbe62c26..f6117f731b 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -78,7 +78,9 @@ _build:
$(MAKE) $(MAKEOPT) -f gen_test_char.mak CFG="gen_test_char - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..
-del Core$(SHORT)\buildmark.obj
+# ApacheCoreDll creates the dynamic ApacheCore.dll from the static library project ApacheCore
$(MAKE) $(MAKEOPT) -f ApacheCore.mak CFG="ApacheCore - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f ApacheCoreDll.mak CFG="ApacheCoreDll - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f Apache.mak CFG="Apache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd os\win32
$(MAKE) $(MAKEOPT) -f ApacheModuleStatus.mak CFG="ApacheModuleStatus - Win32 $(LONG)" RECURSE=0 $(CTARGET)