Remove files on 'make distclean' that should be.

PR: 15592

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98684 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 7579eec20634688d03097bd1b5d6d89f092f2eeb..d24ebdae52817ab28ca582ae986b820eb3ced1cf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Remove files on 'make distclean' that should be.  PR 15592.
+     [Justin Erenkrantz]
+
   *) Allow apachectl to perform status with links and elinks as well.
      [Justin Erenkrantz]
 

diff --git a/Makefile.in b/Makefile.in
index a7e73135adb53d9435c05a424b2f2243b8382a1c..c2f9d703eda2e7e98307b15239bbcdfbde00c0a1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,7 +20,7 @@ INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
 
 DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_layout.h \
        modules.c config.cache config.log config.status build/config_vars.mk \
-        build/rules.mk docs/conf/httpd-std.conf
+       build/rules.mk docs/conf/httpd-std.conf shlibtool
 EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists
 
 include $(top_builddir)/build/rules.mk

diff --git a/configure.in b/configure.in
index fd49adc2aee29e5a7b758895724dc6d2dcc65c46..f4a59d5d1e39599d76ed170139930799e56e43a4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -497,8 +497,7 @@ else
 fi
 
 APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) 
-APACHE_FAST_OUTPUT(os/beos/Makefile os/os2/Makefile os/Makefile)
-APACHE_FAST_OUTPUT(os/unix/Makefile server/Makefile)
+APACHE_FAST_OUTPUT(os/Makefile server/Makefile)
 APACHE_FAST_OUTPUT(support/Makefile srclib/pcre/Makefile)
 
 if test -d ./test; then