diff options
| author |   henning <henning@openbsd.org> | 2003-08-21 12:53:29 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2003-08-21 12:53:29 +0000 |
| commit | 5badb931a0cf2c7b2c387b579c22ea301e0306fb (patch) | |
| tree | 7a29293daf784ec8d3412c78ba20128a3dceae1c /usr.sbin/httpd/src | |
| parent | Put a valid VID signature in the disklabel, as does mvme68k. (diff) | |
| download | wireguard-openbsd-5badb931a0cf2c7b2c387b579c22ea301e0306fb.tar.xz wireguard-openbsd-5badb931a0cf2c7b2c387b579c22ea301e0306fb.zip | |
import apache 1.3.28 and mod_ssl 2.8.15
Diffstat (limited to 'usr.sbin/httpd/src')
68 files changed, 2412 insertions, 1496 deletions
diff --git a/usr.sbin/httpd/src/Apache.dep b/usr.sbin/httpd/src/Apache.dep new file mode 100644 index 00000000000..dd07fec1a4d --- /dev/null +++ b/usr.sbin/httpd/src/Apache.dep @@ -0,0 +1,5 @@ +# Microsoft Developer Studio Generated Dependency File, included by Apache.mak + +.\os\win32\apache.rc : \ + ".\os\win32\apache.ico"\ + diff --git a/usr.sbin/httpd/src/ApacheCore.dep b/usr.sbin/httpd/src/ApacheCore.dep new file mode 100644 index 00000000000..4931609ea0e --- /dev/null +++ b/usr.sbin/httpd/src/ApacheCore.dep @@ -0,0 +1,747 @@ +# Microsoft Developer Studio Generated Dependency File, included by ApacheCore.mak + +.\main\alloc.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\multithread.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\buff.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\http_config.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\explain.h"\ + ".\include\fnmatch.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_request.h"\ + ".\include\http_vhost.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\http_core.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_md5.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\fnmatch.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\http_vhost.h"\ + ".\include\httpd.h"\ + ".\include\rfc1413.h"\ + ".\include\scoreboard.h"\ + ".\include\util_md5.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\http_log.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\http_main.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\explain.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\http_vhost.h"\ + ".\include\httpd.h"\ + ".\include\multithread.h"\ + ".\include\scoreboard.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\getopt.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\os\win32\registry.h"\ + ".\os\win32\service.h"\ + + +.\main\http_protocol.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\http_vhost.h"\ + ".\include\httpd.h"\ + ".\include\util_date.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\http_request.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\fnmatch.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\scoreboard.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\http_vhost.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_config.h"\ + ".\include\http_log.h"\ + ".\include\http_protocol.h"\ + ".\include\http_vhost.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_access.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_actions.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_alias.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_asis.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_auth.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_protocol.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_autoindex.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\fnmatch.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_cgi.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_dir.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_env.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_imap.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_include.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\os\win32\mod_isapi.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_log_config.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_mime.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_negotiation.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_setenvif.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_so.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_userdir.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\os\win32\modules.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\os\win32\multithread.c : \ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_mmn.h"\ + ".\include\hsregex.h"\ + ".\include\multithread.h"\ + ".\os\win32\os.h"\ + + +.\os\win32\readdir.c : \ + ".\os\win32\readdir.h"\ + + +.\os\win32\registry.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\os\win32\service.h"\ + + +.\main\rfc1413.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\httpd.h"\ + ".\include\rfc1413.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\os\win32\service.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\httpd.h"\ + ".\include\multithread.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\os\win32\registry.h"\ + ".\os\win32\service.h"\ + ".\os\win32\Win9xConHook.h"\ + + +.\main\util.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\main\test_char.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\util_date.c : \ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_mmn.h"\ + ".\include\hsregex.h"\ + ".\include\util_date.h"\ + ".\os\win32\os.h"\ + + +.\main\util_md5.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_md5.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\httpd.h"\ + ".\include\util_md5.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\util_script.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\util_date.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\util_uri.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\main\uri_delims.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\os\win32\util_win32.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + diff --git a/usr.sbin/httpd/src/ApacheNW.mcp.gz b/usr.sbin/httpd/src/ApacheNW.mcp.gz Binary files differindex 71751b7ca63..d3d98aadd93 100644 --- a/usr.sbin/httpd/src/ApacheNW.mcp.gz +++ b/usr.sbin/httpd/src/ApacheNW.mcp.gz diff --git a/usr.sbin/httpd/src/ap/ap.dep b/usr.sbin/httpd/src/ap/ap.dep new file mode 100644 index 00000000000..2819d46100d --- /dev/null +++ b/usr.sbin/httpd/src/ap/ap.dep @@ -0,0 +1,114 @@ +# Microsoft Developer Studio Generated Dependency File, included by ap.mak + +.\ap_base64.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +.\ap_checkpass.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_md5.h"\ + "..\include\ap_mmn.h"\ + "..\include\ap_sha1.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +.\ap_cpystrn.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + + +.\ap_fnmatch.c : \ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_mmn.h"\ + "..\include\fnmatch.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +.\ap_md5c.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_md5.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +.\ap_sha1.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\ap_sha1.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +.\ap_signal.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + + +.\ap_slack.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\http_log.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + + +.\ap_snprintf.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + diff --git a/usr.sbin/httpd/src/lib/expat-lite/xmlparse.dep b/usr.sbin/httpd/src/lib/expat-lite/xmlparse.dep new file mode 100644 index 00000000000..e7437154c75 --- /dev/null +++ b/usr.sbin/httpd/src/lib/expat-lite/xmlparse.dep @@ -0,0 +1,14 @@ +# Microsoft Developer Studio Generated Dependency File, included by xmlparse.mak + +.\hashtable.c : \ + ".\hashtable.h"\ + ".\xmldef.h"\ + + +.\xmlparse.c : \ + ".\hashtable.h"\ + ".\xmldef.h"\ + ".\xmlparse.h"\ + ".\xmlrole.h"\ + ".\xmltok.h"\ + diff --git a/usr.sbin/httpd/src/lib/expat-lite/xmltok.dep b/usr.sbin/httpd/src/lib/expat-lite/xmltok.dep new file mode 100644 index 00000000000..f9978fc10f6 --- /dev/null +++ b/usr.sbin/httpd/src/lib/expat-lite/xmltok.dep @@ -0,0 +1,20 @@ +# Microsoft Developer Studio Generated Dependency File, included by xmltok.mak + +.\xmlrole.c : \ + ".\xmldef.h"\ + ".\xmlrole.h"\ + ".\xmltok.h"\ + + +.\xmltok.c : \ + ".\asciitab.h"\ + ".\iasciitab.h"\ + ".\latin1tab.h"\ + ".\nametab.h"\ + ".\utf8tab.h"\ + ".\xmldef.h"\ + ".\xmltok.h"\ + ".\xmltok_impl.c"\ + ".\xmltok_impl.h"\ + ".\xmltok_ns.c"\ + diff --git a/usr.sbin/httpd/src/lib/sdbm/sdbm.dep b/usr.sbin/httpd/src/lib/sdbm/sdbm.dep new file mode 100644 index 00000000000..51b8cb51385 --- /dev/null +++ b/usr.sbin/httpd/src/lib/sdbm/sdbm.dep @@ -0,0 +1,25 @@ +# Microsoft Developer Studio Generated Dependency File, included by sdbm.mak + +.\sdbm.c : \ + ".\sdbm.h"\ + ".\sdbm_pair.h"\ + ".\sdbm_tune.h"\ + + +.\sdbm_hash.c : \ + ".\sdbm.h"\ + + +.\sdbm_lock.c : \ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\hsregex.h"\ + "..\..\os\win32\os.h"\ + + +.\sdbm_pair.c : \ + ".\sdbm.h"\ + ".\sdbm_pair.h"\ + ".\sdbm_tune.h"\ + diff --git a/usr.sbin/httpd/src/main/gen_test_char.dep b/usr.sbin/httpd/src/main/gen_test_char.dep new file mode 100644 index 00000000000..df4b5e39268 --- /dev/null +++ b/usr.sbin/httpd/src/main/gen_test_char.dep @@ -0,0 +1,16 @@ +# Microsoft Developer Studio Generated Dependency File, included by gen_test_char.mak + +.\gen_test_char.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + diff --git a/usr.sbin/httpd/src/main/gen_uri_delims.dep b/usr.sbin/httpd/src/main/gen_uri_delims.dep new file mode 100644 index 00000000000..5e93c3c2467 --- /dev/null +++ b/usr.sbin/httpd/src/main/gen_uri_delims.dep @@ -0,0 +1,2 @@ +# Microsoft Developer Studio Generated Dependency File, included by gen_uri_delims.mak + diff --git a/usr.sbin/httpd/src/os/win32/ApacheOS.dep b/usr.sbin/httpd/src/os/win32/ApacheOS.dep new file mode 100644 index 00000000000..fb0b33fb43d --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/ApacheOS.dep @@ -0,0 +1,5 @@ +# Microsoft Developer Studio Generated Dependency File, included by ApacheOS.mak + +.\os.c : \ + ".\os.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/Win9xConHook.c b/usr.sbin/httpd/src/os/win32/Win9xConHook.c index f6a67ea83ef..eb6e7f270a6 100644 --- a/usr.sbin/httpd/src/os/win32/Win9xConHook.c +++ b/usr.sbin/httpd/src/os/win32/Win9xConHook.c @@ -1,7 +1,7 @@ /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2000-2002 The Apache Software Foundation. All rights + * Copyright (c) 2000-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/httpd/src/os/win32/Win9xConHook.dep b/usr.sbin/httpd/src/os/win32/Win9xConHook.dep new file mode 100644 index 00000000000..bc873684c8d --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/Win9xConHook.dep @@ -0,0 +1,2 @@ +# Microsoft Developer Studio Generated Dependency File, included by Win9xConHook.mak + diff --git a/usr.sbin/httpd/src/os/win32/Win9xConHook.dsp b/usr.sbin/httpd/src/os/win32/Win9xConHook.dsp index 632ab67583c..8456fc2464c 100644 --- a/usr.sbin/httpd/src/os/win32/Win9xConHook.dsp +++ b/usr.sbin/httpd/src/os/win32/Win9xConHook.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\Win9xConHook" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\Win9xConHook_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /base:"0x1c0f0000" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /base:"0x1c0f0000" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /base:"0x1c0f0000" /opt:ref +# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /base:"0x1c0f0000" /opt:ref !ELSEIF "$(CFG)" == "Win9xConHook - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\Win9xConHook" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\Win9xConHook_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:"0x1c0f0000" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:"0x1c0f0000" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /base:"0x1c0f0000" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /base:"0x1c0f0000" !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/Win9xConHook.h b/usr.sbin/httpd/src/os/win32/Win9xConHook.h index b96414ba4b2..e0f91fa0407 100644 --- a/usr.sbin/httpd/src/os/win32/Win9xConHook.h +++ b/usr.sbin/httpd/src/os/win32/Win9xConHook.h @@ -1,7 +1,7 @@ /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2000-2002 The Apache Software Foundation. All rights + * Copyright (c) 2000-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/httpd/src/os/win32/Win9xConHook.mak b/usr.sbin/httpd/src/os/win32/Win9xConHook.mak index 28f5632522c..9bd6d423ddf 100644 --- a/usr.sbin/httpd/src/os/win32/Win9xConHook.mak +++ b/usr.sbin/httpd/src/os/win32/Win9xConHook.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on Win9xConHook.dsp !IF "$(CFG)" == "" CFG=Win9xConHook - Win32 Release -!MESSAGE No configuration specified. Defaulting to Win9xConHook - Win32\ - Release. +!MESSAGE No configuration specified. Defaulting to Win9xConHook - Win32 Release. !ENDIF -!IF "$(CFG)" != "Win9xConHook - Win32 Release" && "$(CFG)" !=\ - "Win9xConHook - Win32 Debug" +!IF "$(CFG)" != "Win9xConHook - Win32 Release" && "$(CFG)" != "Win9xConHook - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=Win9xConHook - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "Win9xConHook - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "Win9xConHook - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Win9xConHook - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Win9xConHook - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -37,59 +33,50 @@ INTDIR=.\Release OutDir=.\Release # End Custom Macros -!IF "$(RECURSE)" == "0" - ALL : "$(OUTDIR)\Win9xConHook.dll" -!ELSE - -ALL : "$(OUTDIR)\Win9xConHook.dll" - -!ENDIF CLEAN : - -@erase "$(INTDIR)\Win9xConHook.idb" -@erase "$(INTDIR)\Win9xConHook.obj" + -@erase "$(INTDIR)\Win9xConHook_src.idb" + -@erase "$(INTDIR)\Win9xConHook_src.pdb" -@erase "$(OUTDIR)\Win9xConHook.dll" -@erase "$(OUTDIR)\Win9xConHook.exp" -@erase "$(OUTDIR)\Win9xConHook.lib" - -@erase "$(OUTDIR)\Win9xConHook.map" + -@erase "$(OUTDIR)\Win9xConHook.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\ - "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Win9xConHook" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Win9xConHook_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -102,10 +89,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\Win9xConHook.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib /nologo /base:"0x1c0f0000"\ - /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\Win9xConHook.pdb"\ - /map:"$(INTDIR)\Win9xConHook.map" /machine:I386 /def:".\Win9xConHook.def"\ - /out:"$(OUTDIR)\Win9xConHook.dll" /implib:"$(OUTDIR)\Win9xConHook.lib" +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib /nologo /base:"0x1c0f0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\Win9xConHook.pdb" /debug /machine:I386 /def:".\Win9xConHook.def" /out:"$(OUTDIR)\Win9xConHook.dll" /implib:"$(OUTDIR)\Win9xConHook.lib" /opt:ref DEF_FILE= \ ".\Win9xConHook.def" LINK32_OBJS= \ @@ -124,60 +108,50 @@ INTDIR=.\Debug OutDir=.\Debug # End Custom Macros -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\Win9xConHook.dll" - -!ELSE - ALL : "$(OUTDIR)\Win9xConHook.dll" -!ENDIF CLEAN : - -@erase "$(INTDIR)\Win9xConHook.idb" -@erase "$(INTDIR)\Win9xConHook.obj" + -@erase "$(INTDIR)\Win9xConHook_src.idb" + -@erase "$(INTDIR)\Win9xConHook_src.pdb" -@erase "$(OUTDIR)\Win9xConHook.dll" -@erase "$(OUTDIR)\Win9xConHook.exp" -@erase "$(OUTDIR)\Win9xConHook.lib" - -@erase "$(OUTDIR)\Win9xConHook.map" -@erase "$(OUTDIR)\Win9xConHook.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\ - "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Win9xConHook" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Win9xConHook_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -190,11 +164,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\Win9xConHook.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib /nologo /base:"0x1c0f0000"\ - /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\Win9xConHook.pdb"\ - /map:"$(INTDIR)\Win9xConHook.map" /debug /machine:I386\ - /def:".\Win9xConHook.def" /out:"$(OUTDIR)\Win9xConHook.dll"\ - /implib:"$(OUTDIR)\Win9xConHook.lib" +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib /nologo /base:"0x1c0f0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\Win9xConHook.pdb" /debug /machine:I386 /def:".\Win9xConHook.def" /out:"$(OUTDIR)\Win9xConHook.dll" /implib:"$(OUTDIR)\Win9xConHook.lib" DEF_FILE= \ ".\Win9xConHook.def" LINK32_OBJS= \ @@ -208,8 +178,16 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "Win9xConHook - Win32 Release" || "$(CFG)" ==\ - "Win9xConHook - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("Win9xConHook.dep") +!INCLUDE "Win9xConHook.dep" +!ELSE +!MESSAGE Warning: cannot find "Win9xConHook.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "Win9xConHook - Win32 Release" || "$(CFG)" == "Win9xConHook - Win32 Debug" SOURCE=.\Win9xConHook.c "$(INTDIR)\Win9xConHook.obj" : $(SOURCE) "$(INTDIR)" diff --git a/usr.sbin/httpd/src/os/win32/mod_auth_anon.dep b/usr.sbin/httpd/src/os/win32/mod_auth_anon.dep new file mode 100644 index 00000000000..4ea4c5622d4 --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/mod_auth_anon.dep @@ -0,0 +1,21 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_auth_anon.mak + +..\..\modules\standard\mod_auth_anon.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_protocol.h"\ + "..\..\include\http_request.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/mod_auth_anon.dsp b/usr.sbin/httpd/src/os/win32/mod_auth_anon.dsp index 8d36a20f72e..d6cfc09acda 100644 --- a/usr.sbin/httpd/src/os/win32/mod_auth_anon.dsp +++ b/usr.sbin/httpd/src/os/win32/mod_auth_anon.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_auth_anon" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_auth_anon_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_auth_anon.so" /base:@"BaseAddr.ref",mod_auth_anon -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_auth_anon.so" /base:@"BaseAddr.ref",mod_auth_anon +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_auth_anon.so" /base:@"BaseAddr.ref",mod_auth_anon /opt:ref +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_auth_anon.so" /base:@"BaseAddr.ref",mod_auth_anon /opt:ref !ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_auth_anon" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_auth_anon_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_anon.so" /base:@"BaseAddr.ref",mod_auth_anon -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_anon.so" /base:@"BaseAddr.ref",mod_auth_anon +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_auth_anon.so" /base:@"BaseAddr.ref",mod_auth_anon +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_auth_anon.so" /base:@"BaseAddr.ref",mod_auth_anon !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_auth_anon.mak b/usr.sbin/httpd/src/os/win32/mod_auth_anon.mak index 56d2fda89d9..36a7a1a81bd 100644 --- a/usr.sbin/httpd/src/os/win32/mod_auth_anon.mak +++ b/usr.sbin/httpd/src/os/win32/mod_auth_anon.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on mod_auth_anon.dsp !IF "$(CFG)" == "" CFG=mod_auth_anon - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_auth_anon - Win32\ - Release. +!MESSAGE No configuration specified. Defaulting to mod_auth_anon - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_auth_anon - Win32 Release" && "$(CFG)" !=\ - "mod_auth_anon - Win32 Debug" +!IF "$(CFG)" != "mod_auth_anon - Win32 Release" && "$(CFG)" != "mod_auth_anon - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=mod_auth_anon - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_auth_anon - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_auth_anon - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_auth_anon - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_auth_anon - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -52,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_auth_anon.idb" -@erase "$(INTDIR)\mod_auth_anon.obj" + -@erase "$(INTDIR)\mod_auth_anon_src.idb" + -@erase "$(INTDIR)\mod_auth_anon_src.pdb" -@erase "$(OUTDIR)\mod_auth_anon.exp" -@erase "$(OUTDIR)\mod_auth_anon.lib" - -@erase "$(OUTDIR)\mod_auth_anon.map" + -@erase "$(OUTDIR)\mod_auth_anon.pdb" -@erase "$(OUTDIR)\mod_auth_anon.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_auth_anon" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_anon_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -107,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_anon.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_auth_anon.pdb" /map:"$(INTDIR)\mod_auth_anon.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_auth_anon.so"\ - /implib:"$(OUTDIR)\mod_auth_anon.lib" /base:@"BaseAddr.ref",mod_auth_anon +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_auth_anon.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_auth_anon.so" /implib:"$(OUTDIR)\mod_auth_anon.lib" /base:@"BaseAddr.ref",mod_auth_anon /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_auth_anon.obj" \ "..\..\Release\ApacheCore.lib" @@ -143,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_auth_anon.idb" -@erase "$(INTDIR)\mod_auth_anon.obj" + -@erase "$(INTDIR)\mod_auth_anon_src.idb" + -@erase "$(INTDIR)\mod_auth_anon_src.pdb" -@erase "$(OUTDIR)\mod_auth_anon.exp" -@erase "$(OUTDIR)\mod_auth_anon.lib" - -@erase "$(OUTDIR)\mod_auth_anon.map" -@erase "$(OUTDIR)\mod_auth_anon.pdb" -@erase "$(OUTDIR)\mod_auth_anon.so" @@ -155,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_auth_anon" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_anon_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -199,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_anon.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_auth_anon.pdb" /map:"$(INTDIR)\mod_auth_anon.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_auth_anon.so"\ - /implib:"$(OUTDIR)\mod_auth_anon.lib" /base:@"BaseAddr.ref",mod_auth_anon +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_auth_anon.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_auth_anon.so" /implib:"$(OUTDIR)\mod_auth_anon.lib" /base:@"BaseAddr.ref",mod_auth_anon LINK32_OBJS= \ "$(INTDIR)\mod_auth_anon.obj" \ "..\..\Debug\ApacheCore.lib" @@ -215,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_auth_anon - Win32 Release" || "$(CFG)" ==\ - "mod_auth_anon - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_auth_anon.dep") +!INCLUDE "mod_auth_anon.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_auth_anon.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_auth_anon - Win32 Release" || "$(CFG)" == "mod_auth_anon - Win32 Debug" !IF "$(CFG)" == "mod_auth_anon - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug" @@ -241,38 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_auth_anon.c -DEP_CPP_MOD_A=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\http_request.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_A=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" +"$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/usr.sbin/httpd/src/os/win32/mod_auth_dbm.dep b/usr.sbin/httpd/src/os/win32/mod_auth_dbm.dep new file mode 100644 index 00000000000..0fdf0f2d6a4 --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/mod_auth_dbm.dep @@ -0,0 +1,21 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_auth_dbm.mak + +..\..\modules\standard\mod_auth_dbm.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_protocol.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + "..\..\lib\sdbm\sdbm.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/mod_auth_dbm.dsp b/usr.sbin/httpd/src/os/win32/mod_auth_dbm.dsp index da51cccd062..12f913257df 100644 --- a/usr.sbin/httpd/src/os/win32/mod_auth_dbm.dsp +++ b/usr.sbin/httpd/src/os/win32/mod_auth_dbm.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\lib\sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_auth_dbm" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\..\include" /I "..\..\os\win32" /I "..\..\lib\sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_auth_dbm_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_auth_dbm.so" /base:@"BaseAddr.ref",mod_auth_dbm -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_auth_dbm.so" /base:@"BaseAddr.ref",mod_auth_dbm +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_auth_dbm.so" /base:@"BaseAddr.ref",mod_auth_dbm /opt:ref +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_auth_dbm.so" /base:@"BaseAddr.ref",mod_auth_dbm /opt:ref !ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\lib\sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_auth_dbm" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\lib\sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_auth_dbm_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_dbm.so" /base:@"BaseAddr.ref",mod_auth_dbm -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_dbm.so" /base:@"BaseAddr.ref",mod_auth_dbm +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_auth_dbm.so" /base:@"BaseAddr.ref",mod_auth_dbm +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_auth_dbm.so" /base:@"BaseAddr.ref",mod_auth_dbm !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_auth_dbm.mak b/usr.sbin/httpd/src/os/win32/mod_auth_dbm.mak index 74c5a963bbd..88fe867716a 100644 --- a/usr.sbin/httpd/src/os/win32/mod_auth_dbm.mak +++ b/usr.sbin/httpd/src/os/win32/mod_auth_dbm.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on mod_auth_dbm.dsp !IF "$(CFG)" == "" CFG=mod_auth_dbm - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_auth_dbm - Win32\ - Release. +!MESSAGE No configuration specified. Defaulting to mod_auth_dbm - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_auth_dbm - Win32 Release" && "$(CFG)" !=\ - "mod_auth_dbm - Win32 Debug" +!IF "$(CFG)" != "mod_auth_dbm - Win32 Release" && "$(CFG)" != "mod_auth_dbm - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=mod_auth_dbm - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_auth_dbm - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_auth_dbm - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_auth_dbm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_auth_dbm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -43,8 +39,7 @@ ALL : "$(OUTDIR)\mod_auth_dbm.so" !ELSE -ALL : "sdbm - Win32 Release" "ApacheCore - Win32 Release"\ - "$(OUTDIR)\mod_auth_dbm.so" +ALL : "sdbm - Win32 Release" "ApacheCore - Win32 Release" "$(OUTDIR)\mod_auth_dbm.so" !ENDIF @@ -53,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" "sdbm - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_auth_dbm.idb" -@erase "$(INTDIR)\mod_auth_dbm.obj" + -@erase "$(INTDIR)\mod_auth_dbm_src.idb" + -@erase "$(INTDIR)\mod_auth_dbm_src.pdb" -@erase "$(OUTDIR)\mod_auth_dbm.exp" -@erase "$(OUTDIR)\mod_auth_dbm.lib" - -@erase "$(OUTDIR)\mod_auth_dbm.map" + -@erase "$(OUTDIR)\mod_auth_dbm.pdb" -@erase "$(OUTDIR)\mod_auth_dbm.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I\ - "..\..\lib\sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_dbm" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\lib\sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_dbm_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -108,14 +100,11 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_dbm.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_auth_dbm.pdb" /map:"$(INTDIR)\mod_auth_dbm.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_auth_dbm.so"\ - /implib:"$(OUTDIR)\mod_auth_dbm.lib" /base:@"BaseAddr.ref",mod_auth_dbm +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_auth_dbm.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_auth_dbm.so" /implib:"$(OUTDIR)\mod_auth_dbm.lib" /base:@"BaseAddr.ref",mod_auth_dbm /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_auth_dbm.obj" \ - "..\..\lib\sdbm\LibR\sdbm.lib" \ - "..\..\Release\ApacheCore.lib" + "..\..\Release\ApacheCore.lib" \ + "..\..\lib\sdbm\LibR\sdbm.lib" "$(OUTDIR)\mod_auth_dbm.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -136,8 +125,7 @@ ALL : "$(OUTDIR)\mod_auth_dbm.so" !ELSE -ALL : "sdbm - Win32 Debug" "ApacheCore - Win32 Debug"\ - "$(OUTDIR)\mod_auth_dbm.so" +ALL : "sdbm - Win32 Debug" "ApacheCore - Win32 Debug" "$(OUTDIR)\mod_auth_dbm.so" !ENDIF @@ -146,11 +134,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" "sdbm - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_auth_dbm.idb" -@erase "$(INTDIR)\mod_auth_dbm.obj" + -@erase "$(INTDIR)\mod_auth_dbm_src.idb" + -@erase "$(INTDIR)\mod_auth_dbm_src.pdb" -@erase "$(OUTDIR)\mod_auth_dbm.exp" -@erase "$(OUTDIR)\mod_auth_dbm.lib" - -@erase "$(OUTDIR)\mod_auth_dbm.map" -@erase "$(OUTDIR)\mod_auth_dbm.pdb" -@erase "$(OUTDIR)\mod_auth_dbm.so" @@ -158,38 +146,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\ - "..\..\lib\sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_dbm" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\lib\sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_dbm_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -202,10 +186,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_dbm.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_auth_dbm.pdb" /map:"$(INTDIR)\mod_auth_dbm.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_auth_dbm.so"\ - /implib:"$(OUTDIR)\mod_auth_dbm.lib" /base:@"BaseAddr.ref",mod_auth_dbm +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_auth_dbm.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_auth_dbm.so" /implib:"$(OUTDIR)\mod_auth_dbm.lib" /base:@"BaseAddr.ref",mod_auth_dbm LINK32_OBJS= \ "$(INTDIR)\mod_auth_dbm.obj" \ "..\..\Debug\ApacheCore.lib" \ @@ -219,21 +200,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_auth_dbm - Win32 Release" || "$(CFG)" ==\ - "mod_auth_dbm - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_auth_dbm.dep") +!INCLUDE "mod_auth_dbm.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_auth_dbm.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_auth_dbm - Win32 Release" || "$(CFG)" == "mod_auth_dbm - Win32 Debug" !IF "$(CFG)" == "mod_auth_dbm - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" @@ -245,8 +232,7 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF @@ -260,8 +246,7 @@ LINK32_OBJS= \ "sdbm - Win32 ReleaseCLEAN" : cd "..\../..\src\lib\sdbm" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\sdbm.mak" CFG="sdbm - Win32 Release"\ - RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\sdbm.mak" CFG="sdbm - Win32 Release" RECURSE=1 CLEAN cd "..\..\os\win32" !ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" @@ -273,38 +258,14 @@ LINK32_OBJS= \ "sdbm - Win32 DebugCLEAN" : cd "..\../..\src\lib\sdbm" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\sdbm.mak" CFG="sdbm - Win32 Debug"\ - RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\sdbm.mak" CFG="sdbm - Win32 Debug" RECURSE=1 CLEAN cd "..\..\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_auth_dbm.c -DEP_CPP_MOD_A=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - "..\..\lib\sdbm\sdbm.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_A=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_auth_dbm.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" +"$(INTDIR)\mod_auth_dbm.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/usr.sbin/httpd/src/os/win32/mod_auth_digest.dep b/usr.sbin/httpd/src/os/win32/mod_auth_digest.dep new file mode 100644 index 00000000000..fa5e3fcfcae --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/mod_auth_digest.dep @@ -0,0 +1,25 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_auth_digest.mak + +..\..\modules\experimental\mod_auth_digest.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_md5.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\ap_sha1.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_conf_globals.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_protocol.h"\ + "..\..\include\http_request.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_md5.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/mod_auth_digest.dsp b/usr.sbin/httpd/src/os/win32/mod_auth_digest.dsp index d77c1fa3680..555654846ee 100644 --- a/usr.sbin/httpd/src/os/win32/mod_auth_digest.dsp +++ b/usr.sbin/httpd/src/os/win32/mod_auth_digest.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_auth_digest" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_auth_digest_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_auth_digest.so" /base:@"BaseAddr.ref",mod_auth_digest -# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_auth_digest.so" /base:@"BaseAddr.ref",mod_auth_digest +# ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_auth_digest.so" /base:@"BaseAddr.ref",mod_auth_digest /opt:ref +# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_auth_digest.so" /base:@"BaseAddr.ref",mod_auth_digest /opt:ref !ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_auth_digest" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_auth_digest_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_digest.so" /base:@"BaseAddr.ref",mod_auth_digest -# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_digest.so" /base:@"BaseAddr.ref",mod_auth_digest +# ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_auth_digest.so" /base:@"BaseAddr.ref",mod_auth_digest +# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_auth_digest.so" /base:@"BaseAddr.ref",mod_auth_digest !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_auth_digest.mak b/usr.sbin/httpd/src/os/win32/mod_auth_digest.mak index 561d63a5309..7918f650053 100644 --- a/usr.sbin/httpd/src/os/win32/mod_auth_digest.mak +++ b/usr.sbin/httpd/src/os/win32/mod_auth_digest.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on mod_auth_digest.dsp !IF "$(CFG)" == "" CFG=mod_auth_digest - Win32 Debug -!MESSAGE No configuration specified. Defaulting to mod_auth_digest - Win32\ - Debug. +!MESSAGE No configuration specified. Defaulting to mod_auth_digest - Win32 Debug. !ENDIF -!IF "$(CFG)" != "mod_auth_digest - Win32 Release" && "$(CFG)" !=\ - "mod_auth_digest - Win32 Debug" +!IF "$(CFG)" != "mod_auth_digest - Win32 Release" && "$(CFG)" != "mod_auth_digest - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=mod_auth_digest - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_auth_digest - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_auth_digest - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_auth_digest - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_auth_digest - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -52,66 +48,59 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_auth_digest.idb" -@erase "$(INTDIR)\mod_auth_digest.obj" + -@erase "$(INTDIR)\mod_auth_digest_src.idb" + -@erase "$(INTDIR)\mod_auth_digest_src.pdb" -@erase "$(OUTDIR)\mod_auth_digest.exp" -@erase "$(OUTDIR)\mod_auth_digest.lib" - -@erase "$(OUTDIR)\mod_auth_digest.map" + -@erase "$(OUTDIR)\mod_auth_digest.pdb" -@erase "$(OUTDIR)\mod_auth_digest.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_auth_digest" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_digest_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_digest.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_auth_digest.pdb"\ - /map:"$(INTDIR)\mod_auth_digest.map" /machine:I386\ - /out:"$(OUTDIR)\mod_auth_digest.so" /implib:"$(OUTDIR)\mod_auth_digest.lib"\ - /base:@"BaseAddr.ref",mod_auth_digest +LINK32_FLAGS=kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_auth_digest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_auth_digest.so" /implib:"$(OUTDIR)\mod_auth_digest.lib" /base:@"BaseAddr.ref",mod_auth_digest /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_auth_digest.obj" \ "..\..\Release\ApacheCore.lib" @@ -144,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_auth_digest.idb" -@erase "$(INTDIR)\mod_auth_digest.obj" + -@erase "$(INTDIR)\mod_auth_digest_src.idb" + -@erase "$(INTDIR)\mod_auth_digest_src.pdb" -@erase "$(OUTDIR)\mod_auth_digest.exp" -@erase "$(OUTDIR)\mod_auth_digest.lib" - -@erase "$(OUTDIR)\mod_auth_digest.map" -@erase "$(OUTDIR)\mod_auth_digest.pdb" -@erase "$(OUTDIR)\mod_auth_digest.so" @@ -156,55 +145,47 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_auth_digest" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_digest_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_digest.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_auth_digest.pdb"\ - /map:"$(INTDIR)\mod_auth_digest.map" /debug /machine:I386\ - /out:"$(OUTDIR)\mod_auth_digest.so" /implib:"$(OUTDIR)\mod_auth_digest.lib"\ - /base:@"BaseAddr.ref",mod_auth_digest +LINK32_FLAGS=kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_auth_digest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_auth_digest.so" /implib:"$(OUTDIR)\mod_auth_digest.lib" /base:@"BaseAddr.ref",mod_auth_digest LINK32_OBJS= \ "$(INTDIR)\mod_auth_digest.obj" \ "..\..\Debug\ApacheCore.lib" @@ -217,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_auth_digest - Win32 Release" || "$(CFG)" ==\ - "mod_auth_digest - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_auth_digest.dep") +!INCLUDE "mod_auth_digest.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_auth_digest.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_auth_digest - Win32 Release" || "$(CFG)" == "mod_auth_digest - Win32 Debug" !IF "$(CFG)" == "mod_auth_digest - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug" @@ -243,43 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\experimental\mod_auth_digest.c -DEP_CPP_MOD_A=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_md5.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\ap_sha1.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_conf_globals.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\http_request.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_md5.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_A=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - "..\..\modules\experimental\mm.h"\ - -"$(INTDIR)\mod_auth_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" +"$(INTDIR)\mod_auth_digest.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/usr.sbin/httpd/src/os/win32/mod_cern_meta.dep b/usr.sbin/httpd/src/os/win32/mod_cern_meta.dep new file mode 100644 index 00000000000..505237605b2 --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/mod_cern_meta.dep @@ -0,0 +1,20 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_cern_meta.mak + +..\..\modules\standard\mod_cern_meta.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_request.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_script.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/mod_cern_meta.dsp b/usr.sbin/httpd/src/os/win32/mod_cern_meta.dsp index a60e6b9f72e..1a38c6abb37 100644 --- a/usr.sbin/httpd/src/os/win32/mod_cern_meta.dsp +++ b/usr.sbin/httpd/src/os/win32/mod_cern_meta.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_cern_meta" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_cern_meta_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_cern_meta.so" /base:@"BaseAddr.ref",mod_cern_meta -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_cern_meta.so" /base:@"BaseAddr.ref",mod_cern_meta +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_cern_meta.so" /base:@"BaseAddr.ref",mod_cern_meta /opt:ref +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_cern_meta.so" /base:@"BaseAddr.ref",mod_cern_meta /opt:ref !ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_cern_meta" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_cern_meta_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_cern_meta.so" /base:@"BaseAddr.ref",mod_cern_meta -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_cern_meta.so" /base:@"BaseAddr.ref",mod_cern_meta +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_cern_meta.so" /base:@"BaseAddr.ref",mod_cern_meta +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_cern_meta.so" /base:@"BaseAddr.ref",mod_cern_meta !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_cern_meta.mak b/usr.sbin/httpd/src/os/win32/mod_cern_meta.mak index 27a29b9fe01..22b49447a51 100644 --- a/usr.sbin/httpd/src/os/win32/mod_cern_meta.mak +++ b/usr.sbin/httpd/src/os/win32/mod_cern_meta.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on mod_cern_meta.dsp !IF "$(CFG)" == "" CFG=mod_cern_meta - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_cern_meta - Win32\ - Release. +!MESSAGE No configuration specified. Defaulting to mod_cern_meta - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_cern_meta - Win32 Release" && "$(CFG)" !=\ - "mod_cern_meta - Win32 Debug" +!IF "$(CFG)" != "mod_cern_meta - Win32 Release" && "$(CFG)" != "mod_cern_meta - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=mod_cern_meta - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_cern_meta - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_cern_meta - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_cern_meta - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_cern_meta - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -52,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_cern_meta.idb" -@erase "$(INTDIR)\mod_cern_meta.obj" + -@erase "$(INTDIR)\mod_cern_meta_src.idb" + -@erase "$(INTDIR)\mod_cern_meta_src.pdb" -@erase "$(OUTDIR)\mod_cern_meta.exp" -@erase "$(OUTDIR)\mod_cern_meta.lib" - -@erase "$(OUTDIR)\mod_cern_meta.map" + -@erase "$(OUTDIR)\mod_cern_meta.pdb" -@erase "$(OUTDIR)\mod_cern_meta.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_cern_meta" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_cern_meta_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -107,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_cern_meta.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_cern_meta.pdb" /map:"$(INTDIR)\mod_cern_meta.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_cern_meta.so"\ - /implib:"$(OUTDIR)\mod_cern_meta.lib" /base:@"BaseAddr.ref",mod_cern_meta +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_cern_meta.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_cern_meta.so" /implib:"$(OUTDIR)\mod_cern_meta.lib" /base:@"BaseAddr.ref",mod_cern_meta /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_cern_meta.obj" \ "..\..\Release\ApacheCore.lib" @@ -143,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_cern_meta.idb" -@erase "$(INTDIR)\mod_cern_meta.obj" + -@erase "$(INTDIR)\mod_cern_meta_src.idb" + -@erase "$(INTDIR)\mod_cern_meta_src.pdb" -@erase "$(OUTDIR)\mod_cern_meta.exp" -@erase "$(OUTDIR)\mod_cern_meta.lib" - -@erase "$(OUTDIR)\mod_cern_meta.map" -@erase "$(OUTDIR)\mod_cern_meta.pdb" -@erase "$(OUTDIR)\mod_cern_meta.so" @@ -155,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_cern_meta" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_cern_meta_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -199,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_cern_meta.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_cern_meta.pdb" /map:"$(INTDIR)\mod_cern_meta.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_cern_meta.so"\ - /implib:"$(OUTDIR)\mod_cern_meta.lib" /base:@"BaseAddr.ref",mod_cern_meta +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_cern_meta.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_cern_meta.so" /implib:"$(OUTDIR)\mod_cern_meta.lib" /base:@"BaseAddr.ref",mod_cern_meta LINK32_OBJS= \ "$(INTDIR)\mod_cern_meta.obj" \ "..\..\Debug\ApacheCore.lib" @@ -215,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_cern_meta - Win32 Release" || "$(CFG)" ==\ - "mod_cern_meta - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_cern_meta.dep") +!INCLUDE "mod_cern_meta.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_cern_meta.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_cern_meta - Win32 Release" || "$(CFG)" == "mod_cern_meta - Win32 Debug" !IF "$(CFG)" == "mod_cern_meta - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug" @@ -241,37 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_cern_meta.c -DEP_CPP_MOD_C=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_request.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_script.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_C=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" +"$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/usr.sbin/httpd/src/os/win32/mod_digest.dep b/usr.sbin/httpd/src/os/win32/mod_digest.dep new file mode 100644 index 00000000000..eb617887610 --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/mod_digest.dep @@ -0,0 +1,22 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_digest.mak + +..\..\modules\standard\mod_digest.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_md5.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_protocol.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_md5.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/mod_digest.dsp b/usr.sbin/httpd/src/os/win32/mod_digest.dsp index 0868cda69f1..dea88e6008a 100644 --- a/usr.sbin/httpd/src/os/win32/mod_digest.dsp +++ b/usr.sbin/httpd/src/os/win32/mod_digest.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_digest" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_digest_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_digest.so" /base:@"BaseAddr.ref",mod_digest -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_digest.so" /base:@"BaseAddr.ref",mod_digest +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_digest.so" /base:@"BaseAddr.ref",mod_digest /opt:ref +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_digest.so" /base:@"BaseAddr.ref",mod_digest /opt:ref !ELSEIF "$(CFG)" == "mod_digest - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_digest" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_digest_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_digest.so" /base:@"BaseAddr.ref",mod_digest -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_digest.so" /base:@"BaseAddr.ref",mod_digest +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_digest.so" /base:@"BaseAddr.ref",mod_digest +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_digest.so" /base:@"BaseAddr.ref",mod_digest !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_digest.mak b/usr.sbin/httpd/src/os/win32/mod_digest.mak index fbc4c71fe0d..82b1673804e 100644 --- a/usr.sbin/httpd/src/os/win32/mod_digest.mak +++ b/usr.sbin/httpd/src/os/win32/mod_digest.mak @@ -4,8 +4,7 @@ CFG=mod_digest - Win32 Release !MESSAGE No configuration specified. Defaulting to mod_digest - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_digest - Win32 Release" && "$(CFG)" !=\ - "mod_digest - Win32 Debug" +!IF "$(CFG)" != "mod_digest - Win32 Release" && "$(CFG)" != "mod_digest - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=mod_digest - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_digest - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_digest - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_digest - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_digest - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -51,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_digest.idb" -@erase "$(INTDIR)\mod_digest.obj" + -@erase "$(INTDIR)\mod_digest_src.idb" + -@erase "$(INTDIR)\mod_digest_src.pdb" -@erase "$(OUTDIR)\mod_digest.exp" -@erase "$(OUTDIR)\mod_digest.lib" - -@erase "$(OUTDIR)\mod_digest.map" + -@erase "$(OUTDIR)\mod_digest.pdb" -@erase "$(OUTDIR)\mod_digest.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_digest" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_digest_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -106,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_digest.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_digest.pdb" /map:"$(INTDIR)\mod_digest.map" /machine:I386\ - /out:"$(OUTDIR)\mod_digest.so" /implib:"$(OUTDIR)\mod_digest.lib"\ - /base:@"BaseAddr.ref",mod_digest +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_digest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_digest.so" /implib:"$(OUTDIR)\mod_digest.lib" /base:@"BaseAddr.ref",mod_digest /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_digest.obj" \ "..\..\Release\ApacheCore.lib" @@ -142,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_digest.idb" -@erase "$(INTDIR)\mod_digest.obj" + -@erase "$(INTDIR)\mod_digest_src.idb" + -@erase "$(INTDIR)\mod_digest_src.pdb" -@erase "$(OUTDIR)\mod_digest.exp" -@erase "$(OUTDIR)\mod_digest.lib" - -@erase "$(OUTDIR)\mod_digest.map" -@erase "$(OUTDIR)\mod_digest.pdb" -@erase "$(OUTDIR)\mod_digest.so" @@ -154,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_digest" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_digest_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -198,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_digest.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_digest.pdb" /map:"$(INTDIR)\mod_digest.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_digest.so" /implib:"$(OUTDIR)\mod_digest.lib"\ - /base:@"BaseAddr.ref",mod_digest +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_digest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_digest.so" /implib:"$(OUTDIR)\mod_digest.lib" /base:@"BaseAddr.ref",mod_digest LINK32_OBJS= \ "$(INTDIR)\mod_digest.obj" \ "..\..\Debug\ApacheCore.lib" @@ -214,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_digest - Win32 Release" || "$(CFG)" ==\ - "mod_digest - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_digest.dep") +!INCLUDE "mod_digest.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_digest.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_digest - Win32 Release" || "$(CFG)" == "mod_digest - Win32 Debug" !IF "$(CFG)" == "mod_digest - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_digest - Win32 Debug" @@ -240,39 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_digest.c -DEP_CPP_MOD_D=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_md5.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_md5.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_D=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" +"$(INTDIR)\mod_digest.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/usr.sbin/httpd/src/os/win32/mod_expires.dep b/usr.sbin/httpd/src/os/win32/mod_expires.dep new file mode 100644 index 00000000000..898172d84e6 --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/mod_expires.dep @@ -0,0 +1,18 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_expires.mak + +..\..\modules\standard\mod_expires.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_log.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/mod_expires.dsp b/usr.sbin/httpd/src/os/win32/mod_expires.dsp index 78bcbdcd2f2..39fb70437db 100644 --- a/usr.sbin/httpd/src/os/win32/mod_expires.dsp +++ b/usr.sbin/httpd/src/os/win32/mod_expires.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_expires" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_expires_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_expires.so" /base:@"BaseAddr.ref",mod_expires -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_expires.so" /base:@"BaseAddr.ref",mod_expires +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_expires.so" /base:@"BaseAddr.ref",mod_expires /opt:ref +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_expires.so" /base:@"BaseAddr.ref",mod_expires /opt:ref !ELSEIF "$(CFG)" == "mod_expires - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_expires" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_expires_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_expires.so" /base:@"BaseAddr.ref",mod_expires -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_expires.so" /base:@"BaseAddr.ref",mod_expires +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_expires.so" /base:@"BaseAddr.ref",mod_expires +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_expires.so" /base:@"BaseAddr.ref",mod_expires !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_expires.mak b/usr.sbin/httpd/src/os/win32/mod_expires.mak index 4a2f2324142..96c8fe30a0b 100644 --- a/usr.sbin/httpd/src/os/win32/mod_expires.mak +++ b/usr.sbin/httpd/src/os/win32/mod_expires.mak @@ -4,8 +4,7 @@ CFG=mod_expires - Win32 Release !MESSAGE No configuration specified. Defaulting to mod_expires - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_expires - Win32 Release" && "$(CFG)" !=\ - "mod_expires - Win32 Debug" +!IF "$(CFG)" != "mod_expires - Win32 Release" && "$(CFG)" != "mod_expires - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=mod_expires - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_expires - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_expires - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_expires - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_expires - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -51,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_expires.idb" -@erase "$(INTDIR)\mod_expires.obj" + -@erase "$(INTDIR)\mod_expires_src.idb" + -@erase "$(INTDIR)\mod_expires_src.pdb" -@erase "$(OUTDIR)\mod_expires.exp" -@erase "$(OUTDIR)\mod_expires.lib" - -@erase "$(OUTDIR)\mod_expires.map" + -@erase "$(OUTDIR)\mod_expires.pdb" -@erase "$(OUTDIR)\mod_expires.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_expires" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_expires_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -106,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_expires.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_expires.pdb" /map:"$(INTDIR)\mod_expires.map" /machine:I386\ - /out:"$(OUTDIR)\mod_expires.so" /implib:"$(OUTDIR)\mod_expires.lib"\ - /base:@"BaseAddr.ref",mod_expires +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_expires.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_expires.so" /implib:"$(OUTDIR)\mod_expires.lib" /base:@"BaseAddr.ref",mod_expires /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_expires.obj" \ "..\..\Release\ApacheCore.lib" @@ -142,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_expires.idb" -@erase "$(INTDIR)\mod_expires.obj" + -@erase "$(INTDIR)\mod_expires_src.idb" + -@erase "$(INTDIR)\mod_expires_src.pdb" -@erase "$(OUTDIR)\mod_expires.exp" -@erase "$(OUTDIR)\mod_expires.lib" - -@erase "$(OUTDIR)\mod_expires.map" -@erase "$(OUTDIR)\mod_expires.pdb" -@erase "$(OUTDIR)\mod_expires.so" @@ -154,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_expires" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_expires_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -198,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_expires.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_expires.pdb" /map:"$(INTDIR)\mod_expires.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_expires.so"\ - /implib:"$(OUTDIR)\mod_expires.lib" /base:@"BaseAddr.ref",mod_expires +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_expires.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_expires.so" /implib:"$(OUTDIR)\mod_expires.lib" /base:@"BaseAddr.ref",mod_expires LINK32_OBJS= \ "$(INTDIR)\mod_expires.obj" \ "..\..\Debug\ApacheCore.lib" @@ -214,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_expires - Win32 Release" || "$(CFG)" ==\ - "mod_expires - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_expires.dep") +!INCLUDE "mod_expires.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_expires.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_expires - Win32 Release" || "$(CFG)" == "mod_expires - Win32 Debug" !IF "$(CFG)" == "mod_expires - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_expires - Win32 Debug" @@ -240,35 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_expires.c -DEP_CPP_MOD_E=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_E=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" +"$(INTDIR)\mod_expires.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/usr.sbin/httpd/src/os/win32/mod_headers.dep b/usr.sbin/httpd/src/os/win32/mod_headers.dep new file mode 100644 index 00000000000..a686ac2de6d --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/mod_headers.dep @@ -0,0 +1,17 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_headers.mak + +..\..\modules\standard\mod_headers.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/mod_headers.dsp b/usr.sbin/httpd/src/os/win32/mod_headers.dsp index 6bb3fcc6b9a..dfdf83f5641 100644 --- a/usr.sbin/httpd/src/os/win32/mod_headers.dsp +++ b/usr.sbin/httpd/src/os/win32/mod_headers.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_headers" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_headers_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_headers.so" /base:@"BaseAddr.ref",mod_headers -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_headers.so" /base:@"BaseAddr.ref",mod_headers +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_headers.so" /base:@"BaseAddr.ref",mod_headers /opt:ref +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_headers.so" /base:@"BaseAddr.ref",mod_headers /opt:ref !ELSEIF "$(CFG)" == "mod_headers - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_headers" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_headers_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_headers.so" /base:@"BaseAddr.ref",mod_headers -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_headers.so" /base:@"BaseAddr.ref",mod_headers +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_headers.so" /base:@"BaseAddr.ref",mod_headers +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_headers.so" /base:@"BaseAddr.ref",mod_headers !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_headers.mak b/usr.sbin/httpd/src/os/win32/mod_headers.mak index 3c9cc3fb849..70d0790d893 100644 --- a/usr.sbin/httpd/src/os/win32/mod_headers.mak +++ b/usr.sbin/httpd/src/os/win32/mod_headers.mak @@ -4,8 +4,7 @@ CFG=mod_headers - Win32 Release !MESSAGE No configuration specified. Defaulting to mod_headers - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_headers - Win32 Release" && "$(CFG)" !=\ - "mod_headers - Win32 Debug" +!IF "$(CFG)" != "mod_headers - Win32 Release" && "$(CFG)" != "mod_headers - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=mod_headers - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_headers - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_headers - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_headers - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_headers - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -51,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_headers.idb" -@erase "$(INTDIR)\mod_headers.obj" + -@erase "$(INTDIR)\mod_headers_src.idb" + -@erase "$(INTDIR)\mod_headers_src.pdb" -@erase "$(OUTDIR)\mod_headers.exp" -@erase "$(OUTDIR)\mod_headers.lib" - -@erase "$(OUTDIR)\mod_headers.map" + -@erase "$(OUTDIR)\mod_headers.pdb" -@erase "$(OUTDIR)\mod_headers.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_headers" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_headers_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -106,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_headers.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_headers.pdb" /map:"$(INTDIR)\mod_headers.map" /machine:I386\ - /out:"$(OUTDIR)\mod_headers.so" /implib:"$(OUTDIR)\mod_headers.lib"\ - /base:@"BaseAddr.ref",mod_headers +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_headers.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_headers.so" /implib:"$(OUTDIR)\mod_headers.lib" /base:@"BaseAddr.ref",mod_headers /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_headers.obj" \ "..\..\Release\ApacheCore.lib" @@ -142,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_headers.idb" -@erase "$(INTDIR)\mod_headers.obj" + -@erase "$(INTDIR)\mod_headers_src.idb" + -@erase "$(INTDIR)\mod_headers_src.pdb" -@erase "$(OUTDIR)\mod_headers.exp" -@erase "$(OUTDIR)\mod_headers.lib" - -@erase "$(OUTDIR)\mod_headers.map" -@erase "$(OUTDIR)\mod_headers.pdb" -@erase "$(OUTDIR)\mod_headers.so" @@ -154,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_headers" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_headers_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -198,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_headers.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_headers.pdb" /map:"$(INTDIR)\mod_headers.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_headers.so"\ - /implib:"$(OUTDIR)\mod_headers.lib" /base:@"BaseAddr.ref",mod_headers +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_headers.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_headers.so" /implib:"$(OUTDIR)\mod_headers.lib" /base:@"BaseAddr.ref",mod_headers LINK32_OBJS= \ "$(INTDIR)\mod_headers.obj" \ "..\..\Debug\ApacheCore.lib" @@ -214,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_headers - Win32 Release" || "$(CFG)" ==\ - "mod_headers - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_headers.dep") +!INCLUDE "mod_headers.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_headers.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_headers - Win32 Release" || "$(CFG)" == "mod_headers - Win32 Debug" !IF "$(CFG)" == "mod_headers - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_headers - Win32 Debug" @@ -240,34 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_headers.c -DEP_CPP_MOD_H=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_H=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)" +"$(INTDIR)\mod_headers.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/usr.sbin/httpd/src/os/win32/mod_info.dep b/usr.sbin/httpd/src/os/win32/mod_info.dep new file mode 100644 index 00000000000..b17bac54cf0 --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/mod_info.dep @@ -0,0 +1,23 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_info.mak + +..\..\modules\standard\mod_info.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_conf_globals.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_main.h"\ + "..\..\include\http_protocol.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_script.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/mod_info.dsp b/usr.sbin/httpd/src/os/win32/mod_info.dsp index 02e5ad98962..f9490c569b2 100644 --- a/usr.sbin/httpd/src/os/win32/mod_info.dsp +++ b/usr.sbin/httpd/src/os/win32/mod_info.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_info" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_info_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_info.so" /base:@"BaseAddr.ref",mod_info -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_info.so" /base:@"BaseAddr.ref",mod_info +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_info.so" /base:@"BaseAddr.ref",mod_info /opt:ref +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_info.so" /base:@"BaseAddr.ref",mod_info /opt:ref !ELSEIF "$(CFG)" == "mod_info - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_info" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_info_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_info.so" /base:@"BaseAddr.ref",mod_info -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_info.so" /base:@"BaseAddr.ref",mod_info +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_info.so" /base:@"BaseAddr.ref",mod_info +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_info.so" /base:@"BaseAddr.ref",mod_info !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_info.mak b/usr.sbin/httpd/src/os/win32/mod_info.mak index 20ca25039b5..4b1ca88b957 100644 --- a/usr.sbin/httpd/src/os/win32/mod_info.mak +++ b/usr.sbin/httpd/src/os/win32/mod_info.mak @@ -4,8 +4,7 @@ CFG=mod_info - Win32 Release !MESSAGE No configuration specified. Defaulting to mod_info - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_info - Win32 Release" && "$(CFG)" !=\ - "mod_info - Win32 Debug" +!IF "$(CFG)" != "mod_info - Win32 Release" && "$(CFG)" != "mod_info - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,8 +13,7 @@ CFG=mod_info - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_info - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_info - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_info - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. @@ -50,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_info.idb" -@erase "$(INTDIR)\mod_info.obj" + -@erase "$(INTDIR)\mod_info_src.idb" + -@erase "$(INTDIR)\mod_info_src.pdb" -@erase "$(OUTDIR)\mod_info.exp" -@erase "$(OUTDIR)\mod_info.lib" - -@erase "$(OUTDIR)\mod_info.map" + -@erase "$(OUTDIR)\mod_info.pdb" -@erase "$(OUTDIR)\mod_info.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_info" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_info_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -105,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_info.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_info.pdb" /map:"$(INTDIR)\mod_info.map" /machine:I386\ - /out:"$(OUTDIR)\mod_info.so" /implib:"$(OUTDIR)\mod_info.lib"\ - /base:@"BaseAddr.ref",mod_info +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_info.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_info.so" /implib:"$(OUTDIR)\mod_info.lib" /base:@"BaseAddr.ref",mod_info /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_info.obj" \ "..\..\Release\ApacheCore.lib" @@ -141,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_info.idb" -@erase "$(INTDIR)\mod_info.obj" + -@erase "$(INTDIR)\mod_info_src.idb" + -@erase "$(INTDIR)\mod_info_src.pdb" -@erase "$(OUTDIR)\mod_info.exp" -@erase "$(OUTDIR)\mod_info.lib" - -@erase "$(OUTDIR)\mod_info.map" -@erase "$(OUTDIR)\mod_info.pdb" -@erase "$(OUTDIR)\mod_info.so" @@ -153,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_info" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_info_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -197,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_info.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_info.pdb" /map:"$(INTDIR)\mod_info.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_info.so" /implib:"$(OUTDIR)\mod_info.lib"\ - /base:@"BaseAddr.ref",mod_info +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_info.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_info.so" /implib:"$(OUTDIR)\mod_info.lib" /base:@"BaseAddr.ref",mod_info LINK32_OBJS= \ "$(INTDIR)\mod_info.obj" \ "..\..\Debug\ApacheCore.lib" @@ -213,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_info - Win32 Release" || "$(CFG)" ==\ - "mod_info - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_info.dep") +!INCLUDE "mod_info.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_info.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_info - Win32 Release" || "$(CFG)" == "mod_info - Win32 Debug" !IF "$(CFG)" == "mod_info - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_info - Win32 Debug" @@ -239,40 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_info.c -DEP_CPP_MOD_I=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_conf_globals.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_script.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_I=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" +"$(INTDIR)\mod_info.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/usr.sbin/httpd/src/os/win32/mod_mime_magic.dep b/usr.sbin/httpd/src/os/win32/mod_mime_magic.dep new file mode 100644 index 00000000000..943a5655a44 --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/mod_mime_magic.dep @@ -0,0 +1,21 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_mime_magic.mak + +..\..\modules\standard\mod_mime_magic.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_protocol.h"\ + "..\..\include\http_request.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/mod_mime_magic.dsp b/usr.sbin/httpd/src/os/win32/mod_mime_magic.dsp index d652bad9f8e..3df8cc851b5 100644 --- a/usr.sbin/httpd/src/os/win32/mod_mime_magic.dsp +++ b/usr.sbin/httpd/src/os/win32/mod_mime_magic.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_mime_magic" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_mime_magic_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_mime_magic.so" /base:@"BaseAddr.ref",mod_mime_magic -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_mime_magic.so" /base:@"BaseAddr.ref",mod_mime_magic +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_mime_magic.so" /base:@"BaseAddr.ref",mod_mime_magic /opt:ref +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_mime_magic.so" /base:@"BaseAddr.ref",mod_mime_magic /opt:ref !ELSEIF "$(CFG)" == "mod_mime_magic - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_mime_magic" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_mime_magic_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_mime_magic.so" /base:@"BaseAddr.ref",mod_mime_magic -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_mime_magic.so" /base:@"BaseAddr.ref",mod_mime_magic +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_mime_magic.so" /base:@"BaseAddr.ref",mod_mime_magic +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_mime_magic.so" /base:@"BaseAddr.ref",mod_mime_magic !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_mime_magic.mak b/usr.sbin/httpd/src/os/win32/mod_mime_magic.mak index 36a93c30d42..99438a9916f 100644 --- a/usr.sbin/httpd/src/os/win32/mod_mime_magic.mak +++ b/usr.sbin/httpd/src/os/win32/mod_mime_magic.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on mod_mime_magic.dsp !IF "$(CFG)" == "" CFG=mod_mime_magic - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_mime_magic - Win32\ - Release. +!MESSAGE No configuration specified. Defaulting to mod_mime_magic - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_mime_magic - Win32 Release" && "$(CFG)" !=\ - "mod_mime_magic - Win32 Debug" +!IF "$(CFG)" != "mod_mime_magic - Win32 Release" && "$(CFG)" != "mod_mime_magic - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=mod_mime_magic - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_mime_magic - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_mime_magic - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_mime_magic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_mime_magic - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -52,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_mime_magic.idb" -@erase "$(INTDIR)\mod_mime_magic.obj" + -@erase "$(INTDIR)\mod_mime_magic_src.idb" + -@erase "$(INTDIR)\mod_mime_magic_src.pdb" -@erase "$(OUTDIR)\mod_mime_magic.exp" -@erase "$(OUTDIR)\mod_mime_magic.lib" - -@erase "$(OUTDIR)\mod_mime_magic.map" + -@erase "$(OUTDIR)\mod_mime_magic.pdb" -@erase "$(OUTDIR)\mod_mime_magic.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_mime_magic" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_mime_magic_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -107,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_mime_magic.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_mime_magic.pdb" /map:"$(INTDIR)\mod_mime_magic.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_mime_magic.so"\ - /implib:"$(OUTDIR)\mod_mime_magic.lib" /base:@"BaseAddr.ref",mod_mime_magic +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_mime_magic.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_mime_magic.so" /implib:"$(OUTDIR)\mod_mime_magic.lib" /base:@"BaseAddr.ref",mod_mime_magic /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_mime_magic.obj" \ "..\..\Release\ApacheCore.lib" @@ -143,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_mime_magic.idb" -@erase "$(INTDIR)\mod_mime_magic.obj" + -@erase "$(INTDIR)\mod_mime_magic_src.idb" + -@erase "$(INTDIR)\mod_mime_magic_src.pdb" -@erase "$(OUTDIR)\mod_mime_magic.exp" -@erase "$(OUTDIR)\mod_mime_magic.lib" - -@erase "$(OUTDIR)\mod_mime_magic.map" -@erase "$(OUTDIR)\mod_mime_magic.pdb" -@erase "$(OUTDIR)\mod_mime_magic.so" @@ -155,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_mime_magic" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_mime_magic_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -199,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_mime_magic.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_mime_magic.pdb" /map:"$(INTDIR)\mod_mime_magic.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_mime_magic.so"\ - /implib:"$(OUTDIR)\mod_mime_magic.lib" /base:@"BaseAddr.ref",mod_mime_magic +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_mime_magic.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_mime_magic.so" /implib:"$(OUTDIR)\mod_mime_magic.lib" /base:@"BaseAddr.ref",mod_mime_magic LINK32_OBJS= \ "$(INTDIR)\mod_mime_magic.obj" \ "..\..\Debug\ApacheCore.lib" @@ -215,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_mime_magic - Win32 Release" || "$(CFG)" ==\ - "mod_mime_magic - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_mime_magic.dep") +!INCLUDE "mod_mime_magic.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_mime_magic.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_mime_magic - Win32 Release" || "$(CFG)" == "mod_mime_magic - Win32 Debug" !IF "$(CFG)" == "mod_mime_magic - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_mime_magic - Win32 Debug" @@ -241,38 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_mime_magic.c -DEP_CPP_MOD_M=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\http_request.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_M=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_mime_magic.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" +"$(INTDIR)\mod_mime_magic.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/usr.sbin/httpd/src/os/win32/mod_proxy.dep b/usr.sbin/httpd/src/os/win32/mod_proxy.dep new file mode 100644 index 00000000000..2c3a30467a1 --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/mod_proxy.dep @@ -0,0 +1,139 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_proxy.mak + +..\..\modules\proxy\mod_proxy.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\explain.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_protocol.h"\ + "..\..\include\http_request.h"\ + "..\..\include\http_vhost.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + "..\..\modules\proxy\mod_proxy.h"\ + ".\os.h"\ + ".\readdir.h"\ + + +..\..\modules\proxy\proxy_cache.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_md5.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\explain.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_conf_globals.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_main.h"\ + "..\..\include\http_protocol.h"\ + "..\..\include\httpd.h"\ + "..\..\include\multithread.h"\ + "..\..\include\util_date.h"\ + "..\..\include\util_uri.h"\ + "..\..\modules\proxy\mod_proxy.h"\ + ".\os.h"\ + ".\readdir.h"\ + + +..\..\modules\proxy\proxy_connect.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\explain.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_main.h"\ + "..\..\include\http_protocol.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + "..\..\modules\proxy\mod_proxy.h"\ + ".\os.h"\ + ".\readdir.h"\ + + +..\..\modules\proxy\proxy_ftp.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\explain.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_main.h"\ + "..\..\include\http_protocol.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + "..\..\modules\proxy\mod_proxy.h"\ + ".\os.h"\ + ".\readdir.h"\ + + +..\..\modules\proxy\proxy_http.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\explain.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_main.h"\ + "..\..\include\http_protocol.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_date.h"\ + "..\..\include\util_uri.h"\ + "..\..\modules\proxy\mod_proxy.h"\ + ".\os.h"\ + ".\readdir.h"\ + + +..\..\modules\proxy\proxy_util.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_md5.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\explain.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_main.h"\ + "..\..\include\http_protocol.h"\ + "..\..\include\httpd.h"\ + "..\..\include\multithread.h"\ + "..\..\include\util_date.h"\ + "..\..\include\util_uri.h"\ + "..\..\modules\proxy\mod_proxy.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/mod_proxy.dsp b/usr.sbin/httpd/src/os/win32/mod_proxy.dsp index cadc490d37c..e0bc0926592 100644 --- a/usr.sbin/httpd/src/os/win32/mod_proxy.dsp +++ b/usr.sbin/httpd/src/os/win32/mod_proxy.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\modules\proxy" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fd"Release\mod_proxy" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\..\include" /I "..\..\os\win32" /I "..\..\modules\proxy" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fd"Release\mod_proxy_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_proxy.so" /base:@"BaseAddr.ref",mod_proxy -# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_proxy.so" /base:@"BaseAddr.ref",mod_proxy +# ADD BASE LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_proxy.so" /base:@"BaseAddr.ref",mod_proxy /opt:ref +# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_proxy.so" /base:@"BaseAddr.ref",mod_proxy /opt:ref !ELSEIF "$(CFG)" == "mod_proxy - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\modules\proxy" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fd"Debug\mod_proxy" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\modules\proxy" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fd"Debug\mod_proxy_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_proxy.so" /base:@"BaseAddr.ref",mod_proxy -# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_proxy.so" /base:@"BaseAddr.ref",mod_proxy +# ADD BASE LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_proxy.so" /base:@"BaseAddr.ref",mod_proxy +# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_proxy.so" /base:@"BaseAddr.ref",mod_proxy !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_proxy.mak b/usr.sbin/httpd/src/os/win32/mod_proxy.mak index 196f465226d..6c120dd6183 100644 --- a/usr.sbin/httpd/src/os/win32/mod_proxy.mak +++ b/usr.sbin/httpd/src/os/win32/mod_proxy.mak @@ -4,8 +4,7 @@ CFG=mod_proxy - Win32 Release !MESSAGE No configuration specified. Defaulting to mod_proxy - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_proxy - Win32 Release" && "$(CFG)" !=\ - "mod_proxy - Win32 Debug" +!IF "$(CFG)" != "mod_proxy - Win32 Release" && "$(CFG)" != "mod_proxy - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=mod_proxy - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_proxy - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_proxy - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_proxy - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_proxy - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -51,8 +48,9 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_proxy.idb" -@erase "$(INTDIR)\mod_proxy.obj" + -@erase "$(INTDIR)\mod_proxy_src.idb" + -@erase "$(INTDIR)\mod_proxy_src.pdb" -@erase "$(INTDIR)\proxy_cache.obj" -@erase "$(INTDIR)\proxy_connect.obj" -@erase "$(INTDIR)\proxy_ftp.obj" @@ -60,45 +58,41 @@ CLEAN : -@erase "$(INTDIR)\proxy_util.obj" -@erase "$(OUTDIR)\mod_proxy.exp" -@erase "$(OUTDIR)\mod_proxy.lib" - -@erase "$(OUTDIR)\mod_proxy.map" + -@erase "$(OUTDIR)\mod_proxy.pdb" -@erase "$(OUTDIR)\mod_proxy.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I\ - "..\..\modules\proxy" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ - /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\modules\proxy" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -111,10 +105,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /map:"$(INTDIR)\mod_proxy.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_proxy.so" /implib:"$(OUTDIR)\mod_proxy.lib"\ - /base:@"BaseAddr.ref",mod_proxy +LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_proxy.so" /implib:"$(OUTDIR)\mod_proxy.lib" /base:@"BaseAddr.ref",mod_proxy /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_proxy.obj" \ "$(INTDIR)\proxy_cache.obj" \ @@ -152,8 +143,9 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_proxy.idb" -@erase "$(INTDIR)\mod_proxy.obj" + -@erase "$(INTDIR)\mod_proxy_src.idb" + -@erase "$(INTDIR)\mod_proxy_src.pdb" -@erase "$(INTDIR)\proxy_cache.obj" -@erase "$(INTDIR)\proxy_connect.obj" -@erase "$(INTDIR)\proxy_ftp.obj" @@ -161,7 +153,6 @@ CLEAN : -@erase "$(INTDIR)\proxy_util.obj" -@erase "$(OUTDIR)\mod_proxy.exp" -@erase "$(OUTDIR)\mod_proxy.lib" - -@erase "$(OUTDIR)\mod_proxy.map" -@erase "$(OUTDIR)\mod_proxy.pdb" -@erase "$(OUTDIR)\mod_proxy.so" @@ -169,38 +160,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\ - "..\..\modules\proxy" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ - /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\modules\proxy" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -213,10 +200,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /map:"$(INTDIR)\mod_proxy.map"\ - /debug /machine:I386 /out:"$(OUTDIR)\mod_proxy.so"\ - /implib:"$(OUTDIR)\mod_proxy.lib" /base:@"BaseAddr.ref",mod_proxy +LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_proxy.so" /implib:"$(OUTDIR)\mod_proxy.lib" /base:@"BaseAddr.ref",mod_proxy LINK32_OBJS= \ "$(INTDIR)\mod_proxy.obj" \ "$(INTDIR)\proxy_cache.obj" \ @@ -234,196 +218,49 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_proxy - Win32 Release" || "$(CFG)" ==\ - "mod_proxy - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_proxy.dep") +!INCLUDE "mod_proxy.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_proxy.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_proxy - Win32 Release" || "$(CFG)" == "mod_proxy - Win32 Debug" SOURCE=..\..\modules\proxy\mod_proxy.c -DEP_CPP_MOD_P=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\explain.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\http_request.h"\ - "..\..\include\http_vhost.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_P=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)" +"$(INTDIR)\mod_proxy.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\..\modules\proxy\proxy_cache.c -DEP_CPP_PROXY=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_md5.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\explain.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_conf_globals.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\multithread.h"\ - "..\..\include\util_date.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_PROXY=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)" +"$(INTDIR)\proxy_cache.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\..\modules\proxy\proxy_connect.c -DEP_CPP_PROXY_=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\explain.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_PROXY_=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)" +"$(INTDIR)\proxy_connect.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\..\modules\proxy\proxy_ftp.c -DEP_CPP_PROXY_F=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\explain.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_PROXY_F=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_F) "$(INTDIR)" +"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\..\modules\proxy\proxy_http.c -DEP_CPP_PROXY_H=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\explain.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_date.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_PROXY_H=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)" +"$(INTDIR)\proxy_http.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\..\modules\proxy\proxy_util.c -DEP_CPP_PROXY_U=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_md5.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\explain.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\multithread.h"\ - "..\..\include\util_date.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_PROXY_U=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY_U) "$(INTDIR)" +"$(INTDIR)\proxy_util.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) @@ -431,14 +268,12 @@ NODEP_CPP_PROXY_U=\ "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_proxy - Win32 Debug" @@ -450,8 +285,7 @@ NODEP_CPP_PROXY_U=\ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_rewrite.dep b/usr.sbin/httpd/src/os/win32/mod_rewrite.dep new file mode 100644 index 00000000000..76ddd96c042 --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/mod_rewrite.dep @@ -0,0 +1,27 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_rewrite.mak + +..\..\modules\standard\mod_rewrite.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_conf_globals.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_request.h"\ + "..\..\include\http_vhost.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + "..\..\modules\standard\mod_rewrite.h"\ + ".\os.h"\ + ".\readdir.h"\ + + +.\passwd.c : \ + ".\passwd.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/mod_rewrite.dsp b/usr.sbin/httpd/src/os/win32/mod_rewrite.dsp index 2bef8d2576a..73ac1d7aa79 100644 --- a/usr.sbin/httpd/src/os/win32/mod_rewrite.dsp +++ b/usr.sbin/httpd/src/os/win32/mod_rewrite.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fd"Release\mod_rewrite" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fd"Release\mod_rewrite_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_rewrite.so" /base:@"BaseAddr.ref",mod_rewrite -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_rewrite.so" /base:@"BaseAddr.ref",mod_rewrite +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_rewrite.so" /base:@"BaseAddr.ref",mod_rewrite /opt:ref +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_rewrite.so" /base:@"BaseAddr.ref",mod_rewrite /opt:ref !ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fd"Debug\mod_rewrite" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fd"Debug\mod_rewrite_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_rewrite.so" /base:@"BaseAddr.ref",mod_rewrite -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_rewrite.so" /base:@"BaseAddr.ref",mod_rewrite +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_rewrite.so" /base:@"BaseAddr.ref",mod_rewrite +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_rewrite.so" /base:@"BaseAddr.ref",mod_rewrite !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_rewrite.mak b/usr.sbin/httpd/src/os/win32/mod_rewrite.mak index 5dc424065d0..a3728fef547 100644 --- a/usr.sbin/httpd/src/os/win32/mod_rewrite.mak +++ b/usr.sbin/httpd/src/os/win32/mod_rewrite.mak @@ -4,8 +4,7 @@ CFG=mod_rewrite - Win32 Release !MESSAGE No configuration specified. Defaulting to mod_rewrite - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_rewrite - Win32 Release" && "$(CFG)" !=\ - "mod_rewrite - Win32 Debug" +!IF "$(CFG)" != "mod_rewrite - Win32 Release" && "$(CFG)" != "mod_rewrite - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=mod_rewrite - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_rewrite - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_rewrite - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_rewrite - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_rewrite - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -51,50 +48,47 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_rewrite.idb" -@erase "$(INTDIR)\mod_rewrite.obj" + -@erase "$(INTDIR)\mod_rewrite_src.idb" + -@erase "$(INTDIR)\mod_rewrite_src.pdb" -@erase "$(INTDIR)\passwd.obj" -@erase "$(OUTDIR)\mod_rewrite.exp" -@erase "$(OUTDIR)\mod_rewrite.lib" - -@erase "$(OUTDIR)\mod_rewrite.map" + -@erase "$(OUTDIR)\mod_rewrite.pdb" -@erase "$(OUTDIR)\mod_rewrite.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D\ - "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_rewrite" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_rewrite_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -107,10 +101,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_rewrite.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_rewrite.pdb" /map:"$(INTDIR)\mod_rewrite.map" /machine:I386\ - /out:"$(OUTDIR)\mod_rewrite.so" /implib:"$(OUTDIR)\mod_rewrite.lib"\ - /base:@"BaseAddr.ref",mod_rewrite +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_rewrite.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_rewrite.so" /implib:"$(OUTDIR)\mod_rewrite.lib" /base:@"BaseAddr.ref",mod_rewrite /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_rewrite.obj" \ "$(INTDIR)\passwd.obj" \ @@ -144,12 +135,12 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_rewrite.idb" -@erase "$(INTDIR)\mod_rewrite.obj" + -@erase "$(INTDIR)\mod_rewrite_src.idb" + -@erase "$(INTDIR)\mod_rewrite_src.pdb" -@erase "$(INTDIR)\passwd.obj" -@erase "$(OUTDIR)\mod_rewrite.exp" -@erase "$(OUTDIR)\mod_rewrite.lib" - -@erase "$(OUTDIR)\mod_rewrite.map" -@erase "$(OUTDIR)\mod_rewrite.pdb" -@erase "$(OUTDIR)\mod_rewrite.so" @@ -157,38 +148,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D\ - "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_rewrite" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_rewrite_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -201,10 +188,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_rewrite.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_rewrite.pdb" /map:"$(INTDIR)\mod_rewrite.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_rewrite.so"\ - /implib:"$(OUTDIR)\mod_rewrite.lib" /base:@"BaseAddr.ref",mod_rewrite +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_rewrite.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_rewrite.so" /implib:"$(OUTDIR)\mod_rewrite.lib" /base:@"BaseAddr.ref",mod_rewrite LINK32_OBJS= \ "$(INTDIR)\mod_rewrite.obj" \ "$(INTDIR)\passwd.obj" \ @@ -218,21 +202,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_rewrite - Win32 Release" || "$(CFG)" ==\ - "mod_rewrite - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_rewrite.dep") +!INCLUDE "mod_rewrite.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_rewrite.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_rewrite - Win32 Release" || "$(CFG)" == "mod_rewrite - Win32 Debug" !IF "$(CFG)" == "mod_rewrite - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug" @@ -244,49 +234,20 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_rewrite.c -DEP_CPP_MOD_R=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_conf_globals.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_request.h"\ - "..\..\include\http_vhost.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\standard\mod_rewrite.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_R=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_rewrite.obj" : $(SOURCE) $(DEP_CPP_MOD_R) "$(INTDIR)" +"$(INTDIR)\mod_rewrite.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\passwd.c -DEP_CPP_PASSW=\ - ".\passwd.h"\ - -"$(INTDIR)\passwd.obj" : $(SOURCE) $(DEP_CPP_PASSW) "$(INTDIR)" +"$(INTDIR)\passwd.obj" : $(SOURCE) "$(INTDIR)" diff --git a/usr.sbin/httpd/src/os/win32/mod_speling.dep b/usr.sbin/httpd/src/os/win32/mod_speling.dep new file mode 100644 index 00000000000..ece0bb4ff79 --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/mod_speling.dep @@ -0,0 +1,19 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_speling.mak + +..\..\modules\standard\mod_speling.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\http_log.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/mod_speling.dsp b/usr.sbin/httpd/src/os/win32/mod_speling.dsp index e40ae571c53..6ff56ea1d32 100644 --- a/usr.sbin/httpd/src/os/win32/mod_speling.dsp +++ b/usr.sbin/httpd/src/os/win32/mod_speling.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_speling" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_speling_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_speling.so" /base:@"BaseAddr.ref",mod_speling -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_speling.so" /base:@"BaseAddr.ref",mod_speling +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_speling.so" /base:@"BaseAddr.ref",mod_speling /opt:ref +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_speling.so" /base:@"BaseAddr.ref",mod_speling /opt:ref !ELSEIF "$(CFG)" == "mod_speling - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_speling" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_speling_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_speling.so" /base:@"BaseAddr.ref",mod_speling -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_speling.so" /base:@"BaseAddr.ref",mod_speling +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_speling.so" /base:@"BaseAddr.ref",mod_speling +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_speling.so" /base:@"BaseAddr.ref",mod_speling !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_speling.mak b/usr.sbin/httpd/src/os/win32/mod_speling.mak index 1aeaad93daf..a1b468eb76a 100644 --- a/usr.sbin/httpd/src/os/win32/mod_speling.mak +++ b/usr.sbin/httpd/src/os/win32/mod_speling.mak @@ -4,8 +4,7 @@ CFG=mod_speling - Win32 Release !MESSAGE No configuration specified. Defaulting to mod_speling - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_speling - Win32 Release" && "$(CFG)" !=\ - "mod_speling - Win32 Debug" +!IF "$(CFG)" != "mod_speling - Win32 Release" && "$(CFG)" != "mod_speling - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=mod_speling - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_speling - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_speling - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_speling - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_speling - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -51,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_speling.idb" -@erase "$(INTDIR)\mod_speling.obj" + -@erase "$(INTDIR)\mod_speling_src.idb" + -@erase "$(INTDIR)\mod_speling_src.pdb" -@erase "$(OUTDIR)\mod_speling.exp" -@erase "$(OUTDIR)\mod_speling.lib" - -@erase "$(OUTDIR)\mod_speling.map" + -@erase "$(OUTDIR)\mod_speling.pdb" -@erase "$(OUTDIR)\mod_speling.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_speling" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_speling_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -106,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_speling.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_speling.pdb" /map:"$(INTDIR)\mod_speling.map" /machine:I386\ - /out:"$(OUTDIR)\mod_speling.so" /implib:"$(OUTDIR)\mod_speling.lib"\ - /base:@"BaseAddr.ref",mod_speling +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_speling.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_speling.so" /implib:"$(OUTDIR)\mod_speling.lib" /base:@"BaseAddr.ref",mod_speling /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_speling.obj" \ "..\..\Release\ApacheCore.lib" @@ -142,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_speling.idb" -@erase "$(INTDIR)\mod_speling.obj" + -@erase "$(INTDIR)\mod_speling_src.idb" + -@erase "$(INTDIR)\mod_speling_src.pdb" -@erase "$(OUTDIR)\mod_speling.exp" -@erase "$(OUTDIR)\mod_speling.lib" - -@erase "$(OUTDIR)\mod_speling.map" -@erase "$(OUTDIR)\mod_speling.pdb" -@erase "$(OUTDIR)\mod_speling.so" @@ -154,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_speling" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_speling_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -198,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_speling.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_speling.pdb" /map:"$(INTDIR)\mod_speling.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_speling.so"\ - /implib:"$(OUTDIR)\mod_speling.lib" /base:@"BaseAddr.ref",mod_speling +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_speling.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_speling.so" /implib:"$(OUTDIR)\mod_speling.lib" /base:@"BaseAddr.ref",mod_speling LINK32_OBJS= \ "$(INTDIR)\mod_speling.obj" \ "..\..\Debug\ApacheCore.lib" @@ -214,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_speling - Win32 Release" || "$(CFG)" ==\ - "mod_speling - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_speling.dep") +!INCLUDE "mod_speling.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_speling.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_speling - Win32 Release" || "$(CFG)" == "mod_speling - Win32 Debug" !IF "$(CFG)" == "mod_speling - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_speling - Win32 Debug" @@ -240,36 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_speling.c -DEP_CPP_MOD_S=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_S=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" +"$(INTDIR)\mod_speling.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/usr.sbin/httpd/src/os/win32/mod_status.dep b/usr.sbin/httpd/src/os/win32/mod_status.dep new file mode 100644 index 00000000000..4ef8561d297 --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/mod_status.dep @@ -0,0 +1,24 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_status.mak + +..\..\modules\standard\mod_status.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_conf_globals.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_main.h"\ + "..\..\include\http_protocol.h"\ + "..\..\include\httpd.h"\ + "..\..\include\scoreboard.h"\ + "..\..\include\util_script.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/mod_status.dsp b/usr.sbin/httpd/src/os/win32/mod_status.dsp index 1a88a4022dd..ab708c3e216 100644 --- a/usr.sbin/httpd/src/os/win32/mod_status.dsp +++ b/usr.sbin/httpd/src/os/win32/mod_status.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_status" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_status_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_status.so" /base:@"BaseAddr.ref",mod_status -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_status.so" /base:@"BaseAddr.ref",mod_status +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_status.so" /base:@"BaseAddr.ref",mod_status /opt:ref +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_status.so" /base:@"BaseAddr.ref",mod_status /opt:ref !ELSEIF "$(CFG)" == "mod_status - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_status" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_status_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_status.so" /base:@"BaseAddr.ref",mod_status -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_status.so" /base:@"BaseAddr.ref",mod_status +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_status.so" /base:@"BaseAddr.ref",mod_status +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_status.so" /base:@"BaseAddr.ref",mod_status !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_status.mak b/usr.sbin/httpd/src/os/win32/mod_status.mak index 7c3880e69c8..d08f2ba62fa 100644 --- a/usr.sbin/httpd/src/os/win32/mod_status.mak +++ b/usr.sbin/httpd/src/os/win32/mod_status.mak @@ -4,8 +4,7 @@ CFG=mod_status - Win32 Release !MESSAGE No configuration specified. Defaulting to mod_status - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_status - Win32 Release" && "$(CFG)" !=\ - "mod_status - Win32 Debug" +!IF "$(CFG)" != "mod_status - Win32 Release" && "$(CFG)" != "mod_status - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=mod_status - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_status - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_status - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_status - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_status - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -51,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_status.idb" -@erase "$(INTDIR)\mod_status.obj" + -@erase "$(INTDIR)\mod_status_src.idb" + -@erase "$(INTDIR)\mod_status_src.pdb" -@erase "$(OUTDIR)\mod_status.exp" -@erase "$(OUTDIR)\mod_status.lib" - -@erase "$(OUTDIR)\mod_status.map" + -@erase "$(OUTDIR)\mod_status.pdb" -@erase "$(OUTDIR)\mod_status.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_status" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_status_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -106,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_status.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_status.pdb" /map:"$(INTDIR)\mod_status.map" /machine:I386\ - /out:"$(OUTDIR)\mod_status.so" /implib:"$(OUTDIR)\mod_status.lib"\ - /base:@"BaseAddr.ref",mod_status +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_status.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_status.so" /implib:"$(OUTDIR)\mod_status.lib" /base:@"BaseAddr.ref",mod_status /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_status.obj" \ "..\..\Release\ApacheCore.lib" @@ -142,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_status.idb" -@erase "$(INTDIR)\mod_status.obj" + -@erase "$(INTDIR)\mod_status_src.idb" + -@erase "$(INTDIR)\mod_status_src.pdb" -@erase "$(OUTDIR)\mod_status.exp" -@erase "$(OUTDIR)\mod_status.lib" - -@erase "$(OUTDIR)\mod_status.map" -@erase "$(OUTDIR)\mod_status.pdb" -@erase "$(OUTDIR)\mod_status.so" @@ -154,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_status" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_status_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -198,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_status.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_status.pdb" /map:"$(INTDIR)\mod_status.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_status.so" /implib:"$(OUTDIR)\mod_status.lib"\ - /base:@"BaseAddr.ref",mod_status +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_status.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_status.so" /implib:"$(OUTDIR)\mod_status.lib" /base:@"BaseAddr.ref",mod_status LINK32_OBJS= \ "$(INTDIR)\mod_status.obj" \ "..\..\Debug\ApacheCore.lib" @@ -214,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_status - Win32 Release" || "$(CFG)" ==\ - "mod_status - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_status.dep") +!INCLUDE "mod_status.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_status.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_status - Win32 Release" || "$(CFG)" == "mod_status - Win32 Debug" !IF "$(CFG)" == "mod_status - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_status - Win32 Debug" @@ -240,41 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_status.c -DEP_CPP_MOD_S=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_conf_globals.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\scoreboard.h"\ - "..\..\include\util_script.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_S=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" +"$(INTDIR)\mod_status.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/usr.sbin/httpd/src/os/win32/mod_unique_id.dep b/usr.sbin/httpd/src/os/win32/mod_unique_id.dep new file mode 100644 index 00000000000..a91486c541a --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/mod_unique_id.dep @@ -0,0 +1,19 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_unique_id.mak + +..\..\modules\standard\mod_unique_id.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_log.h"\ + "..\..\include\httpd.h"\ + "..\..\include\multithread.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/mod_unique_id.dsp b/usr.sbin/httpd/src/os/win32/mod_unique_id.dsp index ecf957da164..5b405765687 100644 --- a/usr.sbin/httpd/src/os/win32/mod_unique_id.dsp +++ b/usr.sbin/httpd/src/os/win32/mod_unique_id.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_unique_id" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_unique_id_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_unique_id.so" /base:@"BaseAddr.ref",mod_unique_id -# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_unique_id.so" /base:@"BaseAddr.ref",mod_unique_id +# ADD BASE LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_unique_id.so" /base:@"BaseAddr.ref",mod_unique_id /opt:ref +# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_unique_id.so" /base:@"BaseAddr.ref",mod_unique_id /opt:ref !ELSEIF "$(CFG)" == "mod_unique_id - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_unique_id" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_unique_id_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_unique_id.so" /base:@"BaseAddr.ref",mod_unique_id -# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_unique_id.so" /base:@"BaseAddr.ref",mod_unique_id +# ADD BASE LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_unique_id.so" /base:@"BaseAddr.ref",mod_unique_id +# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_unique_id.so" /base:@"BaseAddr.ref",mod_unique_id !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_unique_id.mak b/usr.sbin/httpd/src/os/win32/mod_unique_id.mak index f8eb3f59f10..aebfa36f09d 100644 --- a/usr.sbin/httpd/src/os/win32/mod_unique_id.mak +++ b/usr.sbin/httpd/src/os/win32/mod_unique_id.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on mod_unique_id.dsp !IF "$(CFG)" == "" CFG=mod_unique_id - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_unique_id - Win32\ - Release. +!MESSAGE No configuration specified. Defaulting to mod_unique_id - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_unique_id - Win32 Release" && "$(CFG)" !=\ - "mod_unique_id - Win32 Debug" +!IF "$(CFG)" != "mod_unique_id - Win32 Release" && "$(CFG)" != "mod_unique_id - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=mod_unique_id - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_unique_id - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_unique_id - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_unique_id - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_unique_id - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -52,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_unique_id.idb" -@erase "$(INTDIR)\mod_unique_id.obj" + -@erase "$(INTDIR)\mod_unique_id_src.idb" + -@erase "$(INTDIR)\mod_unique_id_src.pdb" -@erase "$(OUTDIR)\mod_unique_id.exp" -@erase "$(OUTDIR)\mod_unique_id.lib" - -@erase "$(OUTDIR)\mod_unique_id.map" + -@erase "$(OUTDIR)\mod_unique_id.pdb" -@erase "$(OUTDIR)\mod_unique_id.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_unique_id" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_unique_id_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -107,11 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_unique_id.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_unique_id.pdb"\ - /map:"$(INTDIR)\mod_unique_id.map" /machine:I386\ - /out:"$(OUTDIR)\mod_unique_id.so" /implib:"$(OUTDIR)\mod_unique_id.lib"\ - /base:@"BaseAddr.ref",mod_unique_id +LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_unique_id.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_unique_id.so" /implib:"$(OUTDIR)\mod_unique_id.lib" /base:@"BaseAddr.ref",mod_unique_id /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_unique_id.obj" \ "..\..\Release\ApacheCore.lib" @@ -144,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_unique_id.idb" -@erase "$(INTDIR)\mod_unique_id.obj" + -@erase "$(INTDIR)\mod_unique_id_src.idb" + -@erase "$(INTDIR)\mod_unique_id_src.pdb" -@erase "$(OUTDIR)\mod_unique_id.exp" -@erase "$(OUTDIR)\mod_unique_id.lib" - -@erase "$(OUTDIR)\mod_unique_id.map" -@erase "$(OUTDIR)\mod_unique_id.pdb" -@erase "$(OUTDIR)\mod_unique_id.so" @@ -156,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_unique_id" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_unique_id_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -200,11 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_unique_id.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_unique_id.pdb"\ - /map:"$(INTDIR)\mod_unique_id.map" /debug /machine:I386\ - /out:"$(OUTDIR)\mod_unique_id.so" /implib:"$(OUTDIR)\mod_unique_id.lib"\ - /base:@"BaseAddr.ref",mod_unique_id +LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_unique_id.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_unique_id.so" /implib:"$(OUTDIR)\mod_unique_id.lib" /base:@"BaseAddr.ref",mod_unique_id LINK32_OBJS= \ "$(INTDIR)\mod_unique_id.obj" \ "..\..\Debug\ApacheCore.lib" @@ -217,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_unique_id - Win32 Release" || "$(CFG)" ==\ - "mod_unique_id - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_unique_id.dep") +!INCLUDE "mod_unique_id.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_unique_id.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_unique_id - Win32 Release" || "$(CFG)" == "mod_unique_id - Win32 Debug" !IF "$(CFG)" == "mod_unique_id - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_unique_id - Win32 Debug" @@ -243,36 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_unique_id.c -DEP_CPP_MOD_U=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\httpd.h"\ - "..\..\include\multithread.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_U=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_unique_id.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" +"$(INTDIR)\mod_unique_id.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/usr.sbin/httpd/src/os/win32/mod_usertrack.dep b/usr.sbin/httpd/src/os/win32/mod_usertrack.dep new file mode 100644 index 00000000000..43d6aeeb701 --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/mod_usertrack.dep @@ -0,0 +1,18 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_usertrack.mak + +..\..\modules\standard\mod_usertrack.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/mod_usertrack.dsp b/usr.sbin/httpd/src/os/win32/mod_usertrack.dsp index 53be9eeba62..ee236c980ca 100644 --- a/usr.sbin/httpd/src/os/win32/mod_usertrack.dsp +++ b/usr.sbin/httpd/src/os/win32/mod_usertrack.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_usertrack" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_usertrack_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_usertrack.so" /base:@"BaseAddr.ref",mod_usertrack -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_usertrack.so" /base:@"BaseAddr.ref",mod_usertrack +# ADD BASE LINK32 kernel32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_usertrack.so" /base:@"BaseAddr.ref",mod_usertrack /opt:ref +# ADD LINK32 kernel32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_usertrack.so" /base:@"BaseAddr.ref",mod_usertrack /opt:ref !ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_usertrack" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_usertrack_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_usertrack.so" /base:@"BaseAddr.ref",mod_usertrack -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_usertrack.so" /base:@"BaseAddr.ref",mod_usertrack +# ADD BASE LINK32 kernel32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_usertrack.so" /base:@"BaseAddr.ref",mod_usertrack +# ADD LINK32 kernel32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_usertrack.so" /base:@"BaseAddr.ref",mod_usertrack !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_usertrack.mak b/usr.sbin/httpd/src/os/win32/mod_usertrack.mak index 27558cd1db1..9479f6aca05 100644 --- a/usr.sbin/httpd/src/os/win32/mod_usertrack.mak +++ b/usr.sbin/httpd/src/os/win32/mod_usertrack.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on mod_usertrack.dsp !IF "$(CFG)" == "" CFG=mod_usertrack - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_usertrack - Win32\ - Release. +!MESSAGE No configuration specified. Defaulting to mod_usertrack - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_usertrack - Win32 Release" && "$(CFG)" !=\ - "mod_usertrack - Win32 Debug" +!IF "$(CFG)" != "mod_usertrack - Win32 Release" && "$(CFG)" != "mod_usertrack - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=mod_usertrack - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_usertrack - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_usertrack - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_usertrack - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_usertrack - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -52,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_usertrack.idb" -@erase "$(INTDIR)\mod_usertrack.obj" + -@erase "$(INTDIR)\mod_usertrack_src.idb" + -@erase "$(INTDIR)\mod_usertrack_src.pdb" -@erase "$(OUTDIR)\mod_usertrack.exp" -@erase "$(OUTDIR)\mod_usertrack.lib" - -@erase "$(OUTDIR)\mod_usertrack.map" + -@erase "$(OUTDIR)\mod_usertrack.pdb" -@erase "$(OUTDIR)\mod_usertrack.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_usertrack" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_usertrack_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -107,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_usertrack.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_usertrack.pdb" /map:"$(INTDIR)\mod_usertrack.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_usertrack.so"\ - /implib:"$(OUTDIR)\mod_usertrack.lib" /base:@"BaseAddr.ref",mod_usertrack +LINK32_FLAGS=kernel32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_usertrack.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_usertrack.so" /implib:"$(OUTDIR)\mod_usertrack.lib" /base:@"BaseAddr.ref",mod_usertrack /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_usertrack.obj" \ "..\..\Release\ApacheCore.lib" @@ -143,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_usertrack.idb" -@erase "$(INTDIR)\mod_usertrack.obj" + -@erase "$(INTDIR)\mod_usertrack_src.idb" + -@erase "$(INTDIR)\mod_usertrack_src.pdb" -@erase "$(OUTDIR)\mod_usertrack.exp" -@erase "$(OUTDIR)\mod_usertrack.lib" - -@erase "$(OUTDIR)\mod_usertrack.map" -@erase "$(OUTDIR)\mod_usertrack.pdb" -@erase "$(OUTDIR)\mod_usertrack.so" @@ -155,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_usertrack" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_usertrack_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -199,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_usertrack.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_usertrack.pdb" /map:"$(INTDIR)\mod_usertrack.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_usertrack.so"\ - /implib:"$(OUTDIR)\mod_usertrack.lib" /base:@"BaseAddr.ref",mod_usertrack +LINK32_FLAGS=kernel32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_usertrack.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_usertrack.so" /implib:"$(OUTDIR)\mod_usertrack.lib" /base:@"BaseAddr.ref",mod_usertrack LINK32_OBJS= \ "$(INTDIR)\mod_usertrack.obj" \ "..\..\Debug\ApacheCore.lib" @@ -215,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_usertrack - Win32 Release" || "$(CFG)" ==\ - "mod_usertrack - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_usertrack.dep") +!INCLUDE "mod_usertrack.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_usertrack.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_usertrack - Win32 Release" || "$(CFG)" == "mod_usertrack - Win32 Debug" !IF "$(CFG)" == "mod_usertrack - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug" @@ -241,35 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_usertrack.c -DEP_CPP_MOD_U=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_U=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" +"$(INTDIR)\mod_usertrack.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/usr.sbin/httpd/src/os/win32/mod_vhost_alias.dep b/usr.sbin/httpd/src/os/win32/mod_vhost_alias.dep new file mode 100644 index 00000000000..e4c3465afc1 --- /dev/null +++ b/usr.sbin/httpd/src/os/win32/mod_vhost_alias.dep @@ -0,0 +1,18 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_vhost_alias.mak + +..\..\modules\standard\mod_vhost_alias.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/usr.sbin/httpd/src/os/win32/mod_vhost_alias.dsp b/usr.sbin/httpd/src/os/win32/mod_vhost_alias.dsp index 769306ca5ae..671928a1304 100644 --- a/usr.sbin/httpd/src/os/win32/mod_vhost_alias.dsp +++ b/usr.sbin/httpd/src/os/win32/mod_vhost_alias.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_vhost_alias" /FD /c +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_vhost_alias_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -52,8 +52,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_vhost_alias.so" /base:@"BaseAddr.ref",mod_vhost_alias -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_vhost_alias.so" /base:@"BaseAddr.ref",mod_vhost_alias +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_vhost_alias.so" /base:@"BaseAddr.ref",mod_vhost_alias /opt:ref +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_vhost_alias.so" /base:@"BaseAddr.ref",mod_vhost_alias /opt:ref !ELSEIF "$(CFG)" == "mod_vhost_alias - Win32 Debug" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_vhost_alias" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_vhost_alias_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_vhost_alias.so" /base:@"BaseAddr.ref",mod_vhost_alias -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_vhost_alias.so" /base:@"BaseAddr.ref",mod_vhost_alias +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_vhost_alias.so" /base:@"BaseAddr.ref",mod_vhost_alias +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_vhost_alias.so" /base:@"BaseAddr.ref",mod_vhost_alias !ENDIF diff --git a/usr.sbin/httpd/src/os/win32/mod_vhost_alias.mak b/usr.sbin/httpd/src/os/win32/mod_vhost_alias.mak index 73f6cd63349..c6b47f55d7e 100644 --- a/usr.sbin/httpd/src/os/win32/mod_vhost_alias.mak +++ b/usr.sbin/httpd/src/os/win32/mod_vhost_alias.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on mod_vhost_alias.dsp !IF "$(CFG)" == "" CFG=mod_vhost_alias - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_vhost_alias - Win32\ - Release. +!MESSAGE No configuration specified. Defaulting to mod_vhost_alias - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_vhost_alias - Win32 Release" && "$(CFG)" !=\ - "mod_vhost_alias - Win32 Debug" +!IF "$(CFG)" != "mod_vhost_alias - Win32 Release" && "$(CFG)" != "mod_vhost_alias - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=mod_vhost_alias - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_vhost_alias - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_vhost_alias - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_vhost_alias - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_vhost_alias - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -52,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_vhost_alias.idb" -@erase "$(INTDIR)\mod_vhost_alias.obj" + -@erase "$(INTDIR)\mod_vhost_alias_src.idb" + -@erase "$(INTDIR)\mod_vhost_alias_src.pdb" -@erase "$(OUTDIR)\mod_vhost_alias.exp" -@erase "$(OUTDIR)\mod_vhost_alias.lib" - -@erase "$(OUTDIR)\mod_vhost_alias.map" + -@erase "$(OUTDIR)\mod_vhost_alias.pdb" -@erase "$(OUTDIR)\mod_vhost_alias.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_vhost_alias" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_vhost_alias_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -107,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_vhost_alias.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_vhost_alias.pdb" /map:"$(INTDIR)\mod_vhost_alias.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_vhost_alias.so"\ - /implib:"$(OUTDIR)\mod_vhost_alias.lib" /base:@"BaseAddr.ref",mod_vhost_alias +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_vhost_alias.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_vhost_alias.so" /implib:"$(OUTDIR)\mod_vhost_alias.lib" /base:@"BaseAddr.ref",mod_vhost_alias /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_vhost_alias.obj" \ "..\..\Release\ApacheCore.lib" @@ -143,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_vhost_alias.idb" -@erase "$(INTDIR)\mod_vhost_alias.obj" + -@erase "$(INTDIR)\mod_vhost_alias_src.idb" + -@erase "$(INTDIR)\mod_vhost_alias_src.pdb" -@erase "$(OUTDIR)\mod_vhost_alias.exp" -@erase "$(OUTDIR)\mod_vhost_alias.lib" - -@erase "$(OUTDIR)\mod_vhost_alias.map" -@erase "$(OUTDIR)\mod_vhost_alias.pdb" -@erase "$(OUTDIR)\mod_vhost_alias.so" @@ -155,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_vhost_alias" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_vhost_alias_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -199,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_vhost_alias.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_vhost_alias.pdb" /map:"$(INTDIR)\mod_vhost_alias.map"\ - /debug /machine:I386 /out:"$(OUTDIR)\mod_vhost_alias.so"\ - /implib:"$(OUTDIR)\mod_vhost_alias.lib" /base:@"BaseAddr.ref",mod_vhost_alias +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_vhost_alias.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_vhost_alias.so" /implib:"$(OUTDIR)\mod_vhost_alias.lib" /base:@"BaseAddr.ref",mod_vhost_alias LINK32_OBJS= \ "$(INTDIR)\mod_vhost_alias.obj" \ "..\..\Debug\ApacheCore.lib" @@ -215,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_vhost_alias - Win32 Release" || "$(CFG)" ==\ - "mod_vhost_alias - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_vhost_alias.dep") +!INCLUDE "mod_vhost_alias.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_vhost_alias.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_vhost_alias - Win32 Release" || "$(CFG)" == "mod_vhost_alias - Win32 Debug" !IF "$(CFG)" == "mod_vhost_alias - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_vhost_alias - Win32 Debug" @@ -241,35 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_vhost_alias.c -DEP_CPP_MOD_V=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_V=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_vhost_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_V) "$(INTDIR)" +"$(INTDIR)\mod_vhost_alias.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/usr.sbin/httpd/src/regex/regex.dep b/usr.sbin/httpd/src/regex/regex.dep new file mode 100644 index 00000000000..44b3604f9f5 --- /dev/null +++ b/usr.sbin/httpd/src/regex/regex.dep @@ -0,0 +1,32 @@ +# Microsoft Developer Studio Generated Dependency File, included by regex.mak + +.\regcomp.c : \ + "..\include\ap_ctype.h"\ + "..\include\hsregex.h"\ + ".\cclass.h"\ + ".\cname.h"\ + ".\regcomp.ih"\ + ".\regex2.h"\ + ".\utils.h"\ + + +.\regerror.c : \ + "..\include\hsregex.h"\ + ".\regerror.ih"\ + ".\utils.h"\ + + +.\regexec.c : \ + "..\include\ap_ctype.h"\ + "..\include\hsregex.h"\ + ".\engine.c"\ + ".\engine.ih"\ + ".\regex2.h"\ + ".\utils.h"\ + + +.\regfree.c : \ + "..\include\hsregex.h"\ + ".\regex2.h"\ + ".\utils.h"\ + diff --git a/usr.sbin/httpd/src/support/htdigest.dep b/usr.sbin/httpd/src/support/htdigest.dep new file mode 100644 index 00000000000..3c43702206c --- /dev/null +++ b/usr.sbin/httpd/src/support/htdigest.dep @@ -0,0 +1,46 @@ +# Microsoft Developer Studio Generated Dependency File, included by htdigest.mak + +..\ap\ap_cpystrn.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + + +..\ap\ap_getpass.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +..\ap\ap_md5c.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_md5.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +.\htdigest.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_md5.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + diff --git a/usr.sbin/httpd/src/support/htpasswd.dep b/usr.sbin/httpd/src/support/htpasswd.dep new file mode 100644 index 00000000000..6cae9958c12 --- /dev/null +++ b/usr.sbin/httpd/src/support/htpasswd.dep @@ -0,0 +1,95 @@ +# Microsoft Developer Studio Generated Dependency File, included by htpasswd.mak + +..\ap\ap_base64.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +..\ap\ap_checkpass.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_md5.h"\ + "..\include\ap_mmn.h"\ + "..\include\ap_sha1.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +..\ap\ap_cpystrn.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + + +..\ap\ap_getpass.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +..\ap\ap_md5c.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_md5.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +..\ap\ap_sha1.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\ap_sha1.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +..\ap\ap_snprintf.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + + +.\htpasswd.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_md5.h"\ + "..\include\ap_mmn.h"\ + "..\include\ap_sha1.h"\ + "..\include\hsregex.h"\ + "..\os\win32\getopt.h"\ + "..\os\win32\os.h"\ + diff --git a/usr.sbin/httpd/src/support/logresolve.dep b/usr.sbin/httpd/src/support/logresolve.dep new file mode 100644 index 00000000000..0480fc716d8 --- /dev/null +++ b/usr.sbin/httpd/src/support/logresolve.dep @@ -0,0 +1,9 @@ +# Microsoft Developer Studio Generated Dependency File, included by logresolve.mak + +.\logresolve.c : \ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + diff --git a/usr.sbin/httpd/src/support/rotatelogs.dep b/usr.sbin/httpd/src/support/rotatelogs.dep new file mode 100644 index 00000000000..f3b04c0656e --- /dev/null +++ b/usr.sbin/httpd/src/support/rotatelogs.dep @@ -0,0 +1,43 @@ +# Microsoft Developer Studio Generated Dependency File, included by rotatelogs.mak + +..\ap\ap_cpystrn.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + + +..\ap\ap_snprintf.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + + +..\os\win32\os.c : \ + "..\os\win32\os.h"\ + + +.\rotatelogs.c : \ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + |