ben 97/07/20 08:30:04
Modified: src Apache.dsp Apache.mak ApacheCore.dsp ApacheCore.mak Makefile.nt src/nt ApacheModuleCERNMeta.mak Log: More Win32 stuff. Revision Changes Path 1.2 +2 -2 apache/src/Apache.dsp Index: Apache.dsp =================================================================== RCS file: /export/home/cvs/apache/src/Apache.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C3 -r1.1 -r1.2 *** Apache.dsp 1997/07/20 12:31:09 1.1 --- Apache.dsp 1997/07/20 15:30:00 1.2 *************** *** 36,43 **** # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir ".\LaunchR" ! # PROP Intermediate_Dir ".\LaunchR" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c # ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c --- 36,43 ---- # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir ".\ApacheR" ! # PROP Intermediate_Dir ".\ApacheR" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c # ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c 1.3 +4 -4 apache/src/Apache.mak Index: Apache.mak =================================================================== RCS file: /export/home/cvs/apache/src/Apache.mak,v retrieving revision 1.2 retrieving revision 1.3 diff -C3 -r1.2 -r1.3 *** Apache.mak 1997/07/20 15:05:10 1.2 --- Apache.mak 1997/07/20 15:30:00 1.3 *************** *** 30,39 **** !IF "$(CFG)" == "Apache - Win32 Release" ! OUTDIR=.\LaunchR ! INTDIR=.\LaunchR # Begin Custom Macros ! OutDir=.\.\LaunchR # End Custom Macros !IF "$(RECURSE)" == "0" --- 30,39 ---- !IF "$(CFG)" == "Apache - Win32 Release" ! OUTDIR=.\ApacheR ! INTDIR=.\ApacheR # Begin Custom Macros ! OutDir=.\.\ApacheR # End Custom Macros !IF "$(RECURSE)" == "0" *************** *** 56,62 **** CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)\Apache.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! CPP_OBJS=.\LaunchR/ CPP_SBRS=. BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" --- 56,62 ---- CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\ /Fp"$(INTDIR)\Apache.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c ! CPP_OBJS=.\ApacheR/ CPP_SBRS=. BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" 1.2 +3 -1 apache/src/ApacheCore.dsp Index: ApacheCore.dsp =================================================================== RCS file: /export/home/cvs/apache/src/ApacheCore.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C3 -r1.1 -r1.2 *** ApacheCore.dsp 1997/07/20 12:31:10 1.1 --- ApacheCore.dsp 1997/07/20 15:30:00 1.2 *************** *** 41,46 **** --- 41,47 ---- # PROP Use_Debug_Libraries 0 # PROP Output_Dir ".\CoreR" # PROP Intermediate_Dir ".\CoreR" + # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c # ADD CPP /nologo /MD /W3 /GX /O2 /I ".\regex" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c *************** *** 53,59 **** # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /machine:I386 !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" --- 54,60 ---- # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 ! # ADD LINK32 regex\release\regex.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /machine:I386 !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" *************** *** 66,71 **** --- 67,73 ---- # PROP Use_Debug_Libraries 1 # PROP Output_Dir ".\CoreD" # PROP Intermediate_Dir ".\CoreD" + # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c 1.8 +9 -179 apache/src/ApacheCore.mak Index: ApacheCore.mak =================================================================== RCS file: /export/home/cvs/apache/src/ApacheCore.mak,v retrieving revision 1.7 retrieving revision 1.8 diff -C3 -r1.7 -r1.8 *** ApacheCore.mak 1997/07/20 12:31:10 1.7 --- ApacheCore.mak 1997/07/20 15:30:01 1.8 *************** *** 109,119 **** BSC32_SBRS= \ LINK32=link.exe ! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ ! advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\ ! odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:no\ ! /pdb:"$(OUTDIR)\ApacheCore.pdb" /machine:I386 /def:".\ApacheCore.def"\ ! /out:"$(OUTDIR)\ApacheCore.dll" /implib:"$(OUTDIR)\ApacheCore.lib" DEF_FILE= \ ".\ApacheCore.def" LINK32_OBJS= \ --- 109,120 ---- BSC32_SBRS= \ LINK32=link.exe ! LINK32_FLAGS=regex\release\regex.lib kernel32.lib user32.lib gdi32.lib\ ! winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\ ! uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll\ ! /incremental:no /pdb:"$(OUTDIR)\ApacheCore.pdb" /machine:I386\ ! /def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll"\ ! /implib:"$(OUTDIR)\ApacheCore.lib" DEF_FILE= \ ".\ApacheCore.def" LINK32_OBJS= \ *************** *** 427,437 **** ".\multithread.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_ALLOC=\ - ".\sfio.h"\ "$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)" --- 428,433 ---- *************** *** 467,477 **** ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_BUFF_=\ - ".\sfio.h"\ "$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)" --- 463,468 ---- *************** *** 544,554 **** ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_HTTP_=\ - ".\sfio.h"\ "$(INTDIR)\http_bprintf.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)" --- 535,540 ---- *************** *** 588,598 **** ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_HTTP_C=\ - ".\sfio.h"\ "$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)" --- 574,579 ---- *************** *** 642,652 **** ".\rfc1413.h"\ ".\scoreboard.h"\ ".\util_md5.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_HTTP_CO=\ - ".\sfio.h"\ "$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)" --- 623,628 ---- *************** *** 693,703 **** ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_HTTP_L=\ - ".\sfio.h"\ "$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" --- 669,674 ---- *************** *** 746,756 **** ".\nt\service.h"\ ".\regex\regex.h"\ ".\scoreboard.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_HTTP_M=\ - ".\sfio.h"\ "$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)" --- 717,722 ---- *************** *** 802,812 **** ".\nt\readdir.h"\ ".\regex\regex.h"\ ".\util_date.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_HTTP_P=\ - ".\sfio.h"\ "$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)" --- 768,773 ---- *************** *** 853,863 **** ".\nt\readdir.h"\ ".\regex\regex.h"\ ".\scoreboard.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_HTTP_R=\ - ".\sfio.h"\ "$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)" --- 814,819 ---- *************** *** 895,902 **** ".\conf.h"\ ".\md5.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ "$(INTDIR)\md5c.obj" : $(SOURCE) $(DEP_CPP_MD5C_) "$(INTDIR)" --- 851,856 ---- *************** *** 931,941 **** ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_A=\ - ".\sfio.h"\ "$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" --- 885,890 ---- *************** *** 980,990 **** ".\nt\readdir.h"\ ".\regex\regex.h"\ ".\util_script.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_AC=\ - ".\sfio.h"\ "$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)" --- 929,934 ---- *************** *** 1026,1036 **** ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_AL=\ - ".\sfio.h"\ "$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)" --- 970,975 ---- *************** *** 1071,1081 **** ".\nt\readdir.h"\ ".\regex\regex.h"\ ".\util_script.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_AS=\ - ".\sfio.h"\ "$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)" --- 1010,1015 ---- *************** *** 1119,1129 **** ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_AU=\ - ".\sfio.h"\ "$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)" --- 1053,1058 ---- *************** *** 1168,1178 **** ".\nt\readdir.h"\ ".\regex\regex.h"\ ".\util_script.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_AUT=\ - ".\sfio.h"\ "$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)" --- 1097,1102 ---- *************** *** 1214,1224 **** ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_B=\ - ".\sfio.h"\ "$(INTDIR)\mod_browser.obj" : $(SOURCE) $(DEP_CPP_MOD_B) "$(INTDIR)" --- 1138,1143 ---- *************** *** 1261,1271 **** ".\nt\readdir.h"\ ".\regex\regex.h"\ ".\util_script.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_C=\ - ".\sfio.h"\ "$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" --- 1180,1185 ---- *************** *** 1314,1324 **** ".\nt\readdir.h"\ ".\regex\regex.h"\ ".\util_script.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_D=\ - ".\sfio.h"\ "$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" --- 1228,1233 ---- *************** *** 1360,1370 **** ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_DL=\ - ".\sfio.h"\ "$(INTDIR)\mod_dll.obj" : $(SOURCE) $(DEP_CPP_MOD_DL) "$(INTDIR)" --- 1269,1274 ---- *************** *** 1402,1412 **** ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_E=\ - ".\sfio.h"\ "$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" --- 1306,1311 ---- *************** *** 1448,1458 **** ".\nt\readdir.h"\ ".\regex\regex.h"\ ".\util_script.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_I=\ - ".\sfio.h"\ "$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" --- 1347,1352 ---- *************** *** 1500,1512 **** ".\nt\readdir.h"\ ".\regex\regex.h"\ ".\util_script.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_IN=\ - ".\config.h"\ - ".\modules\perl\mod_perl.h"\ - ".\sfio.h"\ "$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)" --- 1394,1399 ---- *************** *** 1549,1559 **** ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_L=\ - ".\sfio.h"\ "$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)" --- 1436,1441 ---- *************** *** 1591,1601 **** ".\mod_mime.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_M=\ - ".\sfio.h"\ "$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" --- 1473,1478 ---- *************** *** 1636,1646 **** ".\nt\readdir.h"\ ".\regex\regex.h"\ ".\util_script.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_N=\ - ".\sfio.h"\ "$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)" --- 1513,1518 ---- *************** *** 1680,1690 **** ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MOD_U=\ - ".\sfio.h"\ "$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" --- 1552,1557 ---- *************** *** 1720,1730 **** ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_MODUL=\ - ".\sfio.h"\ "$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)" --- 1587,1592 ---- *************** *** 1758,1765 **** ".\conf.h"\ ".\multithread.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ "$(INTDIR)\multithread.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)" --- 1620,1625 ---- *************** *** 1782,1804 **** !ENDIF SOURCE=.\nt\readdir.c - - !IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_READD=\ ".\nt\readdir.h"\ - {$(INCLUDE)}"sys\types.h"\ "$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - DEP_CPP_READD=\ - ".\nt\readdir.h"\ - "$(INTDIR)\readdir.obj" "$(INTDIR)\readdir.sbr" : $(SOURCE) $(DEP_CPP_READD)\ "$(INTDIR)" --- 1642,1660 ---- !ENDIF SOURCE=.\nt\readdir.c DEP_CPP_READD=\ ".\nt\readdir.h"\ + !IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" "$(INTDIR)\readdir.obj" "$(INTDIR)\readdir.sbr" : $(SOURCE) $(DEP_CPP_READD)\ "$(INTDIR)" *************** *** 1821,1831 **** ".\nt\readdir.h"\ ".\regex\regex.h"\ ".\rfc1413.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_RFC14=\ - ".\sfio.h"\ "$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)" --- 1677,1682 ---- *************** *** 1860,1867 **** ".\multithread.h"\ ".\nt\service.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ "$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)" --- 1711,1716 ---- *************** *** 1896,1906 **** ".\httpd.h"\ ".\nt\readdir.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_UTIL_=\ - ".\sfio.h"\ "$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)" --- 1745,1750 ---- *************** *** 1932,1939 **** ".\conf.h"\ ".\regex\regex.h"\ ".\util_date.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ "$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)" --- 1776,1781 ---- *************** *** 1966,1976 **** ".\nt\readdir.h"\ ".\regex\regex.h"\ ".\util_md5.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_UTIL_M=\ - ".\sfio.h"\ "$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)" --- 1808,1813 ---- *************** *** 2014,2024 **** ".\nt\readdir.h"\ ".\regex\regex.h"\ ".\util_script.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - - NODEP_CPP_UTIL_S=\ - ".\sfio.h"\ "$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)" --- 1851,1856 ---- *************** *** 2056,2063 **** DEP_CPP_UTIL_SN=\ ".\conf.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ "$(INTDIR)\util_snprintf.obj" : $(SOURCE) $(DEP_CPP_UTIL_SN) "$(INTDIR)" --- 1888,1893 ---- 1.6 +58 -0 apache/src/Makefile.nt Index: Makefile.nt =================================================================== RCS file: /export/home/cvs/apache/src/Makefile.nt,v retrieving revision 1.5 retrieving revision 1.6 diff -C3 -r1.5 -r1.6 *** Makefile.nt 1997/07/19 20:16:12 1.5 --- Makefile.nt 1997/07/20 15:30:02 1.6 *************** *** 6,11 **** --- 6,25 ---- # regex makes delete the appropriate apache.exe. Tacky, but it'll work! # Ben, 5 July 97 + _release: + 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 nt & set CFG=ApacheModuleStatus - Win32 Release& nmake /nologo -f ApacheModuleStatus.mak + # cd nt & set CFG=ApacheModuleInfo - Win32 Release& nmake /nologo -f ApacheModuleInfo.mak + cd nt & set CFG=ApacheModuleAuthAnon - Win32 Release& nmake /nologo -f ApacheModuleAuthAnon.mak + cd nt & set CFG=ApacheModuleDigest - Win32 Release& nmake /nologo -f ApacheModuleDigest.mak + cd nt & set CFG=ApacheModuleCERNMeta - Win32 Release& nmake /nologo -f ApacheModuleCERNMeta.mak + cd nt & set CFG=ApacheModuleExpires - Win32 Release& nmake /nologo -f ApacheModuleExpires.mak + cd nt & set CFG=ApacheModuleHeaders - Win32 Release& nmake /nologo -f ApacheModuleHeaders.mak + cd nt & set CFG=ApacheModuleUserTrack - Win32 Release& nmake /nologo -f ApacheModuleUserTrack.mak + cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Release& nmake /nologo -f ApacheModuleProxy.mak + _debug: cd regex & set CFG=regex - Win32 Debug& nmake /nologo -f regex.mak cd . & set CFG=ApacheCore - Win32 Debug& nmake /nologo -f ApacheCore.mak *************** *** 20,25 **** --- 34,53 ---- cd nt & set CFG=ApacheModuleUserTrack - Win32 Debug& nmake /nologo -f ApacheModuleUserTrack.mak cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Debug& nmake /nologo -f ApacheModuleProxy.mak + installr: _release + -mkdir \Apache + -mkdir \Apache\modules + 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: _debug -mkdir \Apache *************** *** 35,37 **** --- 63,95 ---- copy nt\ApacheModuleHeadersD\ApacheModuleHeaders.dll \Apache\modules copy nt\ApacheModuleUserTrackD\ApacheModuleUserTrack.dll \Apache\modules copy modules\proxy\Debug\ApacheModuleProxy.dll \Apache\modules + + cleanr: + cd regex & set CFG=regex - Win32 Release& nmake /nologo -f regex.mak clean + cd . & set CFG=ApacheCore - Win32 Release& nmake /nologo -f ApacheCore.mak clean + cd . & set CFG=Apache - Win32 Release& nmake /nologo -f Apache.mak clean + cd nt & set CFG=ApacheModuleStatus - Win32 Release& nmake /nologo -f ApacheModuleStatus.mak clean + # cd nt & set CFG=ApacheModuleInfo - Win32 Release& nmake /nologo -f ApacheModuleInfo.mak clean + cd nt & set CFG=ApacheModuleAuthAnon - Win32 Release& nmake /nologo -f ApacheModuleAuthAnon.mak clean + cd nt & set CFG=ApacheModuleDigest - Win32 Release& nmake /nologo -f ApacheModuleDigest.mak clean + cd nt & set CFG=ApacheModuleCERNMeta - Win32 Release& nmake /nologo -f ApacheModuleCERNMeta.mak clean + cd nt & set CFG=ApacheModuleExpires - Win32 Release& nmake /nologo -f ApacheModuleExpires.mak clean + cd nt & set CFG=ApacheModuleHeaders - Win32 Release& nmake /nologo -f ApacheModuleHeaders.mak clean + cd nt & set CFG=ApacheModuleUserTrack - Win32 Release& nmake /nologo -f ApacheModuleUserTrack.mak clean + cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Release& nmake /nologo -f ApacheModuleProxy.mak clean + + cleand: + cd regex & set CFG=regex - Win32 Debug& nmake /nologo -f regex.mak clean + cd . & set CFG=ApacheCore - Win32 Debug& nmake /nologo -f ApacheCore.mak clean + cd . & set CFG=Apache - Win32 Debug& nmake /nologo -f Apache.mak clean + cd nt & set CFG=ApacheModuleStatus - Win32 Debug& nmake /nologo -f ApacheModuleStatus.mak clean + # cd nt & set CFG=ApacheModuleInfo - Win32 Debug& nmake /nologo -f ApacheModuleInfo.mak clean + cd nt & set CFG=ApacheModuleAuthAnon - Win32 Debug& nmake /nologo -f ApacheModuleAuthAnon.mak clean + cd nt & set CFG=ApacheModuleDigest - Win32 Debug& nmake /nologo -f ApacheModuleDigest.mak clean + cd nt & set CFG=ApacheModuleCERNMeta - Win32 Debug& nmake /nologo -f ApacheModuleCERNMeta.mak clean + cd nt & set CFG=ApacheModuleExpires - Win32 Debug& nmake /nologo -f ApacheModuleExpires.mak clean + cd nt & set CFG=ApacheModuleHeaders - Win32 Debug& nmake /nologo -f ApacheModuleHeaders.mak clean + cd nt & set CFG=ApacheModuleUserTrack - Win32 Debug& nmake /nologo -f ApacheModuleUserTrack.mak clean + cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Debug& nmake /nologo -f ApacheModuleProxy.mak clean + + clean: cleand cleanr 1.3 +83 -135 apache/src/nt/ApacheModuleCERNMeta.mak Index: ApacheModuleCERNMeta.mak =================================================================== RCS file: /export/home/cvs/apache/src/nt/ApacheModuleCERNMeta.mak,v retrieving revision 1.2 retrieving revision 1.3 diff -C3 -r1.2 -r1.3 *** ApacheModuleCERNMeta.mak 1997/07/18 19:49:29 1.2 --- ApacheModuleCERNMeta.mak 1997/07/20 15:30:04 1.3 *************** *** 1,22 **** ! # Microsoft Developer Studio Generated NMAKE File, Format Version 4.20 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! !IF "$(CFG)" == "" ! CFG=ApacheModuleCERNMeta - Win32 Debug ! !MESSAGE No configuration specified. Defaulting to ApacheModuleCERNMeta -\ ! Win32 Debug. !ENDIF !IF "$(CFG)" != "ApacheModuleCERNMeta - Win32 Release" && "$(CFG)" !=\ "ApacheModuleCERNMeta - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. ! !MESSAGE You can specify a configuration when running NMAKE on this makefile ! !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "ApacheModuleCERNMeta.mak"\ ! CFG="ApacheModuleCERNMeta - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE --- 1,18 ---- ! # Microsoft Developer Studio Generated NMAKE File, Based on ApacheModuleCERNMeta.dsp !IF "$(CFG)" == "" ! CFG=ApacheModuleCERNMeta - Win32 Release ! !MESSAGE No configuration specified. Defaulting to ApacheModuleCERNMeta - Win32\ ! Release. !ENDIF !IF "$(CFG)" != "ApacheModuleCERNMeta - Win32 Release" && "$(CFG)" !=\ "ApacheModuleCERNMeta - 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: !MESSAGE !MESSAGE NMAKE /f "ApacheModuleCERNMeta.mak"\ ! CFG="ApacheModuleCERNMeta - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE *************** *** 33,64 **** !ELSE NULL=nul !ENDIF ! ################################################################################ ! # Begin Project ! # PROP Target_Last_Scanned "ApacheModuleCERNMeta - Win32 Debug" ! MTL=mktyplib.exe ! RSC=rc.exe CPP=cl.exe !IF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release" - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 0 - # PROP BASE Output_Dir "Release" - # PROP BASE Intermediate_Dir "Release" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 0 - # PROP Output_Dir "ApacheModuleCERNMetaR" - # PROP Intermediate_Dir "ApacheModuleCERNMetaR" - # PROP Target_Dir "" OUTDIR=.\ApacheModuleCERNMetaR INTDIR=.\ApacheModuleCERNMetaR ALL : "$(OUTDIR)\ApacheModuleCERNMeta.dll" ! CLEAN : [EMAIL PROTECTED] "$(INTDIR)\mod_cern_meta.obj" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCERNMeta.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCERNMeta.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCERNMeta.lib" --- 29,60 ---- !ELSE NULL=nul !ENDIF ! CPP=cl.exe + MTL=midl.exe + RSC=rc.exe !IF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release" OUTDIR=.\ApacheModuleCERNMetaR INTDIR=.\ApacheModuleCERNMetaR + # Begin Custom Macros + OutDir=.\.\ApacheModuleCERNMetaR + # End Custom Macros + + !IF "$(RECURSE)" == "0" ALL : "$(OUTDIR)\ApacheModuleCERNMeta.dll" ! !ELSE ! ! ALL : "$(OUTDIR)\ApacheModuleCERNMeta.dll" ! ! !ENDIF ! ! CLEAN : [EMAIL PROTECTED] "$(INTDIR)\mod_cern_meta.obj" + [EMAIL PROTECTED] "$(INTDIR)\vc50.idb" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCERNMeta.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCERNMeta.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCERNMeta.lib" *************** *** 66,97 **** "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c - # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D\ ! "_WINDOWS" /Fp"$(INTDIR)/ApacheModuleCERNMeta.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\ApacheModuleCERNMetaR/ ! CPP_SBRS=.\. ! # ADD BASE MTL /nologo /D "NDEBUG" /win32 ! # ADD MTL /nologo /D "NDEBUG" /win32 ! MTL_PROJ=/nologo /D "NDEBUG" /win32 ! # ADD BASE RSC /l 0x809 /d "NDEBUG" ! # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! BSC32_FLAGS=/nologo /o"$(OUTDIR)/ApacheModuleCERNMeta.bsc" BSC32_SBRS= \ LINK32=link.exe - # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 - # ADD LINK32 ..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 LINK32_FLAGS=..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\ uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll\ ! /incremental:no /pdb:"$(OUTDIR)/ApacheModuleCERNMeta.pdb" /machine:I386\ ! /out:"$(OUTDIR)/ApacheModuleCERNMeta.dll"\ ! /implib:"$(OUTDIR)/ApacheModuleCERNMeta.lib" LINK32_OBJS= \ "$(INTDIR)\mod_cern_meta.obj" --- 62,84 ---- "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D\ ! "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleCERNMeta.pch" /YX /Fo"$(INTDIR)\\"\ ! /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\ApacheModuleCERNMetaR/ ! CPP_SBRS=. ! MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 BSC32=bscmake.exe ! BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleCERNMeta.bsc" BSC32_SBRS= \ LINK32=link.exe LINK32_FLAGS=..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\ uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll\ ! /incremental:no /pdb:"$(OUTDIR)\ApacheModuleCERNMeta.pdb" /machine:I386\ ! /out:"$(OUTDIR)\ApacheModuleCERNMeta.dll"\ ! /implib:"$(OUTDIR)\ApacheModuleCERNMeta.lib" LINK32_OBJS= \ "$(INTDIR)\mod_cern_meta.obj" *************** *** 102,126 **** !ELSEIF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug" - # PROP BASE Use_MFC 0 - # PROP BASE Use_Debug_Libraries 1 - # PROP BASE Output_Dir "Debug" - # PROP BASE Intermediate_Dir "Debug" - # PROP BASE Target_Dir "" - # PROP Use_MFC 0 - # PROP Use_Debug_Libraries 1 - # PROP Output_Dir "ApacheModuleCERNMetaD" - # PROP Intermediate_Dir "ApacheModuleCERNMetaD" - # PROP Target_Dir "" OUTDIR=.\ApacheModuleCERNMetaD INTDIR=.\ApacheModuleCERNMetaD ALL : "$(OUTDIR)\ApacheModuleCERNMeta.dll" ! CLEAN : [EMAIL PROTECTED] "$(INTDIR)\mod_cern_meta.obj" ! [EMAIL PROTECTED] "$(INTDIR)\vc40.idb" ! [EMAIL PROTECTED] "$(INTDIR)\vc40.pdb" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCERNMeta.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCERNMeta.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCERNMeta.ilk" --- 89,114 ---- !ELSEIF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug" OUTDIR=.\ApacheModuleCERNMetaD INTDIR=.\ApacheModuleCERNMetaD + # Begin Custom Macros + OutDir=.\.\ApacheModuleCERNMetaD + # End Custom Macros + + !IF "$(RECURSE)" == "0" ALL : "$(OUTDIR)\ApacheModuleCERNMeta.dll" ! !ELSE ! ! ALL : "$(OUTDIR)\ApacheModuleCERNMeta.dll" ! ! !ENDIF ! ! CLEAN : [EMAIL PROTECTED] "$(INTDIR)\mod_cern_meta.obj" ! [EMAIL PROTECTED] "$(INTDIR)\vc50.idb" ! [EMAIL PROTECTED] "$(INTDIR)\vc50.pdb" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCERNMeta.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCERNMeta.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleCERNMeta.ilk" *************** *** 130,162 **** "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c - # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D "_DEBUG"\ ! /D "_WINDOWS" /Fp"$(INTDIR)/ApacheModuleCERNMeta.pch" /YX /Fo"$(INTDIR)/"\ ! /Fd"$(INTDIR)/" /c CPP_OBJS=.\ApacheModuleCERNMetaD/ ! CPP_SBRS=.\. ! # ADD BASE MTL /nologo /D "_DEBUG" /win32 ! # ADD MTL /nologo /D "_DEBUG" /win32 ! MTL_PROJ=/nologo /D "_DEBUG" /win32 ! # ADD BASE RSC /l 0x809 /d "_DEBUG" ! # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! BSC32_FLAGS=/nologo /o"$(OUTDIR)/ApacheModuleCERNMeta.bsc" BSC32_SBRS= \ LINK32=link.exe - # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 - # ADD LINK32 ..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 LINK32_FLAGS=..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\ uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll\ ! /incremental:yes /pdb:"$(OUTDIR)/ApacheModuleCERNMeta.pdb" /debug /machine:I386\ ! /out:"$(OUTDIR)/ApacheModuleCERNMeta.dll"\ ! /implib:"$(OUTDIR)/ApacheModuleCERNMeta.lib" LINK32_OBJS= \ "$(INTDIR)\mod_cern_meta.obj" --- 118,140 ---- "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D "_DEBUG"\ ! /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleCERNMeta.pch" /YX /Fo"$(INTDIR)\\"\ ! /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\ApacheModuleCERNMetaD/ ! CPP_SBRS=. ! MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 BSC32=bscmake.exe ! BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleCERNMeta.bsc" BSC32_SBRS= \ LINK32=link.exe LINK32_FLAGS=..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\ uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll\ ! /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleCERNMeta.pdb" /debug /machine:I386\ ! /out:"$(OUTDIR)\ApacheModuleCERNMeta.dll"\ ! /implib:"$(OUTDIR)\ApacheModuleCERNMeta.lib" LINK32_OBJS= \ "$(INTDIR)\mod_cern_meta.obj" *************** *** 167,209 **** !ENDIF ! .c{$(CPP_OBJS)}.obj: ! $(CPP) $(CPP_PROJ) $< ! ! .cpp{$(CPP_OBJS)}.obj: ! $(CPP) $(CPP_PROJ) $< ! ! .cxx{$(CPP_OBJS)}.obj: ! $(CPP) $(CPP_PROJ) $< ! ! .c{$(CPP_SBRS)}.sbr: ! $(CPP) $(CPP_PROJ) $< ! ! .cpp{$(CPP_SBRS)}.sbr: ! $(CPP) $(CPP_PROJ) $< ! ! .cxx{$(CPP_SBRS)}.sbr: ! $(CPP) $(CPP_PROJ) $< ! ! ################################################################################ ! # Begin Target ! ! # Name "ApacheModuleCERNMeta - Win32 Release" ! # Name "ApacheModuleCERNMeta - Win32 Debug" ! !IF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release" ! !ELSEIF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug" ! !ENDIF ! ################################################################################ ! # Begin Source File ! SOURCE=\work\apache\src\mod_cern_meta.c - !IF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release" DEP_CPP_MOD_C=\ "..\alloc.h"\ "..\buff.h"\ --- 145,184 ---- !ENDIF ! .c{$(CPP_OBJS)}.obj:: ! $(CPP) @<< ! $(CPP_PROJ) $< ! << ! .cpp{$(CPP_OBJS)}.obj:: ! $(CPP) @<< ! $(CPP_PROJ) $< ! << ! .cxx{$(CPP_OBJS)}.obj:: ! $(CPP) @<< ! $(CPP_PROJ) $< ! << ! .c{$(CPP_SBRS)}.sbr:: ! $(CPP) @<< ! $(CPP_PROJ) $< ! << ! .cpp{$(CPP_SBRS)}.sbr:: ! $(CPP) @<< ! $(CPP_PROJ) $< ! << ! .cxx{$(CPP_SBRS)}.sbr:: ! $(CPP) @<< ! $(CPP_PROJ) $< ! << + !IF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release" || "$(CFG)" ==\ + "ApacheModuleCERNMeta - Win32 Debug" + SOURCE=..\mod_cern_meta.c DEP_CPP_MOD_C=\ "..\alloc.h"\ "..\buff.h"\ *************** *** 215,258 **** "..\regex\regex.h"\ "..\util_script.h"\ ".\readdir.h"\ ! {$(INCLUDE)}"\sys\STAT.H"\ ! {$(INCLUDE)}"\sys\TYPES.H"\ NODEP_CPP_MOD_C=\ "..\sfio.h"\ "$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" ! $(CPP) $(CPP_PROJ) $(SOURCE) ! ! ! !ELSEIF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug" ! ! DEP_CPP_MOD_C=\ ! "..\alloc.h"\ ! "..\buff.h"\ ! "..\conf.h"\ ! "..\http_config.h"\ ! "..\http_log.h"\ ! "..\http_request.h"\ ! "..\httpd.h"\ ! "..\regex\regex.h"\ ! "..\util_script.h"\ ! ".\readdir.h"\ ! {$(INCLUDE)}"\sys\STAT.H"\ ! {$(INCLUDE)}"\sys\TYPES.H"\ ! ! NODEP_CPP_MOD_C=\ ! "..\sfio.h"\ ! - "$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF - # End Source File - # End Target - # End Project - ################################################################################ --- 190,206 ---- "..\regex\regex.h"\ "..\util_script.h"\ ".\readdir.h"\ ! {$(INCLUDE)}"sys\stat.h"\ ! {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_C=\ "..\sfio.h"\ "$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" ! $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF