--- rxvt-unicode/Makefile.in	2004/08/12 21:32:40	1.8
+++ rxvt-unicode/Makefile.in	2006/01/16 16:38:20	1.14
@@ -1,6 +1,6 @@
 # ./Makefile.in			-*- Makefile -*-
-# $Id: Makefile.in,v 1.8 2004/08/12 21:32:40 root Exp $
-@MCOMMON@
+
+VERNAME = rxvt-unicode-$(VERSION)
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -9,14 +9,14 @@
 first_rule: all
 dummy:
 
-subdirs = src doc src/test
-allsubdirs = W11 $(subdirs)
+subdirs = src doc
+allsubdirs = $(subdirs)
 
 DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
 
 DIST_CFG = autoconf/aclocal.m4 autoconf/xpm.m4 autoconf/libtool.m4 \
 	autoconf/configure.in  autoconf/config.h.in \
-	autoconf/Make.common.in autoconf/install-sh autoconf/mkinstalldirs \
+	autoconf/install-sh autoconf/mkinstalldirs \
 	autoconf/config.guess autoconf/config.sub \
 	autoconf/ltmain.sh \
 
@@ -25,7 +25,6 @@
 #-------------------------------------------------------------------------
 
 all allbin alldoc tags:
-	@if test x@host_os@ = xcygwin; then (cd W11; ${MAKE} $@) || exit 1; fi
 	@for I in ${subdirs}; do (cd $$I; ${MAKE} $@) || exit 1; done
 
 realclean: clean
@@ -34,7 +33,6 @@
 clean:
 	$(RMF) *~ config.cache
 	$(RMF) -r autom4te.cache
-	@if test x@host_os@ = xcygwin; then (cd W11; ${MAKE} $@) || exit 1; fi
 	@for I in ${subdirs}; do (cd $$I; ${MAKE} $@) || exit 1; done
 
 #
@@ -64,9 +62,11 @@
 	$(MKDIR) $(DESTDIR)$(mandir)
 
 install: installdirs
-	@if test x@host_os@ = xcygwin; then (cd W11; ${MAKE} $@) || exit 1; fi
 	@for I in $(subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@) || exit 1; done
 
+check: all
+	echo "no tests"
+
 Makefiles:
 	$(SHELL) config.status
 
@@ -80,10 +80,11 @@
 distclean:
 	(cd $(srcdir); $(RMF) *~ config.cache config.h config.log config.status libtool)
 	@for I in $(allsubdirs); do (cd $$I; $(MAKE) $@) || exit 1; done
-	(cd $(srcdir); $(RMF) Makefile autoconf/Make.common)
+	(cd $(srcdir); $(RMF) Makefile)
 
 distdir:
 	cd doc && $(MAKE) distdepend
+	cd src && $(MAKE) depend
 	rm -rf $(VERNAME)
 	mkdir $(VERNAME)
 	rsync -aR `cat MANIFEST` $(VERNAME)/.