--- rxvt-unicode/src/Makefile.in	2003/11/27 10:12:10	1.5
+++ rxvt-unicode/src/Makefile.in	2004/08/15 03:19:04	1.17
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.5 2003/11/27 10:12:10 pcg Exp $
+# $Id: Makefile.in,v 1.17 2004/08/15 03:19:04 root Exp $
 @MCOMMON@
 
 LINT = lint -DNARROWPROTO=1 $(XINC) -chapbxz
@@ -12,74 +12,59 @@
 thisdir = src
 MKDIR = @top_srcdir@/autoconf/mkinstalldirs
 
-SUPLIB = -lsupc++
-
 # for developers: the following debug options may be used
 #	-DDEBUG_CMD -DDEBUG_MAIN -DDEBUG_MENU -DDEBUG_MENUARROWS
 #	-DDEBUG_MENUBAR_STACKING -DDEBUG_MENU_LAYOUT -DDEBUG_RESOURCES
-#	-DDEBUG_SCREEN -DDEBUG_SEARCH_PATH -DDEBUG_SELECT -DDEBUG_SIZE
-#	-DDEBUG_TTY -DDEBUG_TTYMODE -DDEBUG_X
+#	-DDEBUG_SEARCH_PATH -DDEBUG_SIZE -DDEBUG_TTY -DDEBUG_TTYMODE
 DEBUG=-DDEBUG_STRICT @DEBUG@
 
 first_rule: all
 dummy:
 
-LIBSRCS = command.C defaultfont.C graphics.C grkelot.C init.C logging.C \
+LIBSRCS = command.C rxvtfont.C init.C logging.C \
 	main.C menubar.C misc.C netdisp.C ptytty.C screen.C scrollbar.C \
 	scrollbar-rxvt.C scrollbar-next.C scrollbar-xterm.C strings.C \
-	xdefaults.C xpm.C encoding.C rxvtcolor.C rxvtvec.C iom.C
+	xdefaults.C xpm.C encoding.C rxvttoolkit.C rxvtutil.C iom.C \
+	scrollbar-plain.C
 
 SRCS =  rxvt.C $(LIBSRCS)
 
-HDRS =	command.h defaultfont.h feature.h grkelot.h init.h logging.h \
-	menubar.h netdisp.h protos.h rxvt.h rxvtgrx.h version.h encoding.h \
-	rxvtvec.h iom.h
+HDRS =	command.h rxvtfont.h feature.h init.h logging.h \
+	menubar.h netdisp.h rxvt.h rxvtgrx.h version.h encoding.h \
+	rxvtutil.h iom.h iom_conf.h
 
 EXTRAHDRS = rxvtlib.h rxvtdaemon.h
 
-OBJS =	command.o defaultfont.o init.o graphics.o grkelot.o logging.o \
+OBJS =	command.o rxvtfont.o init.o logging.o \
 	main.o menubar.o misc.o netdisp.o ptytty.o screen.o \
-	scrollbar.o scrollbar-next.o scrollbar-rxvt.o scrollbar-xterm.o \
-	strings.o xdefaults.o xpm.o rxvt.o encoding.o rxvtcolor.o rxvtvec.o iom.o
-LIBOBJS = command.lo defaultfont.lo init.lo graphics.lo grkelot.lo logging.lo \
+	scrollbar.o scrollbar-next.o scrollbar-rxvt.o scrollbar-xterm.o scrollbar-plain.o \
+	strings.o xdefaults.o xpm.o rxvt.o encoding.o rxvttoolkit.o rxvtutil.o iom.o
+LIBOBJS = command.lo rxvtfont.lo init.lo logging.lo \
 	main.lo menubar.lo misc.lo netdisp.lo ptytty.lo screen.lo \
-	scrollbar.lo scrollbar-next.lo scrollbar-rxvt.lo scrollbar-xterm.lo \
-	strings.lo xdefaults.lo xpm.lo encoding.lo rxvt.lo rxvtcolor.lo rxvtvec.lo iom.lo
+	scrollbar.lo scrollbar-next.lo scrollbar-rxvt.lo scrollbar-xterm.lo scrollbar-plain.lo \
+	strings.lo xdefaults.lo xpm.lo encoding.lo rxvt.lo rxvttoolkit.lo rxvtutil.lo iom.lo
 
 LIBVERSION = @LIBVERSION@
 INSTALL_LIBRXVT = @INSTALL_LIBRXVT@
 
 RXVT_BASENAME=`$(ECHO) $(RXVTNAME)|$(SED) 's/$(EXEEXT)$$//'|$(SED) '$(transform)'`
 RXVT_BINNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)$(EXEEXT)
