Update make files for Win32

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@62034 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 436 insertions, 435 deletions

diff --git a/apr.mak b/apr.mak
index 0fade9cf5..37761c6d6 100644
--- a/apr.mak
+++ b/apr.mak
@@ -408,247 +408,291 @@ LIB32_OBJS= \
 
 
 !IF "$(CFG)" == "apr - Win32 Release" || "$(CFG)" == "apr - Win32 Debug"
-SOURCE=.\time\win32\access.c
-DEP_CPP_ACCES=\
+SOURCE=.\dso\win32\dso.c
+DEP_CPP_DSO_C=\
 	".\include\apr.h"\
+	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
-	".\include\apr_lib.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_inherit.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\atime.h"\
+	".\include\arch\win32\dso.h"\
+	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\access.obj" : $(SOURCE) $(DEP_CPP_ACCES) "$(INTDIR)"\
- ".\include\apr.h"
+"$(INTDIR)\dso.obj" : $(SOURCE) $(DEP_CPP_DSO_C) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\time\win32\time.c
-DEP_CPP_TIME_=\
+SOURCE=.\file_io\win32\dir.c
+DEP_CPP_DIR_C=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
-	".\include\apr_lib.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
 	".\include\arch\win32\atime.h"\
+	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\time\win32\timestr.c
-DEP_CPP_TIMES=\
+SOURCE=.\file_io\unix\fileacc.c
+DEP_CPP_FILEA=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\atime.h"\
-	
-
-"$(INTDIR)\timestr.obj" : $(SOURCE) $(DEP_CPP_TIMES) "$(INTDIR)"\
- ".\include\apr.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\strings\apr_cpystrn.c
-DEP_CPP_APR_C=\
-	".\include\apr.h"\
-	".\include\apr_errno.h"\
-	".\include\apr_lib.h"\
-	".\include\apr_pools.h"\
-	".\include\apr_sms.h"\
-	".\include\apr_strings.h"\
-	".\include\arch\win32\apr_private.h"\
-	
-
-"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) $(DEP_CPP_APR_C) "$(INTDIR)"\
- ".\include\apr.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\strings\apr_fnmatch.c
-DEP_CPP_APR_F=\
-	".\include\apr.h"\
-	".\include\apr_errno.h"\
-	".\include\apr_fnmatch.h"\
-	".\include\apr_lib.h"\
-	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) $(DEP_CPP_APR_F) "$(INTDIR)"\
+"$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\strings\apr_snprintf.c
-DEP_CPP_APR_S=\
+SOURCE=.\file_io\win32\filedup.c
+DEP_CPP_FILED=\
 	".\include\apr.h"\
+	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
-	".\include\apr_lib.h"\
+	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
 	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\inherit.h"\
+	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"\
+"$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\strings\apr_strings.c
-DEP_CPP_APR_ST=\
+SOURCE=.\file_io\win32\filepath.c
+DEP_CPP_FILEP=\
 	".\include\apr.h"\
+	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
-	".\include\apr_lib.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_inherit.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
 	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\apr_strings.obj" : $(SOURCE) $(DEP_CPP_APR_ST) "$(INTDIR)"\
- ".\include\apr.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\strings\apr_strnatcmp.c
-DEP_CPP_APR_STR=\
-	".\include\apr.h"\
-	".\include\apr_errno.h"\
-	".\include\apr_lib.h"\
-	".\include\apr_pools.h"\
-	".\include\apr_sms.h"\
-	".\include\apr_strings.h"\
-	
-
-"$(INTDIR)\apr_strnatcmp.obj" : $(SOURCE) $(DEP_CPP_APR_STR) "$(INTDIR)"\
+"$(INTDIR)\filepath.obj" : $(SOURCE) $(DEP_CPP_FILEP) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\strings\apr_strtok.c
-DEP_CPP_APR_STRT=\
+SOURCE=.\file_io\win32\filestat.c
+DEP_CPP_FILES=\
 	".\include\apr.h"\
+	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_inherit.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
 	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
 	".\include\apr_want.h"\
