You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@locus.apache.org on 2000/04/21 22:45:42 UTC
cvs commit: apache-2.0/src/os/win32/installer/installdll install.mak
stoddard 00/04/21 13:45:42
Modified: src/os/win32/installer/installdll install.mak
Log:
Forgot to commit this change earlier. use apr.lib rather than aprlib.lib.
Also, change the intermeidate directory to lib*
Revision Changes Path
1.5 +43 -4 apache-2.0/src/os/win32/installer/installdll/install.mak
Index: install.mak
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/installer/installdll/install.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- install.mak 2000/04/20 19:28:09 1.4
+++ install.mak 2000/04/21 20:45:41 1.5
@@ -113,7 +113,7 @@
LINK32_OBJS= \
"$(INTDIR)\apr_snprintf.obj" \
"$(INTDIR)\install.obj" \
- "..\..\..\..\lib\apr\Release\aprlib.lib"
+ "..\..\..\..\lib\apr\LibR\apr.lib"
"$(OUTDIR)\install.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -210,7 +210,7 @@
LINK32_OBJS= \
"$(INTDIR)\apr_snprintf.obj" \
"$(INTDIR)\install.obj" \
- "..\..\..\..\lib\apr\Debug\aprlib.lib"
+ "..\..\..\..\lib\apr\LibD\apr.lib"
"$(OUTDIR)\install.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -223,7 +223,12 @@
!IF "$(CFG)" == "install - Win32 Release" || "$(CFG)" ==\
"install - Win32 Debug"
SOURCE=..\..\..\..\lib\apr\lib\apr_snprintf.c
+
+!IF "$(CFG)" == "install - Win32 Release"
+
DEP_CPP_APR_S=\
+ "..\..\..\..\lib\apr\include\apr.h"\
+ "..\..\..\..\lib\apr\include\apr_config.h"\
"..\..\..\..\lib\apr\include\apr_errno.h"\
"..\..\..\..\lib\apr\include\apr_file_io.h"\
"..\..\..\..\lib\apr\include\apr_general.h"\
@@ -232,17 +237,37 @@
"..\..\..\..\lib\apr\include\apr_time.h"\
{$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_APR_S=\
+
+"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "install - Win32 Debug"
+
+DEP_CPP_APR_S=\
"..\..\..\..\lib\apr\include\apr.h"\
"..\..\..\..\lib\apr\include\apr_config.h"\
+ "..\..\..\..\lib\apr\include\apr_errno.h"\
+ "..\..\..\..\lib\apr\include\apr_file_io.h"\
+ "..\..\..\..\lib\apr\include\apr_general.h"\
+ "..\..\..\..\lib\apr\include\apr_lib.h"\
+ "..\..\..\..\lib\apr\include\apr_thread_proc.h"\
+ "..\..\..\..\lib\apr\include\apr_time.h"\
"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ENDIF
+
SOURCE=.\install.c
+
+!IF "$(CFG)" == "install - Win32 Release"
+
DEP_CPP_INSTA=\
+ "..\..\..\..\lib\apr\include\apr.h"\
+ "..\..\..\..\lib\apr\include\apr_config.h"\
"..\..\..\..\lib\apr\include\apr_errno.h"\
"..\..\..\..\lib\apr\include\apr_file_io.h"\
"..\..\..\..\lib\apr\include\apr_general.h"\
@@ -251,13 +276,27 @@
"..\..\..\..\lib\apr\include\apr_time.h"\
{$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_INSTA=\
+
+"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTA) "$(INTDIR)"
+
+
+!ELSEIF "$(CFG)" == "install - Win32 Debug"
+
+DEP_CPP_INSTA=\
"..\..\..\..\lib\apr\include\apr.h"\
"..\..\..\..\lib\apr\include\apr_config.h"\
+ "..\..\..\..\lib\apr\include\apr_errno.h"\
+ "..\..\..\..\lib\apr\include\apr_file_io.h"\
+ "..\..\..\..\lib\apr\include\apr_general.h"\
+ "..\..\..\..\lib\apr\include\apr_lib.h"\
+ "..\..\..\..\lib\apr\include\apr_thread_proc.h"\
+ "..\..\..\..\lib\apr\include\apr_time.h"\
"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTA) "$(INTDIR)"
+
+!ENDIF
!IF "$(CFG)" == "install - Win32 Release"