From: ayin <ayin>
Date: Mon, 16 Jan 2006 16:38:20 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=5dd6061161ebfaa2063caaf97d65d11534a32769;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/Makefile.in b/Makefile.in
index 36f958ef..2e6c3707 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,4 @@
 # ./Makefile.in			-*- Makefile -*-
-@MCOMMON@
 
 VERNAME = rxvt-unicode-$(VERSION)
 
@@ -17,7 +16,7 @@ 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 \
 
@@ -81,7 +80,7 @@ cleandir: realclean
 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
diff --git a/autoconf/configure.in b/autoconf/configure.in
index aef548c3..e3b50ebb 100644
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -1429,10 +1429,6 @@ AC_SUBST(LIBS)
 AC_SUBST(X_LIBS)
 AC_SUBST(X_EXTRA_LIBS)
 
-dnl# common parts of the Makefile
-MCOMMON=./autoconf/Make.common
-AC_SUBST_FILE(MCOMMON)
-
 AC_ARG_PROGRAM
 
 dnl# test for "sun" or "__sun__" before include sys_ioctl
@@ -1460,8 +1456,7 @@ RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_
 RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
 RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
 
-AC_CONFIG_FILES([autoconf/Make.common \
-Makefile \
+AC_CONFIG_FILES([Makefile \
 doc/Makefile \
 src/Makefile \
 src/rxvtlib.h \