-	
-
-"$(INTDIR)\apr_strtok.obj" : $(SOURCE) $(DEP_CPP_APR_STRT) "$(INTDIR)"\
- ".\include\apr.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\passwd\apr_getpass.c
-DEP_CPP_APR_G=\
-	".\include\apr.h"\
-	".\include\apr_errno.h"\
-	".\include\apr_lib.h"\
-	".\include\apr_pools.h"\
-	".\include\apr_sms.h"\
-	".\include\apr_strings.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\atime.h"\
+	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\apr_getpass.obj" : $(SOURCE) $(DEP_CPP_APR_G) "$(INTDIR)"\
+"$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\passwd\apr_md5.c
-DEP_CPP_APR_M=\
+SOURCE=.\file_io\win32\flock.c
+DEP_CPP_FLOCK=\
 	".\include\apr.h"\
+	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
-	".\include\apr_lib.h"\
-	".\include\apr_md5.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_inherit.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\apr_md5.obj" : $(SOURCE) $(DEP_CPP_APR_M) "$(INTDIR)"\
+"$(INTDIR)\flock.obj" : $(SOURCE) $(DEP_CPP_FLOCK) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\tables\apr_hash.c
-DEP_CPP_APR_H=\
+SOURCE=.\file_io\unix\fullrw.c
+DEP_CPP_FULLR=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
-	".\include\apr_general.h"\
-	".\include\apr_hash.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
+	".\include\apr_inherit.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_sms.h"\
-	".\include\arch\win32\apr_private.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	
 
-"$(INTDIR)\apr_hash.obj" : $(SOURCE) $(DEP_CPP_APR_H) "$(INTDIR)"\
+"$(INTDIR)\fullrw.obj" : $(SOURCE) $(DEP_CPP_FULLR) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\tables\apr_tables.c
-DEP_CPP_APR_T=\
+SOURCE=.\file_io\win32\open.c
+DEP_CPP_OPEN_=\
 	".\include\apr.h"\
+	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
-	".\include\apr_lib.h"\
+	".\include\apr_getopt.h"\
+	".\include\apr_inherit.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
 	".\include\apr_strings.h"\
 	".\include\apr_tables.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\apr_tables.obj" : $(SOURCE) $(DEP_CPP_APR_T) "$(INTDIR)"\
- ".\include\apr.h"
+"$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\misc\unix\errorcodes.c
-DEP_CPP_ERROR=\
+SOURCE=.\file_io\win32\pipe.c
+DEP_CPP_PIPE_=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
@@ -657,28 +701,30 @@ DEP_CPP_ERROR=\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
-	".\include\apr_lib.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
 	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\errorcodes.obj" : $(SOURCE) $(DEP_CPP_ERROR) "$(INTDIR)"\
- ".\include\apr.h"
+"$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\misc\unix\getopt.c
-DEP_CPP_GETOP=\
+SOURCE=.\file_io\win32\readwrite.c
+DEP_CPP_READW=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
@@ -687,39 +733,33 @@ DEP_CPP_GETOP=\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
+	".\include\apr_lib.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
 	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\atime.h"\
+	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"\
- ".\include\apr.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\misc\win32\getuuid.c
-DEP_CPP_GETUU=\
-	".\include\apr.h"\
-	".\include\apr_errno.h"\
-	".\include\apr_uuid.h"\
-	
-
-"$(INTDIR)\getuuid.obj" : $(SOURCE) $(DEP_CPP_GETUU) "$(INTDIR)"\
+"$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\misc\win32\misc.c
-DEP_CPP_MISC_=\
+SOURCE=.\file_io\win32\seek.c
+DEP_CPP_SEEK_=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
@@ -733,232 +773,207 @@ DEP_CPP_MISC_=\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
+	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\misc.obj" : $(SOURCE) $(DEP_CPP_MISC_) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\misc\win32\names.c
-DEP_CPP_NAMES=\
+SOURCE=.\i18n\unix\utf8_ucs2.c
+DEP_CPP_UTF8_=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
-	".\include\apr_file_info.h"\
-	".\include\apr_file_io.h"\
-	".\include\apr_general.h"\
-	".\include\apr_inherit.h"\
-	".\include\apr_lib.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_strings.h"\
-	".\include\apr_time.h"\
-	".\include\apr_user.h"\
-	".\include\apr_want.h"\
-	".\include\arch\win32\apr_private.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
 	
 
-"$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"\
+"$(INTDIR)\utf8_ucs2.obj" : $(SOURCE) $(DEP_CPP_UTF8_) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\misc\unix\otherchild.c
-DEP_CPP_OTHER=\
+SOURCE=.\i18n\unix\xlate.c
+SOURCE=.\locks\win32\locks.c
+DEP_CPP_LOCKS=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
-	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_tables.h"\
+	".\include\apr_strings.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
-	".\include\apr_xlate.h"\
-	".\include\arch\unix\i18n.h"\
-	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\fileio.h"\
-	".\include\arch\win32\threadproc.h"\
+	".\include\arch\win32\locks.h"\
 	
 
-"$(INTDIR)\otherchild.obj" : $(SOURCE) $(DEP_CPP_OTHER) "$(INTDIR)"\
+"$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\misc\win32\rand.c
-DEP_CPP_RAND_=\
+SOURCE=.\memory\unix\apr_pools.c
+DEP_CPP_APR_P=\
 	".\include\apr.h"\
+	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_file_info.h"\
+	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
+	".\include\apr_hash.h"\
+	".\include\apr_inherit.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_lock.h"\
+	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
+	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_thread_proc.h"\
+	".\include\apr_time.h"\
+	".\include\apr_user.h"\
+	".\include\apr_want.h"\
 	".\include\arch\win32\apr_private.h"\
 	
 
-"$(INTDIR)\rand.obj" : $(SOURCE) $(DEP_CPP_RAND_) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_pools.obj" : $(SOURCE) $(DEP_CPP_APR_P) "$(INTDIR)"\
+ ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\misc\unix\start.c
-DEP_CPP_START=\
+SOURCE=.\memory\unix\apr_sms.c
+DEP_CPP_APR_S=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
-	".\include\apr_getopt.h"\
+	".\include\apr_hash.h"\
 	".\include\apr_inherit.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
-	".\include\apr_signal.h"\
 	".\include\apr_sms.h"\
+	".\include\apr_strings.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
-	".\include\arch\unix\misc.h"\
-	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\locks.h"\
+	".\memory\unix\sms_private.h"\
 	
 
-"$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"\
+"$(INTDIR)\apr_sms.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\misc\unix\uuid.c
-DEP_CPP_UUID_=\
-	".\include\apr.h"\
-	".\include\apr_errno.h"\
-	".\include\apr_lib.h"\
-	".\include\apr_uuid.h"\
-	
-
-"$(INTDIR)\uuid.obj" : $(SOURCE) $(DEP_CPP_UUID_) "$(INTDIR)" ".\include\apr.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\file_io\win32\dir.c
-DEP_CPP_DIR_C=\
+SOURCE=.\memory\unix\apr_sms_blocks.c
+DEP_CPP_APR_SM=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
-	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_strings.h"\
-	".\include\apr_tables.h"\
+	".\include\apr_sms_blocks.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
-	".\include\apr_xlate.h"\
-	".\include\arch\unix\i18n.h"\
-	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\atime.h"\
-	".\include\arch\win32\fileio.h"\
+	".\memory\unix\sms_private.h"\
 	
 
-"$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_sms_blocks.obj" : $(SOURCE) $(DEP_CPP_APR_SM) "$(INTDIR)"\
+ ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\file_io\unix\fileacc.c
-DEP_CPP_FILEA=\
+SOURCE=.\memory\unix\apr_sms_std.c
+DEP_CPP_APR_SMS=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
-	".\include\apr_general.h"\
-	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_strings.h"\
-	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
-	".\include\apr_xlate.h"\
-	".\include\arch\unix\i18n.h"\
-	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\fileio.h"\
+	".\memory\unix\sms_private.h"\
 	
 
-"$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"\
+"$(INTDIR)\apr_sms_std.obj" : $(SOURCE) $(DEP_CPP_APR_SMS) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\file_io\win32\filedup.c
-DEP_CPP_FILED=\
+SOURCE=.\memory\unix\apr_sms_tracking.c
+DEP_CPP_APR_SMS_=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
-	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_strings.h"\
-	".\include\apr_tables.h"\
+	".\include\apr_sms_tracking.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
-	".\include\apr_xlate.h"\
-	".\include\arch\unix\i18n.h"\
-	".\include\arch\unix\inherit.h"\
-	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\fileio.h"\
+	".\memory\unix\sms_private.h"\
 	
 
-"$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"\
+"$(INTDIR)\apr_sms_tracking.obj" : $(SOURCE) $(DEP_CPP_APR_SMS_) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\file_io\win32\filepath.c
-DEP_CPP_FILEP=\
+SOURCE=.\misc\unix\errorcodes.c
+DEP_CPP_ERROR=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
@@ -967,31 +982,28 @@ DEP_CPP_FILEP=\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
+	".\include\apr_lib.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
 	".\include\apr_strings.h"\
-	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
-	".\include\apr_xlate.h"\
-	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\filepath.obj" : $(SOURCE) $(DEP_CPP_FILEP) "$(INTDIR)"\
+"$(INTDIR)\errorcodes.obj" : $(SOURCE) $(DEP_CPP_ERROR) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\file_io\win32\filestat.c
-DEP_CPP_FILES=\
+SOURCE=.\misc\unix\getopt.c
+DEP_CPP_GETOP=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
@@ -1006,26 +1018,33 @@ DEP_CPP_FILES=\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
 	".\include\apr_strings.h"\
-	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
-	".\include\apr_xlate.h"\
-	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\atime.h"\
-	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"\
+"$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\file_io\win32\flock.c
-DEP_CPP_FLOCK=\
+SOURCE=.\misc\win32\getuuid.c
+DEP_CPP_GETUU=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_uuid.h"\
+	
+
+"$(INTDIR)\getuuid.obj" : $(SOURCE) $(DEP_CPP_GETUU) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\misc\win32\misc.c
+DEP_CPP_MISC_=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
@@ -1039,44 +1058,43 @@ DEP_CPP_FLOCK=\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
-	".\include\apr_xlate.h"\
-	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\flock.obj" : $(SOURCE) $(DEP_CPP_FLOCK) "$(INTDIR)"\
- ".\include\apr.h"
+"$(INTDIR)\misc.obj" : $(SOURCE) $(DEP_CPP_MISC_) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\file_io\unix\fullrw.c
-DEP_CPP_FULLR=\
+SOURCE=.\misc\win32\names.c
+DEP_CPP_NAMES=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
 	".\include\apr_inherit.h"\
+	".\include\apr_lib.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_sms.h"\
+	".\include\apr_strings.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
+	".\include\arch\win32\apr_private.h"\
 	
 
-"$(INTDIR)\fullrw.obj" : $(SOURCE) $(DEP_CPP_FULLR) "$(INTDIR)"\
+"$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\file_io\win32\open.c
-DEP_CPP_OPEN_=\
+SOURCE=.\misc\unix\otherchild.c
+DEP_CPP_OTHER=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
@@ -1090,7 +1108,6 @@ DEP_CPP_OPEN_=\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_strings.h"\
 	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
@@ -1101,46 +1118,30 @@ DEP_CPP_OPEN_=\
 	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
 	".\include\arch\win32\fileio.h"\
+	".\include\arch\win32\threadproc.h"\
 	
 
-"$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\otherchild.obj" : $(SOURCE) $(DEP_CPP_OTHER) "$(INTDIR)"\
+ ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\file_io\win32\pipe.c
-DEP_CPP_PIPE_=\
+SOURCE=.\misc\win32\rand.c
+DEP_CPP_RAND_=\
 	".\include\apr.h"\