-RXVT_VERNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)-$(VERSION)$(EXEEXT)
 RXVTC_BINNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)c$(EXEEXT)
-RXVTC_VERNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)c-$(VERSION)$(EXEEXT)
 RXVTD_BINNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)d$(EXEEXT)
-RXVTD_VERNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)d-$(VERSION)$(EXEEXT)
 RXVT_OLDNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)-old$(EXEEXT)
 
-EXTPROS = command.extpro defaultfont.extpro graphics.extpro grkelot.extpro \
-	init.extpro logging.extpro main.extpro menubar.extpro misc.extpro \
-	netdisp.extpro ptytty.extpro screen.extpro scrollbar.extpro \
-	scrollbar-rxvt.extpro scrollbar-next.extpro scrollbar-xterm.extpro \
-	strings.extpro xdefaults.extpro xpm.extpro
-
-INTPROS = command.intpro defaultfont.intpro graphics.intpro grkelot.intpro \
-	init.intpro logging.intpro main.intpro menubar.intpro misc.intpro \
-	netdisp.intpro ptytty.intpro screen.intpro scrollbar.intpro \
-	scrollbar-rxvt.intpro scrollbar-next.intpro scrollbar-xterm.intpro \
-	strings.intpro xdefaults.intpro xpm.intpro
+INTPROS = rxvtfont.intpro logging.intpro main.intpro misc.intpro \
+	ptytty.intpro xpm.intpro
 
-DEPS =  rxvt.h rxvtlib.h ${basedir}/config.h feature.h .protos
+DEPS =  rxvt.h rxvtlib.h ${basedir}/config.h feature.h rxvttoolkit.h
 
 #
 # Distribution variables
 #
 
-DIST = $(HDRS) $(SRCS) Makefile.in gcc-Wall rxvtlib.h.in .indent.pro \
-	makeintprotos-awk makeextprotos-awk $(INTPROS) $(EXTPROS) .protos
+DIST = $(HDRS) $(SRCS) Makefile.in gcc-Wall rxvtlib.h.in $(INTPROS)
 
-.SUFFIXES:	.C .o .extpro .intpro .lo
+.SUFFIXES:	.C .o .intpro .lo
 
 #-------------------------------------------------------------------------
 # inference rules
@@ -101,39 +86,33 @@
 	@if $(CMP) -s $@ $@.tmp ; then : ; else $(ECHO) "$(AWK) -f $(srcdir)/makeintprotos-awk $< > $@"; $(CP) $@.tmp $@; fi
 	@$(RMF) $@.tmp
 
-.C.extpro:
-	@$(RMF) $@.tmp
-	@$(AWK) -f $(srcdir)/makeextprotos-awk $< > $@.tmp
-	@if $(CMP) -s $@ $@.tmp ; then : ; else $(ECHO) "$(AWK) -f $(srcdir)/makeextprotos-awk $< > $@"; $(CP) $@.tmp $@; fi
-	@$(RMF) $@.tmp
 #-------------------------------------------------------------------------
+
 all: allbin
 
 rxvt: version.h rxvt.o librxvt.la
-	$(LIBTOOL) --mode=link $(LINK) rxvt.o librxvt.la $(LIBS) $(XLIB) $(DLIB) $(SUPLIB) -o $@
+	$(LIBTOOL) --mode=link $(LINK) rxvt.o librxvt.la $(LIBS) $(XLIB) $(DLIB) -o $@
 
 rxvtd: version.h rxvtd.o librxvt.la rxvtdaemon.o
-	$(LIBTOOL) --mode=link $(LINK) rxvtd.o rxvtdaemon.o librxvt.la $(LIBS) $(XLIB) $(DLIB) $(SUPLIB) -o $@
+	$(LIBTOOL) --mode=link $(LINK) rxvtd.o rxvtdaemon.o librxvt.la $(LIBS) $(XLIB) $(DLIB) -o $@
 
 rxvtc: version.h rxvtc.o rxvtdaemon.o
-	$(LIBTOOL) --mode=link $(LINK) rxvtc.o rxvtdaemon.o $(LIBS) $(DLIB) $(SUPLIB) -o $@
-
-.protos: $(EXTPROS)
-	@$(RMF) .protos
-	date >.protos
+	$(LIBTOOL) --mode=link $(LINK) rxvtc.o rxvtdaemon.o $(LIBS) $(DLIB) -o $@
 
 librxvt.la: $(LIBOBJS)
