--- rxvt-unicode/src/Makefile.in	2003/11/24 17:28:08	1.1
+++ rxvt-unicode/src/Makefile.in	2004/02/22 08:09:36	1.12
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.1 2003/11/24 17:28:08 pcg Exp $
+# $Id: Makefile.in,v 1.12 2004/02/22 08:09:36 pcg Exp $
 @MCOMMON@
 
 LINT = lint -DNARROWPROTO=1 $(XINC) -chapbxz
@@ -12,7 +12,7 @@
 thisdir = src
 MKDIR = @top_srcdir@/autoconf/mkinstalldirs
 
-SUPLIB = -lsupc++
+SUPLIB = -fno-exceptions -lsupc++ # TODO: only for g++
 
 # for developers: the following debug options may be used
 #	-DDEBUG_CMD -DDEBUG_MAIN -DDEBUG_MENU -DDEBUG_MENUARROWS
@@ -24,26 +24,28 @@
 first_rule: all
 dummy:
 
-LIBSRCS = command.C defaultfont.C graphics.C grkelot.C init.C logging.C \
+LIBSRCS = command.C defaultfont.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
+	xdefaults.C xpm.C encoding.C rxvtcolor.C rxvtstl.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
+HDRS =	command.h defaultfont.h feature.h init.h logging.h \
+	menubar.h netdisp.h protos.h rxvt.h rxvtgrx.h version.h encoding.h \
+	rxvtstl.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 defaultfont.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
-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 rxvtcolor.o rxvtstl.o iom.o
+LIBOBJS = command.lo defaultfont.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
+	scrollbar.lo scrollbar-next.lo scrollbar-rxvt.lo scrollbar-xterm.lo scrollbar-plain.lo \
+	strings.lo xdefaults.lo xpm.lo encoding.lo rxvt.lo rxvtcolor.lo rxvtstl.lo iom.lo
 
 LIBVERSION = @LIBVERSION@
 INSTALL_LIBRXVT = @INSTALL_LIBRXVT@
@@ -51,21 +53,25 @@
 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 \
+EXTPROS = command.extpro defaultfont.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 \
+	scrollbar-rxvt.extpro scrollbar-next.extpro scrollbar-xterm.extpro scrollbar-plain.intpro \
 	strings.extpro xdefaults.extpro xpm.extpro
 
-INTPROS = command.intpro defaultfont.intpro graphics.intpro grkelot.intpro \
+INTPROS = command.intpro defaultfont.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 \
+	scrollbar-rxvt.intpro scrollbar-next.intpro scrollbar-xterm.intpro scrollbar-plain.intpro \
 	strings.intpro xdefaults.intpro xpm.intpro
 
-DEPS =  rxvt.h rxvtlib.h ${basedir}/config.h feature.h .protos
+DEPS =  rxvt.h rxvtlib.h ${basedir}/config.h feature.h rxvtcolor.h .protos
 
 #
 # Distribution variables
@@ -107,8 +113,8 @@
 rxvt: version.h rxvt.o librxvt.la
 	$(LIBTOOL) --mode=link $(LINK) rxvt.o librxvt.la $(LIBS) $(XLIB) $(DLIB) $(SUPLIB) -o $@
 
-rxvtd: version.h rxvtd.o librxvt.la iom.o rxvtdaemon.o
-	$(LIBTOOL) --mode=link $(LINK) rxvtd.o rxvtdaemon.o iom.o librxvt.la $(LIBS) $(XLIB) $(DLIB) $(SUPLIB) -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 $@
 
 rxvtc: version.h rxvtc.o rxvtdaemon.o
 	$(LIBTOOL) --mode=link $(LINK) rxvtc.o rxvtdaemon.o $(LIBS) $(DLIB) $(SUPLIB) -o $@
@@ -128,7 +134,7 @@
 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 *.extpro .libs/* librxvt.la tmpproto .protos *.tmp
 
 realclean: clean
 	$(RMF) tags librxvt.h
@@ -147,16 +153,15 @@
 	    $(ECHO) "$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) librxvt.la $(DESTDIR)$(libdir)/librxvt.la"; \
 	    $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) librxvt.la $(DESTDIR)$(libdir)/librxvt.la; \
 	fi
-	@if test -f $(RXVT_BINNAME); then \
-	    $(ECHO) "$(RMF) $(RXVT_OLDNAME)"; \
-	    $(RMF) $(RXVT_OLDNAME); \
-	    $(ECHO) "$(MV) $(RXVT_BINNAME) $(RXVT_OLDNAME)"; \
-	    $(MV) $(RXVT_BINNAME) $(RXVT_OLDNAME); \
-	fi
-	@$(ECHO) "$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) rxvt $(RXVT_VERNAME)"
-	@$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) rxvt $(RXVT_VERNAME)
-	@$(ECHO) "$(LN) $(RXVT_VERNAME) $(RXVT_BINNAME)"
-	@$(LN) $(RXVT_VERNAME) $(RXVT_BINNAME)
+	$(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)
 
 uninstall:
 	@$(ECHO) $(RMF) $(RXVT_VERNAME)
@@ -180,13 +185,14 @@
 # DO NOT DELETE: nice dependency list follows
 #
 
-defaultfont.h: encoding.h rxvtvec.h
+defaultfont.h: encoding.h rxvtstl.h
 rxvtlib.h: rxvtcolor.h defaultfont.h
+rxvtdaemon.o:       rxvtdaemon.C	rxvtdaemon.h
+rxvtd.o:            rxvtd.C     $(DEPS) rxvtdaemon.h rxvtstl.h
+rxvtc.o:            rxvtc.C     $(DEPS) rxvtdaemon.h rxvtstl.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
 logging.o:          logging.C   $(DEPS) logging.intpro	logging.h
 main.o:             main.C      $(DEPS) main.intpro
@@ -195,22 +201,21 @@
 netdisp.o:          netdisp.C   $(DEPS) netdisp.intpro	netdisp.h
 ptytty.o:           ptytty.C    $(DEPS) ptytty.intpro
 rxvt.o:             rxvt.C      $(DEPS) 
-rxvtd.o:            rxvtd.C     $(DEPS) rxvtdaemon.h
 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
+scrollbar-plain.o:  scrollbar-plain.C $(DEPS) scrollbar-plain.intpro
 strings.o:          strings.C   $(DEPS) strings.intpro
 xdefaults.o:        xdefaults.C $(DEPS) xdefaults.intpro	  version.h
 xpm.o:              xpm.C       $(DEPS) xpm.intpro
 encoding.o:         encoding.C	$(DEPS) encoding.h
 rxvtcolor.o:        rxvtcolor.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
 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
@@ -224,12 +229,12 @@
 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
+scrollbar-plain.lo: scrollbar-plain.C $(DEPS) scrollbar-plain.intpro
 strings.lo:         strings.C   $(DEPS) strings.intpro
 xdefaults.lo:       xdefaults.C $(DEPS) xdefaults.intpro	  version.h
 xpm.lo:             xpm.C       $(DEPS) xpm.intpro
 encoding.lo:        encoding.C	$(DEPS) encoding.h
 rxvtcolor.lo:       rxvtcolor.C	$(DEPS)
+iom.lo:             iom.C	$(DEPS)	iom.h
 
-iom.o:              iom.C		iom.h
-rxvtdaemon.o:       rxvtdaemon.C	rxvtdaemon.h