-	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
-	".\include\apr_file_info.h"\
-	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
-	".\include\apr_getopt.h"\
-	".\include\apr_inherit.h"\
-	".\include\apr_lock.h"\
-	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
-	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_strings.h"\
-	".\include\apr_tables.h"\
-	".\include\apr_thread_proc.h"\
-	".\include\apr_time.h"\
-	".\include\apr_user.h"\
-	".\include\apr_want.h"\
-	".\include\apr_xlate.h"\
-	".\include\arch\unix\i18n.h"\
-	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\rand.obj" : $(SOURCE) $(DEP_CPP_RAND_) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\file_io\win32\readwrite.c
-DEP_CPP_READW=\
+SOURCE=.\misc\unix\start.c
+DEP_CPP_START=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
@@ -1149,87 +1150,88 @@ DEP_CPP_READW=\
 	".\include\apr_general.h"\
 	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
-	".\include\apr_lib.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
+	".\include\apr_signal.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_strings.h"\
-	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
-	".\include\apr_xlate.h"\
-	".\include\arch\unix\i18n.h"\
 	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\atime.h"\
-	".\include\arch\win32\fileio.h"\
+	".\include\arch\win32\locks.h"\
 	
 
-"$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"\
+"$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\file_io\win32\seek.c
-DEP_CPP_SEEK_=\
+SOURCE=.\misc\unix\uuid.c
+DEP_CPP_UUID_=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_uuid.h"\
+	
+
+"$(INTDIR)\uuid.obj" : $(SOURCE) $(DEP_CPP_UUID_) "$(INTDIR)" ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\mmap\unix\common.c
+DEP_CPP_COMMO=\
 	".\include\apr.h"\
-	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
-	".\include\apr_general.h"\
-	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
-	".\include\apr_lock.h"\
-	".\include\apr_network_io.h"\
+	".\include\apr_mmap.h"\
 	".\include\apr_pools.h"\
-	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_tables.h"\
-	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
-	".\include\apr_xlate.h"\
-	".\include\arch\unix\i18n.h"\
-	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\common.obj" : $(SOURCE) $(DEP_CPP_COMMO) "$(INTDIR)"\
+ ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\locks\win32\locks.c
-DEP_CPP_LOCKS=\
+SOURCE=.\mmap\win32\mmap.c
+DEP_CPP_MMAP_=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
 	".\include\apr_lock.h"\
+	".\include\apr_mmap.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\locks.h"\
+	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"\
- ".\include\apr.h"
+"$(INTDIR)\mmap.obj" : $(SOURCE) $(DEP_CPP_MMAP_) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
@@ -1412,201 +1414,178 @@ DEP_CPP_SOCKO=\
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\threadproc\win32\proc.c
-DEP_CPP_PROC_=\
+SOURCE=.\passwd\apr_getpass.c
+DEP_CPP_APR_G=\
 	".\include\apr.h"\
-	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
-	".\include\apr_file_info.h"\
-	".\include\apr_file_io.h"\
-	".\include\apr_general.h"\
-	".\include\apr_getopt.h"\
-	".\include\apr_inherit.h"\
-	".\include\apr_lock.h"\
-	".\include\apr_network_io.h"\
+	".\include\apr_lib.h"\
 	".\include\apr_pools.h"\
-	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
 	".\include\apr_strings.h"\
-	".\include\apr_tables.h"\
-	".\include\apr_thread_proc.h"\
-	".\include\apr_time.h"\
-	".\include\apr_user.h"\
-	".\include\apr_want.h"\
-	".\include\apr_xlate.h"\
-	".\include\arch\unix\i18n.h"\
-	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\fileio.h"\
-	".\include\arch\win32\threadproc.h"\
 	
 
-"$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_getpass.obj" : $(SOURCE) $(DEP_CPP_APR_G) "$(INTDIR)"\
+ ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\threadproc\win32\signals.c
-DEP_CPP_SIGNA=\
+SOURCE=.\passwd\apr_md5.c
+DEP_CPP_APR_M=\
 	".\include\apr.h"\
