--- rxvt-unicode/src/Makefile.in	2004/02/09 07:11:49	1.11
+++ rxvt-unicode/src/Makefile.in	2004/03/01 01:06:46	1.13
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.11 2004/02/09 07:11:49 pcg Exp $
+# $Id: Makefile.in,v 1.13 2004/03/01 01:06:46 pcg Exp $
 @MCOMMON@
 
 LINT = lint -DNARROWPROTO=1 $(XINC) -chapbxz
@@ -12,8 +12,6 @@
 thisdir = src
 MKDIR = @top_srcdir@/autoconf/mkinstalldirs
 
-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
 #	-DDEBUG_MENUBAR_STACKING -DDEBUG_MENU_LAYOUT -DDEBUG_RESOURCES
@@ -24,7 +22,7 @@
 first_rule: all
 dummy:
 
-LIBSRCS = command.C defaultfont.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 rxvtstl.C iom.C \
@@ -32,17 +30,17 @@
 
 SRCS =  rxvt.C $(LIBSRCS)
 
-HDRS =	command.h defaultfont.h feature.h grkelot.h init.h logging.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 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 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 grkelot.lo logging.lo \
+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 scrollbar-plain.lo \
 	strings.lo xdefaults.lo xpm.lo encoding.lo rxvt.lo rxvtcolor.lo rxvtstl.lo iom.lo
@@ -59,13 +57,13 @@
 RXVTD_VERNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)d-$(VERSION)$(EXEEXT)
 RXVT_OLDNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)-old$(EXEEXT)
 
-EXTPROS = command.extpro defaultfont.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-plain.intpro \
 	strings.extpro xdefaults.extpro xpm.extpro
 
-INTPROS = command.intpro defaultfont.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-plain.intpro \
@@ -107,25 +105,29 @@
 	@$(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 $@
+	$(LIBTOOL) --mode=link $(LINK) rxvtc.o rxvtdaemon.o $(LIBS) $(DLIB) -o $@
 
 .protos: $(EXTPROS)
 	@$(RMF) .protos
 	date >.protos
 
 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)
 
@@ -187,13 +189,12 @@
 
 defaultfont.h: encoding.h rxvtstl.h
 rxvtlib.h: rxvtcolor.h defaultfont.h
-rxvtdaemon.o:       rxvtdaemon.C	rxvtdaemon.h
+rxvtdaemon.o:       rxvtdaemon.C $(DEPS) 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
-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
@@ -217,7 +218,6 @@
 
 command.lo:         command.C   $(DEPS) command.intpro	command.h version.h
 defaultfont.lo:     defaultfont.C $(DEPS) defaultfont.intpro defaultfont.h encoding.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