Automated merge.

[wget] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b759dd47bac01456a72a5064e62dacdff60dbf86..69034a86d28031a100dc3434424ce0904c90d620 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,34 +32,14 @@
 # Search for macros in the m4 subdirectory:
 ACLOCAL_AMFLAGS = -I m4
 
-# These are used for maintenance only, so they are safe without
-# special autoconf cruft.
-RM = rm -f
-
 # subdirectories in the distribution
-SUBDIRS = src doc po tests util windows
+SUBDIRS = lib src doc po tests util windows
 
 test: all
        cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
 
-EXTRA_DIST = autogen.sh ChangeLog.README configure.bat MAILING-LIST PATCHES \
-            README.checkout
-
-#
-# Cleanup dependencies
-#
-
-realclean:     realclean-recursive     realclean-top
+EXTRA_DIST = ChangeLog.README configure.bat MAILING-LIST PATCHES \
+            msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \
+            msdos/Makefile.WC ABOUT-NLS
 
 CLEANFILES = *~ *.bak $(DISTNAME).tar.gz
-distclean-local:
-       $(RM) -r autom4te.cache
-
-realclean-top: distclean-am
-       $(RM) configure
-
-realclean-recursive:
-       for subdir in $(SUBDIRS); do \
-          target=`echo $@ | sed s/-recursive//`; \
-          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) || exit 1; \
-       done