-	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
-	".\include\apr_file_info.h"\
-	".\include\apr_file_io.h"\
-	".\include\apr_general.h"\
-	".\include\apr_getopt.h"\
-	".\include\apr_inherit.h"\
-	".\include\apr_lock.h"\
-	".\include\apr_network_io.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_md5.h"\
 	".\include\apr_pools.h"\
-	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_tables.h"\
-	".\include\apr_thread_proc.h"\
-	".\include\apr_time.h"\
-	".\include\apr_user.h"\
-	".\include\apr_want.h"\
+	".\include\apr_strings.h"\
 	".\include\apr_xlate.h"\
-	".\include\arch\unix\i18n.h"\
-	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\fileio.h"\
-	".\include\arch\win32\threadproc.h"\
 	
 
-"$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"\
+"$(INTDIR)\apr_md5.obj" : $(SOURCE) $(DEP_CPP_APR_M) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\threadproc\win32\thread.c
-DEP_CPP_THREA=\
+SOURCE=.\shmem\win32\shmem.c
+SOURCE=.\strings\apr_cpystrn.c
+DEP_CPP_APR_C=\
 	".\include\apr.h"\
-	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
-	".\include\apr_file_info.h"\
-	".\include\apr_file_io.h"\
-	".\include\apr_general.h"\
-	".\include\apr_inherit.h"\
 	".\include\apr_lib.h"\
-	".\include\apr_lock.h"\
-	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
-	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_thread_proc.h"\
-	".\include\apr_time.h"\
-	".\include\apr_user.h"\
-	".\include\apr_want.h"\
+	".\include\apr_strings.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\threadproc.h"\
 	
 
-"$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"\
+"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) $(DEP_CPP_APR_C) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\threadproc\win32\threadpriv.c
-DEP_CPP_THREAD=\
+SOURCE=.\strings\apr_fnmatch.c
+DEP_CPP_APR_F=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_fnmatch.h"\
+	".\include\apr_lib.h"\
+	".\include\arch\win32\apr_private.h"\
+	
+
+"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) $(DEP_CPP_APR_F) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\strings\apr_snprintf.c
+DEP_CPP_APR_SN=\
 	".\include\apr.h"\
-	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
-	".\include\apr_general.h"\
 	".\include\apr_inherit.h"\
 	".\include\apr_lib.h"\
-	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
-	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_thread_proc.h"\
+	".\include\apr_strings.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\threadproc.h"\
 	
 
-"$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"\
+"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_SN) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\dso\win32\dso.c
-DEP_CPP_DSO_C=\
+SOURCE=.\strings\apr_strings.c
+DEP_CPP_APR_ST=\
 	".\include\apr.h"\
-	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
-	".\include\apr_file_info.h"\
-	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
-	".\include\apr_getopt.h"\
-	".\include\apr_inherit.h"\
-	".\include\apr_lock.h"\
-	".\include\apr_network_io.h"\
+	".\include\apr_lib.h"\
 	".\include\apr_pools.h"\
-	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
 	".\include\apr_strings.h"\
-	".\include\apr_tables.h"\
-	".\include\apr_thread_proc.h"\
-	".\include\apr_time.h"\
-	".\include\apr_user.h"\
 	".\include\apr_want.h"\
-	".\include\apr_xlate.h"\
-	".\include\arch\unix\i18n.h"\
-	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\dso.h"\
-	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\dso.obj" : $(SOURCE) $(DEP_CPP_DSO_C) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_strings.obj" : $(SOURCE) $(DEP_CPP_APR_ST) "$(INTDIR)"\
+ ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\i18n\unix\utf8_ucs2.c
-DEP_CPP_UTF8_=\
+SOURCE=.\strings\apr_strnatcmp.c
+DEP_CPP_APR_STR=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
+	".\include\apr_lib.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_xlate.h"\
-	".\include\arch\unix\i18n.h"\
+	".\include\apr_strings.h"\
 	
 
-"$(INTDIR)\utf8_ucs2.obj" : $(SOURCE) $(DEP_CPP_UTF8_) "$(INTDIR)"\
+"$(INTDIR)\apr_strnatcmp.obj" : $(SOURCE) $(DEP_CPP_APR_STR) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\i18n\unix\xlate.c
-SOURCE=.\shmem\win32\shmem.c
-SOURCE=.\mmap\unix\common.c
-DEP_CPP_COMMO=\
+SOURCE=.\strings\apr_strtok.c
+DEP_CPP_APR_STRT=\
 	".\include\apr.h"\
 	".\include\apr_errno.h"\
