--- rxvt-unicode/src/Makefile.in	2006/01/16 15:02:06	1.45
+++ rxvt-unicode/src/Makefile.in	2006/01/17 10:14:26	1.50
@@ -1,4 +1,47 @@
-@MCOMMON@
+
+DATE=@DATE@
+VERSION=@VERSION@
+RXVTNAME=@RXVTNAME@
+SHELL = /bin/sh
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+libdir = @libdir@
+includedir = @includedir@
+man1dir = @mandir@/man1
+man1ext = 1
+man3dir = @mandir@/man3
+man3ext = 3
+man7dir = @mandir@/man7
+man7ext = 7
+CC = @CC@
+CXX = @CXX@
+CPP = @CPP@
+MV = @MV@
+RM = @RM@
+RMF = @RM@ -f
+CP = @CP@
+LN = @LN@
+SED = @SED@
+AWK = @AWK@
+ECHO = @ECHO@
+CMP = @CMP@
+TBL = @TBL@
+PERL = @PERL@
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL@ -m 755
+INSTALL_DATA = @INSTALL@ -m 644
+CXXFLAGS = @CXXFLAGS@ 
+CPPFLAGS = @CPPFLAGS@ @XPM_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+DEFS = @DEFS@
+LIBS = @LIBS@
+DINCLUDE = @DINCLUDE@
+DLIB = @DLIB@
+XINC = @X_CFLAGS@ @XPM_CFLAGS@
+XLIB = @X_LIBS@ @XPM_LIBS@ -lX11 @X_EXTRA_LIBS@
+COMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEBUG) $(DINCLUDE) $(XINC) -I$(basedir) -I$(srcdir) -I.
+LINK = @LINKER@ $(LDFLAGS)
 
 LINT = lint -DNARROWPROTO=1 $(XINC) -chapbxz
 
@@ -21,7 +64,7 @@
 
 COMMON = \
         command.o rxvtfont.o init.o logging.o main.o misc.o netdisp.o      \
-	ptytty.o screen.o \ scrollbar.o scrollbar-next.o scrollbar-rxvt.o  \
+	ptytty.o screen.o scrollbar.o scrollbar-next.o scrollbar-rxvt.o    \
 	scrollbar-xterm.o scrollbar-plain.o xdefaults.o xpm.o encoding.o   \
 	rxvttoolkit.o rxvtutil.o iom.o keyboard.o @PERL_O@
 
@@ -31,7 +74,6 @@
 RXVT_BINNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)$(EXEEXT)
 RXVTC_BINNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)c$(EXEEXT)
 RXVTD_BINNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)d$(EXEEXT)
-RXVT_OLDNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)-old$(EXEEXT)
 
 #
 # Distribution variables
@@ -153,7 +195,7 @@
 keyboard.o: command.h
 logging.o: ../config.h rxvt.h rxvtlib.h ptytty.h feature.h optinc.h
 logging.o: encoding.h rxvtfont.h rxvtutil.h rxvttoolkit.h iom.h iom_conf.h
-logging.o: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h logging.h
+logging.o: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
 main.o: ../config.h rxvt.h rxvtlib.h ptytty.h feature.h optinc.h encoding.h
 main.o: rxvtfont.h rxvtutil.h rxvttoolkit.h iom.h iom_conf.h callback.h
 main.o: salloc.h rxvtperl.h hookinc.h rsinc.h keyboard.h
@@ -248,7 +290,7 @@
 keyboard.lo: command.h
 logging.lo: ../config.h rxvt.h rxvtlib.h ptytty.h feature.h optinc.h
 logging.lo: encoding.h rxvtfont.h rxvtutil.h rxvttoolkit.h iom.h iom_conf.h
-logging.lo: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h logging.h
+logging.lo: callback.h salloc.h rxvtperl.h hookinc.h rsinc.h
 main.lo: ../config.h rxvt.h rxvtlib.h ptytty.h feature.h optinc.h encoding.h
 main.lo: rxvtfont.h rxvtutil.h rxvttoolkit.h iom.h iom_conf.h callback.h
 main.lo: salloc.h rxvtperl.h hookinc.h rsinc.h keyboard.h