-	$(LIBTOOL) --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) $(SUPLIB) -o $@
+	$(LIBTOOL) --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) -o $@
+
 #-------------------------------------------------------------------------
+
 tags: $(SRCS) $(HDRS) $(EXTRAHDRS)
 	ctags $(SRCS) $(HDRS) $(EXTRAHDRS)
 
-allbin: .protos rxvt rxvtd rxvtc
+allbin: rxvt rxvtd rxvtc
 
 alldoc:
 
 clean:
-	$(RMF) rxvt core a.out *.o *.lo *.bak *~ *.intpro *.extpro .libs/* librxvt.la tmpproto .protos *.tmp
+	$(RMF) rxvt rxvtc rxvtd core a.out *.o *.lo *.bak *~ *.intpro .libs/* librxvt.la tmpproto *.tmp
 
 realclean: clean
 	$(RMF) tags librxvt.h
@@ -155,12 +134,9 @@
 	$(RMF) $(RXVT_BINNAME)
 	$(RMF) $(RXVTC_BINNAME)
 	$(RMF) $(RXVTD_BINNAME)
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) rxvt  $(RXVT_VERNAME)
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) rxvtc $(RXVTC_VERNAME)
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) rxvtd $(RXVTD_VERNAME)
-	$(LN) $(RXVT_VERNAME)  $(RXVT_BINNAME)
-	$(LN) $(RXVTC_VERNAME) $(RXVTC_BINNAME)
-	$(LN) $(RXVTD_VERNAME) $(RXVTD_BINNAME)
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) rxvt  $(RXVT_BINNAME)
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) rxvtc $(RXVTC_BINNAME)
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) rxvtd $(RXVTD_BINNAME)
 
 uninstall:
 	@$(ECHO) $(RMF) $(RXVT_VERNAME)
@@ -177,65 +153,63 @@
 distdirs:
 	mkdir $(basedir)/../$(VERNAME)/$(thisdir)
 
-distcopy: .protos $(INTPROS)
+distcopy: $(INTPROS)
 	$(CP) -p $(DIST) $(basedir)/../$(VERNAME)/$(thisdir)
 
 # -----------------------------------------------------------------------
 # DO NOT DELETE: nice dependency list follows
 #
 
-defaultfont.h: encoding.h rxvtvec.h
-rxvtlib.h: rxvtcolor.h defaultfont.h
-rxvtdaemon.o:       rxvtdaemon.C	rxvtdaemon.h
-rxvtd.o:            rxvtd.C     $(DEPS) rxvtdaemon.h rxvtvec.h
-rxvtc.o:            rxvtc.C     $(DEPS) rxvtdaemon.h rxvtvec.h
-
-command.o:          command.C   $(DEPS) command.intpro	command.h version.h
-defaultfont.o:      defaultfont.C $(DEPS) defaultfont.intpro defaultfont.h
-graphics.o:         graphics.C  $(DEPS) graphics.intpro
-grkelot.o:          grkelot.C   $(DEPS) grkelot.intpro	grkelot.h
-init.o:             init.C      $(DEPS) init.intpro	init.h	defaultfont.h
+rxvtfont.h: encoding.h rxvtutil.h
+rxvtlib.h: rxvttoolkit.h rxvtfont.h
+rxvtdaemon.o:       rxvtdaemon.C $(DEPS) rxvtdaemon.h
+rxvtd.o:            rxvtd.C     $(DEPS) rxvtdaemon.h rxvtutil.h
+rxvtc.o:            rxvtc.C     $(DEPS) rxvtdaemon.h rxvtutil.h
+
+command.o:          command.C   $(DEPS) command.h version.h
+rxvtfont.o:         rxvtfont.C  $(DEPS) rxvtfont.h
+init.o:             init.C      $(DEPS) init.h	rxvtfont.h
 logging.o:          logging.C   $(DEPS) logging.intpro	logging.h
 main.o:             main.C      $(DEPS) main.intpro
-menubar.o:          menubar.C   $(DEPS) menubar.intpro	menubar.h version.h
+menubar.o:          menubar.C   $(DEPS) menubar.h version.h
 misc.o:             misc.C      $(DEPS) misc.intpro
-netdisp.o:          netdisp.C   $(DEPS) netdisp.intpro	netdisp.h
+netdisp.o:          netdisp.C   $(DEPS) netdisp.h
 ptytty.o:           ptytty.C    $(DEPS) ptytty.intpro
 rxvt.o:             rxvt.C      $(DEPS) 
-screen.o:           screen.C    $(DEPS) screen.intpro	defaultfont.h
-scrollbar.o:        scrollbar.C $(DEPS) scrollbar.intpro
-scrollbar-rxvt.o:   scrollbar-rxvt.C  $(DEPS) scrollbar-rxvt.intpro
-scrollbar-next.o:   scrollbar-next.C  $(DEPS) scrollbar-next.intpro
-scrollbar-xterm.o:  scrollbar-xterm.C $(DEPS) scrollbar-xterm.intpro
-strings.o:          strings.C   $(DEPS) strings.intpro
-xdefaults.o:        xdefaults.C $(DEPS) xdefaults.intpro	  version.h
+screen.o:           screen.C    $(DEPS) rxvtfont.h
+scrollbar.o:        scrollbar.C $(DEPS)
+scrollbar-rxvt.o:   scrollbar-rxvt.C  $(DEPS)
+scrollbar-next.o:   scrollbar-next.C  $(DEPS)
+scrollbar-xterm.o:  scrollbar-xterm.C $(DEPS)
+scrollbar-plain.o:  scrollbar-plain.C $(DEPS)
+strings.o:          strings.C   $(DEPS)
+xdefaults.o:        xdefaults.C $(DEPS) version.h
 xpm.o:              xpm.C       $(DEPS) xpm.intpro
 encoding.o:         encoding.C	$(DEPS) encoding.h
-rxvtcolor.o:        rxvtcolor.C	$(DEPS)
+rxvttoolkit.o:      rxvttoolkit.C	$(DEPS)
 iom.o:              iom.C	$(DEPS)	iom.h
 
-command.lo:         command.C   $(DEPS) command.intpro	command.h version.h
-defaultfont.lo:     defaultfont.C $(DEPS) defaultfont.intpro defaultfont.h encoding.h
-graphics.lo:        graphics.C  $(DEPS) graphics.intpro	defaultfont.h
-grkelot.lo:         grkelot.C   $(DEPS) grkelot.intpro	grkelot.h
+command.lo:         command.C   $(DEPS) version.h
+rxvtfont.lo:        rxvtfont.C  $(DEPS) rxvtfont.h encoding.h
 init.lo:            init.C      $(DEPS) init.intpro	init.h	
 logging.lo:         logging.C   $(DEPS) logging.intpro	logging.h
 main.lo:            main.C      $(DEPS) main.intpro
-menubar.lo:         menubar.C   $(DEPS) menubar.intpro	menubar.h version.h
+menubar.lo:         menubar.C   $(DEPS) version.h
 misc.lo:            misc.C      $(DEPS) misc.intpro
-netdisp.lo:         netdisp.C   $(DEPS) netdisp.intpro	netdisp.h
+netdisp.lo:         netdisp.C   $(DEPS) netdisp.h
 ptytty.lo:          ptytty.C    $(DEPS) ptytty.intpro
 rxvt.lo:            rxvt.C      $(DEPS) 
-screen.lo:          screen.C    $(DEPS) screen.intpro	defaultfont.h
-scrollbar.lo:       scrollbar.C $(DEPS) scrollbar.intpro
-scrollbar-rxvt.lo:  scrollbar-rxvt.C  $(DEPS) scrollbar-rxvt.intpro
-scrollbar-next.lo:  scrollbar-next.C  $(DEPS) scrollbar-next.intpro
-scrollbar-xterm.lo: scrollbar-xterm.C $(DEPS) scrollbar-xterm.intpro
-strings.lo:         strings.C   $(DEPS) strings.intpro
-xdefaults.lo:       xdefaults.C $(DEPS) xdefaults.intpro	  version.h
+screen.lo:          screen.C    $(DEPS) rxvtfont.h
+scrollbar.lo:       scrollbar.C $(DEPS)
+scrollbar-rxvt.lo:  scrollbar-rxvt.C  $(DEPS)
+scrollbar-next.lo:  scrollbar-next.C  $(DEPS)
+scrollbar-xterm.lo: scrollbar-xterm.C $(DEPS)
+scrollbar-plain.lo: scrollbar-plain.C $(DEPS)
+strings.lo:         strings.C   $(DEPS)
+xdefaults.lo:       xdefaults.C $(DEPS) version.h
 xpm.lo:             xpm.C       $(DEPS) xpm.intpro
 encoding.lo:        encoding.C	$(DEPS) encoding.h
-rxvtcolor.lo:       rxvtcolor.C	$(DEPS)
+rxvttoolkit.lo:     rxvttoolkit.C	$(DEPS)
 iom.lo:             iom.C	$(DEPS)	iom.h