-	".\include\apr_file_info.h"\
-	".\include\apr_file_io.h"\
-	".\include\apr_inherit.h"\
-	".\include\apr_mmap.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_time.h"\
-	".\include\apr_user.h"\
+	".\include\apr_strings.h"\
 	".\include\apr_want.h"\
+	
+
+"$(INTDIR)\apr_strtok.obj" : $(SOURCE) $(DEP_CPP_APR_STRT) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\tables\apr_hash.c
+DEP_CPP_APR_H=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_general.h"\
+	".\include\apr_hash.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_sms.h"\
 	".\include\arch\win32\apr_private.h"\
 	
 
-"$(INTDIR)\common.obj" : $(SOURCE) $(DEP_CPP_COMMO) "$(INTDIR)"\
+"$(INTDIR)\apr_hash.obj" : $(SOURCE) $(DEP_CPP_APR_H) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\mmap\win32\mmap.c
-DEP_CPP_MMAP_=\
+SOURCE=.\tables\apr_tables.c
+DEP_CPP_APR_T=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_general.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_sms.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
+	".\include\arch\win32\apr_private.h"\
+	
+
+"$(INTDIR)\apr_tables.obj" : $(SOURCE) $(DEP_CPP_APR_T) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\threadproc\win32\proc.c
+DEP_CPP_PROC_=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
@@ -1616,11 +1595,11 @@ DEP_CPP_MMAP_=\
 	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
 	".\include\apr_lock.h"\
-	".\include\apr_mmap.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
+	".\include\apr_strings.h"\
 	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
@@ -1631,80 +1610,82 @@ DEP_CPP_MMAP_=\
 	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
 	".\include\arch\win32\fileio.h"\
+	".\include\arch\win32\threadproc.h"\
 	
 
-"$(INTDIR)\mmap.obj" : $(SOURCE) $(DEP_CPP_MMAP_) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\user\win32\groupinfo.c
-DEP_CPP_GROUP=\
+SOURCE=.\threadproc\win32\signals.c
+DEP_CPP_SIGNA=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
+	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\fileio.h"\
+	".\include\arch\win32\threadproc.h"\
 	
 
-"$(INTDIR)\groupinfo.obj" : $(SOURCE) $(DEP_CPP_GROUP) "$(INTDIR)"\
+"$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\user\win32\userinfo.c
-DEP_CPP_USERI=\
+SOURCE=.\threadproc\win32\thread.c
+DEP_CPP_THREA=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
-	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
+	".\include\apr_lib.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_strings.h"\
-	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
-	".\include\apr_xlate.h"\
-	".\include\arch\unix\i18n.h"\
-	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\include\arch\win32\fileio.h"\
+	".\include\arch\win32\threadproc.h"\
 	
 
-"$(INTDIR)\userinfo.obj" : $(SOURCE) $(DEP_CPP_USERI) "$(INTDIR)"\
+"$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\memory\unix\apr_pools.c
-DEP_CPP_APR_P=\
+SOURCE=.\threadproc\win32\threadpriv.c
+DEP_CPP_THREAD=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
-	".\include\apr_hash.h"\
 	".\include\apr_inherit.h"\
 	".\include\apr_lib.h"\
 	".\include\apr_lock.h"\
@@ -1712,77 +1693,92 @@ DEP_CPP_APR_P=\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_strings.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
 	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\threadproc.h"\
 	
 
