Basic cleanup for apr. This takes care of the make depend that used to be

needed before APR would build.  This also removes some files that never should
have been imported.


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

6 files changed, 43 insertions, 54 deletions

diff --git a/file_io/unix/Makefile.in b/file_io/unix/Makefile.in
index 078be7da4..64b441af9 100644
--- a/file_io/unix/Makefile.in
+++ b/file_io/unix/Makefile.in
@@ -59,19 +59,16 @@ depend:
 # DO NOT REMOVE
 dir.o: dir.c fileio.h ../../include/apr_general.h \
  ../../include/apr_config.h ../../include/apr_errno.h \
- ../../include/apr_file_io.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_config.h $(INCDIR)/hsregex.h \
+ ../../include/apr_file_io.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h \
  ../../include/apr_portable.h ../../include/apr_thread_proc.h \
  ../../include/apr_win.h ../../include/apr_network_io.h \
  ../../include/apr_lock.h ../../include/apr_time.h
 fileacc.o: fileacc.c fileio.h ../../include/apr_general.h \
  ../../include/apr_config.h ../../include/apr_errno.h \
- ../../include/apr_file_io.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_config.h $(INCDIR)/hsregex.h
+ ../../include/apr_file_io.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
 filedup.o: filedup.c fileio.h ../../include/apr_general.h \
  ../../include/apr_config.h ../../include/apr_errno.h \
- ../../include/apr_file_io.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_config.h $(INCDIR)/hsregex.h
+ ../../include/apr_file_io.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
 filestat.o: filestat.c fileio.h ../../include/apr_general.h \
  ../../include/apr_config.h ../../include/apr_errno.h \
  ../../include/apr_file_io.h
@@ -80,16 +77,13 @@ open.o: open.c fileio.h ../../include/apr_general.h \
  ../../include/apr_file_io.h ../../include/apr_portable.h \
  ../../include/apr_thread_proc.h ../../include/apr_win.h \
  ../../include/apr_network_io.h ../../include/apr_lock.h \
- ../../include/apr_time.h $(INCDIR)/apr_lib.h $(INCDIR)/apr_config.h \
- $(INCDIR)/hsregex.h
+ ../../include/apr_time.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
 pipe.o: pipe.c fileio.h ../../include/apr_general.h \
  ../../include/apr_config.h ../../include/apr_errno.h \
- ../../include/apr_file_io.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_config.h $(INCDIR)/hsregex.h
+ ../../include/apr_file_io.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
 readwrite.o: readwrite.c fileio.h ../../include/apr_general.h \
  ../../include/apr_config.h ../../include/apr_errno.h \
- ../../include/apr_file_io.h $(INCDIR)/apr_lib.h \
- $(INCDIR)/apr_config.h $(INCDIR)/hsregex.h
+ ../../include/apr_file_io.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
 seek.o: seek.c fileio.h ../../include/apr_general.h \
  ../../include/apr_config.h ../../include/apr_errno.h \
  ../../include/apr_file_io.h
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 25ae2f24b..970cb647d 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -61,29 +61,29 @@ depend:
 	    && rm Makefile.new
 
 # DO NOT REMOVE
-apr_cpystrn.o: apr_cpystrn.c $(INCDIR)/apr_config.h
-apr_execve.o: apr_execve.c $(INCDIR)/apr_config.h
-apr_fnmatch.o: apr_fnmatch.c $(INCDIR)/apr_config.h $(INCDIR)/apr_fnmatch.h \
- $(INCDIR)/apr_lib.h ../include/apr_general.h ../include/apr_config.h \
+apr_cpystrn.o: apr_cpystrn.c ../include/apr_config.h
+apr_execve.o: apr_execve.c ../include/apr_config.h
+apr_fnmatch.o: apr_fnmatch.c ../include/apr_config.h \
+ $(INCDIR)/apr_fnmatch.h $(INCDIR)/apr_lib.h ../include/apr_general.h \
  ../include/apr_errno.h ../include/apr_file_io.h $(INCDIR)/hsregex.h
-apr_getpass.o: apr_getpass.c $(INCDIR)/apr_config.h \
+apr_getpass.o: apr_getpass.c ../include/apr_config.h \
  ../include/apr_errno.h $(INCDIR)/apr_lib.h ../include/apr_general.h \
- ../include/apr_config.h ../include/apr_file_io.h $(INCDIR)/hsregex.h
-apr_md5.o: apr_md5.c $(INCDIR)/apr_config.h $(INCDIR)/apr_md5.h \
- $(INCDIR)/apr_lib.h ../include/apr_general.h ../include/apr_config.h \
- ../include/apr_errno.h ../include/apr_file_io.h $(INCDIR)/hsregex.h
-apr_pools.o: apr_pools.c $(INCDIR)/apr_config.h ../include/apr_general.h \
- ../include/apr_config.h ../include/apr_errno.h ../include/apr_pools.h \
- $(INCDIR)/apr_lib.h ../include/apr_file_io.h $(INCDIR)/hsregex.h \
- ../misc/unix/misc.h
-apr_signal.o: apr_signal.c $(INCDIR)/apr_config.h $(INCDIR)/apr_lib.h \
- ../include/apr_general.h ../include/apr_config.h \
- ../include/apr_errno.h ../include/apr_file_io.h $(INCDIR)/hsregex.h
-apr_slack.o: apr_slack.c $(INCDIR)/apr_config.h
-apr_snprintf.o: apr_snprintf.c $(INCDIR)/apr_config.h $(INCDIR)/apr_lib.h \
- ../include/apr_general.h ../include/apr_config.h \
- ../include/apr_errno.h ../include/apr_file_io.h $(INCDIR)/hsregex.h
-apr_tables.o: apr_tables.c $(INCDIR)/apr_config.h \
- ../include/apr_general.h ../include/apr_config.h \
- ../include/apr_errno.h ../include/apr_pools.h $(INCDIR)/apr_lib.h \
- ../include/apr_file_io.h $(INCDIR)/hsregex.h ../misc/unix/misc.h
+ ../include/apr_file_io.h $(INCDIR)/hsregex.h
+apr_md5.o: apr_md5.c ../include/apr_config.h $(INCDIR)/apr_md5.h \
+ $(INCDIR)/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
+ ../include/apr_file_io.h $(INCDIR)/hsregex.h
+apr_pools.o: apr_pools.c ../include/apr_config.h \
+ ../include/apr_general.h ../include/apr_errno.h \
+ ../include/apr_pools.h $(INCDIR)/apr_lib.h ../include/apr_file_io.h \
+ $(INCDIR)/hsregex.h ../misc/unix/misc.h
+apr_signal.o: apr_signal.c ../include/apr_config.h $(INCDIR)/apr_lib.h \
+ ../include/apr_general.h ../include/apr_errno.h \
+ ../include/apr_file_io.h $(INCDIR)/hsregex.h
+apr_slack.o: apr_slack.c ../include/apr_config.h
+apr_snprintf.o: apr_snprintf.c ../include/apr_config.h \
+ $(INCDIR)/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \
+ ../include/apr_file_io.h $(INCDIR)/hsregex.h
+apr_tables.o: apr_tables.c ../include/apr_config.h \
+ ../include/apr_general.h ../include/apr_errno.h \
+ ../include/apr_pools.h $(INCDIR)/apr_lib.h ../include/apr_file_io.h \
+ $(INCDIR)/hsregex.h ../misc/unix/misc.h
diff --git a/misc/unix/Makefile.in b/misc/unix/Makefile.in
index 68fbbc05d..f715a9d6a 100644
--- a/misc/unix/Makefile.in
+++ b/misc/unix/Makefile.in
@@ -57,5 +57,4 @@ getopt.o: getopt.c misc.h ../../include/apr_general.h \
 start.o: start.c ../../include/apr_general.h \
  ../../include/apr_config.h ../../include/apr_errno.h \
  ../../include/apr_pools.h $(INCDIR)/apr_lib.h \
- ../../include/apr_file_io.h $(INCDIR)/apr_config.h \
- $(INCDIR)/hsregex.h misc.h
+ ../../include/apr_file_io.h $(INCDIR)/hsregex.h misc.h
diff --git a/network_io/unix/Makefile.in b/network_io/unix/Makefile.in
index 8ffeb66b7..dd8c4d873 100644
--- a/network_io/unix/Makefile.in
+++ b/network_io/unix/Makefile.in
@@ -56,8 +56,7 @@ depend:
 poll.o: poll.c networkio.h ../../include/apr_network_io.h \
  ../../include/apr_general.h ../../include/apr_config.h \
  ../../include/apr_errno.h $(INCDIR)/apr_lib.h \
