cvs commit: apachen/src Makefile.nt

[Ben Laurie]

ben 97/08/16 07:24:03

  Modified:src  Makefile.nt
  Log:
  Something Bad happened to this file during the reshuffle. Made Good again.
  
  Revision  ChangesPath
  1.12  +102 -99   apachen/src/Makefile.nt
  
  Index: Makefile.nt
  ===
  RCS file: /export/home/cvs/apachen/src/Makefile.nt,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Makefile.nt   1997/08/13 08:37:14 1.11
  +++ Makefile.nt   1997/08/16 14:24:02 1.12
  @@ -1,99 +1,102 @@
  -# Makefile for NT
  -# Note that this doesn't quite work... apache.exe doesn't depend on proxy.lib
  -# or regex.lib. Nor can it, without some messing about - the debug and 
release
  -# versions need different dependencies, and that isn't an option.
  -# One way that occurs to me to solve the problem is to have the proxy and
  -# regex makes delete the appropriate apache.exe. Tacky, but it'll work!
  -# Ben, 5 July 97
  -
  -_apacher:
  -cd regex  set CFG=regex - Win32 Release nmake /nologo -f regex.mak
  - cd .  set CFG=ApacheCore - Win32 Release nmake /nologo -f 
ApacheCore.mak
  - cd .  set CFG=Apache - Win32 Release nmake /nologo -f Apache.mak
  - cd os\win32  set CFG=ApacheModuleStatus - Win32 Release nmake /nologo 
-f ApacheModuleStatus.mak
  -#   cd os\win32  set CFG=ApacheModuleInfo - Win32 Release nmake 
/nologo -f ApacheModuleInfo.mak
  - cd os\win32  set CFG=ApacheModuleAuthAnon - Win32 Release nmake 
/nologo -f ApacheModuleAuthAnon.mak
  - cd os\win32  set CFG=ApacheModuleDigest - Win32 Release nmake /nologo 
-f ApacheModuleDigest.mak
  - cd os\win32  set CFG=ApacheModuleCERNMeta - Win32 Release nmake 
/nologo -f ApacheModuleCERNMeta.mak
  - cd os\win32  set CFG=ApacheModuleExpires - Win32 Release nmake 
/nologo -f ApacheModuleExpires.mak
  - cd os\win32  set CFG=ApacheModuleHeaders - Win32 Release nmake 
/nologo -f ApacheModuleHeaders.mak
  - cd os\win32  set CFG=ApacheModuleUserTrack - Win32 Release nmake 
/nologo -f ApacheModuleUserTrack.mak
  - cd modules\proxy  set CFG=ApacheModuleProxy - Win32 Release nmake 
/nologo -f ApacheModuleProxy.mak
  -
  -_apached:
  -cd regex  set CFG=regex - Win32 Debug nmake /nologo -f regex.mak
  - cd .  set CFG=ApacheCore - Win32 Debug nmake /nologo -f ApacheCore.mak
  - cd .  set CFG=Apache - Win32 Debug nmake /nologo -f Apache.mak
  - cd os\win32  set CFG=ApacheModuleStatus - Win32 Debug nmake /nologo 
-f ApacheModuleStatus.mak
  -#   cd os\win32  set CFG=ApacheModuleInfo - Win32 Debug nmake /nologo 
-f ApacheModuleInfo.mak
  - cd os\win32  set CFG=ApacheModuleAuthAnon - Win32 Debug nmake /nologo 
-f ApacheModuleAuthAnon.mak
  - cd os\win32  set CFG=ApacheModuleDigest - Win32 Debug nmake /nologo 
-f ApacheModuleDigest.mak
  - cd os\win32  set CFG=ApacheModuleCERNMeta - Win32 Debug nmake /nologo 
-f ApacheModuleCERNMeta.mak
  - cd os\win32  set CFG=ApacheModuleExpires - Win32 Debug nmake /nologo 
-f ApacheModuleExpires.mak
  - cd os\win32  set CFG=ApacheModuleHeaders - Win32 Debug nmake /nologo 
-f ApacheModuleHeaders.mak
  - cd os\win32  set CFG=ApacheModuleUserTrack - Win32 Debug nmake 
/nologo -f ApacheModuleUserTrack.mak
  - cd modules\proxy  set CFG=ApacheModuleProxy - Win32 Debug nmake 