-"$(INTDIR)\apr_pools.obj" : $(SOURCE) $(DEP_CPP_APR_P) "$(INTDIR)"\
+"$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\memory\unix\apr_sms.c
-DEP_CPP_APR_SM=\
+SOURCE=.\time\win32\access.c
+DEP_CPP_ACCES=\
+	".\include\apr.h"\
+	".\include\apr_errno.h"\
+	".\include\apr_general.h"\
+	".\include\apr_lib.h"\
+	".\include\apr_pools.h"\
+	".\include\apr_sms.h"\
+	".\include\apr_time.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\atime.h"\
+	
+
+"$(INTDIR)\access.obj" : $(SOURCE) $(DEP_CPP_ACCES) "$(INTDIR)"\
+ ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\time\win32\time.c
+DEP_CPP_TIME_=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
-	".\include\apr_hash.h"\
 	".\include\apr_inherit.h"\
+	".\include\apr_lib.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_strings.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
-	".\memory\unix\sms_private.h"\
+	".\include\arch\win32\apr_private.h"\
+	".\include\arch\win32\atime.h"\
 	
 
-"$(INTDIR)\apr_sms.obj" : $(SOURCE) $(DEP_CPP_APR_SM) "$(INTDIR)"\
- ".\include\apr.h"
+"$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\memory\unix\apr_sms_blocks.c
-DEP_CPP_APR_SMS=\
+SOURCE=.\time\win32\timestr.c
+DEP_CPP_TIMES=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
-	".\include\apr_general.h"\
 	".\include\apr_inherit.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_sms_blocks.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\memory\unix\sms_private.h"\
+	".\include\arch\win32\atime.h"\
 	
 
-"$(INTDIR)\apr_sms_blocks.obj" : $(SOURCE) $(DEP_CPP_APR_SMS) "$(INTDIR)"\
+"$(INTDIR)\timestr.obj" : $(SOURCE) $(DEP_CPP_TIMES) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\memory\unix\apr_sms_std.c
-DEP_CPP_APR_SMS_=\
+SOURCE=.\user\win32\groupinfo.c
+DEP_CPP_GROUP=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
@@ -1794,43 +1790,48 @@ DEP_CPP_APR_SMS_=\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
+	".\include\apr_strings.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\memory\unix\sms_private.h"\
 	
 
-"$(INTDIR)\apr_sms_std.obj" : $(SOURCE) $(DEP_CPP_APR_SMS_) "$(INTDIR)"\
+"$(INTDIR)\groupinfo.obj" : $(SOURCE) $(DEP_CPP_GROUP) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\memory\unix\apr_sms_tracking.c
-DEP_CPP_APR_SMS_T=\
+SOURCE=.\user\win32\userinfo.c
+DEP_CPP_USERI=\
 	".\include\apr.h"\
 	".\include\apr_dso.h"\
 	".\include\apr_errno.h"\
 	".\include\apr_file_info.h"\
 	".\include\apr_file_io.h"\
 	".\include\apr_general.h"\
+	".\include\apr_getopt.h"\
 	".\include\apr_inherit.h"\
 	".\include\apr_lock.h"\
 	".\include\apr_network_io.h"\
 	".\include\apr_pools.h"\
 	".\include\apr_portable.h"\
 	".\include\apr_sms.h"\
-	".\include\apr_sms_tracking.h"\
+	".\include\apr_strings.h"\
+	".\include\apr_tables.h"\
 	".\include\apr_thread_proc.h"\
 	".\include\apr_time.h"\
 	".\include\apr_user.h"\
 	".\include\apr_want.h"\
+	".\include\apr_xlate.h"\
+	".\include\arch\unix\i18n.h"\
+	".\include\arch\unix\misc.h"\
 	".\include\arch\win32\apr_private.h"\
-	".\memory\unix\sms_private.h"\
+	".\include\arch\win32\fileio.h"\
 	
 
-"$(INTDIR)\apr_sms_tracking.obj" : $(SOURCE) $(DEP_CPP_APR_SMS_T) "$(INTDIR)"\
+"$(INTDIR)\userinfo.obj" : $(SOURCE) $(DEP_CPP_USERI) "$(INTDIR)"\
  ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)