diff options
| author | Steffen Land <steffenal@apache.org> | 2020-05-13 10:43:05 +0000 |
|---|---|---|
| committer | Steffen Land <steffenal@apache.org> | 2020-05-13 10:43:05 +0000 |
| commit | 482089e7e1bf4f0bc05c93eaadaffeabdfbfd133 (patch) | |
| tree | 47b7fd4ff5bdea733fb6f8435a197d5ef0792119 /Makefile.win | |
| parent | 1dc3c88d41a5362c6c0852b63ac85bc996ca157e (diff) | |
| download | httpd-482089e7e1bf4f0bc05c93eaadaffeabdfbfd133.tar.gz | |
Windows bits for mod_log_json.dsp
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1877688 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.win')
| -rw-r--r-- | Makefile.win | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/Makefile.win b/Makefile.win index ace210287c..8168bab943 100644 --- a/Makefile.win +++ b/Makefile.win @@ -166,6 +166,33 @@ _tryserf: !ENDIF # NOT EXIST("srclib\serf") +!IF EXIST("srclib\jansson") + +_tryjson: +!IF $(USEMAK) == 1 + cd modules\loggers + $(MAKE) $(MAKEOPT) -f mod_log_json.mak CFG="mod_log_json - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. +!ELSEIF $(USESLN) == 1 + devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_log_json +!ELSE + @msdev $(TLP).dsw /USEENV /MAKE \ + "mod_log_json - Win32 $(LONG)" /NORECURSE $(CTARGET) +!ENDIF + +!ELSE +# NOT EXIST("srclib\jansson") + +_tryjson: + @echo ----- + @echo mod_log_json will not build unless jansson is built in srclib\jansson + @echo Version 2.0 and later available from https://github.com/akheron/jansson/releases + @echo build with: + @echo cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF + @echo nmake + +!ENDIF + !IF EXIST("srclib\zlib") _tryzlib: @@ -604,6 +631,9 @@ _build: $(MAKE) $(MAKEOPT) -f mod_log_config.mak CFG="mod_log_config - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_log_debug.mak CFG="mod_log_debug - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_log_forensic.mak CFG="mod_log_forensic - Win32 $(LONG)" RECURSE=0 $(CTARGET) +!IF EXIST("srclib\jansson") + $(MAKE) $(MAKEOPT) -f mod_log_json.mak CFG="mod_log_json - Win32 $(LONG)" RECURSE=0 $(CTARGET) +!ENDIF $(MAKE) $(MAKEOPT) -f mod_logio.mak CFG="mod_logio - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. !IF EXIST("srclib\lua") @@ -920,6 +950,10 @@ _copybin: copy modules\loggers\$(LONG)\mod_log_debug.$(src_so) "$(inst_so)" <.y copy modules\loggers\$(LONG)\mod_log_forensic.$(src_so) "$(inst_so)" <.y copy modules\loggers\$(LONG)\mod_logio.$(src_so) "$(inst_so)" <.y +!IF EXIST("srclib\jansson") + copy modules\loggers\$(LONG)\mod_log_json.$(src_so) "$(inst_so)" <.y + copy srclib\jansson\bin\jansson.$(src_dll) "$(inst_dll)" <.y +!ENDIF !IF EXIST("srclib\lua") copy modules\lua\$(LONG)\mod_lua.$(src_so) "$(inst_so)" <.y !IF EXIST("srclib\lua\src\lua51.$(src_dll)") |