/nologo -f ApacheModuleProxy.mak
  -
  -installr: apacher
  - -mkdir \Apache
  - -mkdir \Apache\modules
  - -mkdir \Apache\logs
  - -mkdir \Apache\conf
  - copy ApacheR\Apache.exe \Apache
  - copy CoreR\ApacheCore.dll \Apache
  - copy nt\ApacheModuleStatusR\ApacheModuleStatus.dll \Apache\modules
  -#   copy nt\ApacheModuleInfoR\ApacheModuleInfo.dll \Apache\modules
  - copy nt\ApacheModuleAuthAnonR\ApacheModuleAuthAnon.dll \Apache\modules
  - copy nt\ApacheModuleDigestR\ApacheModuleDigest.dll \Apache\modules
  - copy nt\ApacheModuleCERNMetaR\ApacheModuleCERNMeta.dll \Apache\modules
  - copy nt\ApacheModuleExpiresR\ApacheModuleExpires.dll \Apache\modules
  - copy nt\ApacheModuleHeadersR\ApacheModuleHeaders.dll \Apache\modules
  - copy nt\ApacheModuleUserTrackR\ApacheModuleUserTrack.dll \Apache\modules
  - copy modules\proxy\Release\ApacheModuleProxy.dll \Apache\modules
  -
  -installd: apached
  - -mkdir \Apache
  - -mkdir \Apache\modules
  - -mkdir \Apache\logs
  - -mkdir \Apache\conf
  - copy ApacheD\Apache.exe \Apache
  - copy CoreD\ApacheCore.dll \Apache
  - copy nt\ApacheModuleStatusD\ApacheModuleStatus.dll \Apache\modules
  -#   copy nt\ApacheModuleInfoD\ApacheModuleInfo.dll \Apache\modules
  - copy nt\ApacheModuleAuthAnonD\ApacheModuleAuthAnon.dll \Apache\modules
  - copy nt\ApacheModuleDigestD\ApacheModuleDigest.dll \Apache\modules
  - copy nt\ApacheModuleCERNMetaD\ApacheModuleCERNMeta.dll \Apache\modules
  - copy nt\ApacheModuleExpiresD\ApacheModuleExpires.dll \Apache\modules
  - 

cvs commit: apachen/src/modules/proxy proxy_ftp.c

[Ben Laurie]

ben 97/08/16 07:38:25

  Modified:src/modules/proxy proxy_ftp.c
  Log:
  Life is easier if we don't have to have a pile of include paths used for a 
single include. Plus, then it compiles on NT.
  
  Revision  ChangesPath
  1.34  +1 -1  apachen/src/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- proxy_ftp.c   1997/08/15 18:30:10 1.33
  +++ proxy_ftp.c   1997/08/16 14:38:25 1.34
  @@ -54,7 +54,7 @@
   
   #include mod_proxy.h
   #include http_main.h
  -#include mod_mime.h
  +#include ../standard/mod_mime.h
   
   /*
* Decodes a '%' escaped string, and returns the number of characters
  
  
  

cvs commit: apachen/src/modules/proxy Makefile

[Roy Fielding]

fielding97/08/16 12:26:00

  Modified:src/modules/proxy Makefile
  Log:
  Ben says to just hardcode the include path for mod_mime.h  [NT sucks]
  
  Revision  ChangesPath
  1.14  +2 -3  apachen/src/modules/proxy/Makefile
  
  Index: Makefile
  ===
  RCS file: /export/home/cvs/apachen/src/modules/proxy/Makefile,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Makefile  1997/08/15 18:30:10 1.13
  +++ Makefile  1997/08/16 19:25:59 1.14
  @@ -54,12 +54,11 @@
   SHELL = /bin/sh
   
   INCDIR = ../../core
  -MODDIR = ../../modules/standard
   
   LIB=libproxy.a
   
   # AUX_CFLAGS comes from higher level Makefile
  -CFLAGS=-I$(INCDIR) -I$(MODDIR) $(AUX_CFLAGS)
  +CFLAGS=-I$(INCDIR) $(AUX_CFLAGS)
   
   # Internal stuff, should not need changing.
   PROXYSRC=mod_proxy.c proxy_cache.c proxy_connect.c proxy_ftp.c proxy_http.c \
  @@ -88,4 +87,4 @@
   proxy_cache.o proxy_connect.o proxy_http.o: $(INCDIR)/http_log.h
   proxy_cache.o proxy_http.o: $(INCDIR)/util_date.h
   proxy_cache.o proxy_util.o: $(INCDIR)/md5.h
  -proxy_ftp.o: $(INCDIR)/http_main.h $(MODDIR)/mod_mime.h
  +proxy_ftp.o: $(INCDIR)/http_main.h ../standard/mod_mime.h