- ../../include/apr_file_io.h $(INCDIR)/apr_config.h \
- $(INCDIR)/hsregex.h
+ ../../include/apr_file_io.h $(INCDIR)/hsregex.h
 sendrecv.o: sendrecv.c networkio.h ../../include/apr_network_io.h \
  ../../include/apr_general.h ../../include/apr_config.h \
  ../../include/apr_errno.h
@@ -66,10 +65,8 @@ sockets.o: sockets.c networkio.h ../../include/apr_network_io.h \
  ../../include/apr_errno.h ../../include/apr_portable.h \
  ../../include/apr_thread_proc.h ../../include/apr_file_io.h \
  ../../include/apr_win.h ../../include/apr_lock.h \
- ../../include/apr_time.h $(INCDIR)/apr_lib.h $(INCDIR)/apr_config.h \
- $(INCDIR)/hsregex.h
+ ../../include/apr_time.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
 sockopt.o: sockopt.c networkio.h ../../include/apr_network_io.h \
  ../../include/apr_general.h ../../include/apr_config.h \
  ../../include/apr_errno.h $(INCDIR)/apr_lib.h \
- ../../include/apr_file_io.h $(INCDIR)/apr_config.h \
- $(INCDIR)/hsregex.h
+ ../../include/apr_file_io.h $(INCDIR)/hsregex.h
diff --git a/threadproc/unix/Makefile.in b/threadproc/unix/Makefile.in
index 0596a1a9a..dc4816748 100644
--- a/threadproc/unix/Makefile.in
+++ b/threadproc/unix/Makefile.in
@@ -60,14 +60,14 @@ proc.o: proc.c threadproc.h ../../include/apr_thread_proc.h \
  ../../include/apr_file_io.h ../../include/apr_general.h \
  ../../include/apr_config.h ../../include/apr_errno.h \
  ../../include/apr_win.h ../../file_io/unix/fileio.h \
- $(INCDIR)/apr_lib.h $(INCDIR)/apr_config.h $(INCDIR)/hsregex.h \
- ../../include/apr_portable.h ../../include/apr_network_io.h \
- ../../include/apr_lock.h ../../include/apr_time.h
+ $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h ../../include/apr_portable.h \
+ ../../include/apr_network_io.h ../../include/apr_lock.h \
+ ../../include/apr_time.h
 procsup.o: procsup.c threadproc.h ../../include/apr_thread_proc.h \
  ../../include/apr_file_io.h ../../include/apr_general.h \
  ../../include/apr_config.h ../../include/apr_errno.h \
  ../../include/apr_win.h ../../file_io/unix/fileio.h \
- $(INCDIR)/apr_config.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
+ $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
 signals.o: signals.c threadproc.h ../../include/apr_thread_proc.h \
  ../../include/apr_file_io.h ../../include/apr_general.h \
  ../../include/apr_config.h ../../include/apr_errno.h \
diff --git a/time/unix/Makefile.in b/time/unix/Makefile.in
index 9d86e28a2..17d2a681d 100644
--- a/time/unix/Makefile.in
+++ b/time/unix/Makefile.in
@@ -54,12 +54,11 @@ depend:
 access.o: access.c atime.h ../../include/apr_time.h \
  ../../include/apr_general.h ../../include/apr_config.h \
  ../../include/apr_errno.h $(INCDIR)/apr_lib.h \
- ../../include/apr_file_io.h $(INCDIR)/apr_config.h \
- $(INCDIR)/hsregex.h
+ ../../include/apr_file_io.h $(INCDIR)/hsregex.h
 time.o: time.c atime.h ../../include/apr_time.h \
  ../../include/apr_general.h ../../include/apr_config.h \
  ../../include/apr_errno.h $(INCDIR)/apr_lib.h \
- ../../include/apr_file_io.h $(INCDIR)/apr_config.h \
- $(INCDIR)/hsregex.h ../../include/apr_portable.h \
- ../../include/apr_thread_proc.h ../../include/apr_win.h \
- ../../include/apr_network_io.h ../../include/apr_lock.h
+ ../../include/apr_file_io.h $(INCDIR)/hsregex.h \
+ ../../include/apr_portable.h ../../include/apr_thread_proc.h \
+ ../../include/apr_win.h ../../include/apr_network_io.h \
+ ../../include/apr_lock.h