--- rxvt-unicode/src/Makefile.in	2004/02/22 08:09:36	1.12
+++ rxvt-unicode/src/Makefile.in	2004/03/03 04:07:52	1.14
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.12 2004/02/22 08:09:36 pcg Exp $
+# $Id: Makefile.in,v 1.14 2004/03/03 04:07:52 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
@@ -52,11 +50,8 @@
 
 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 \
@@ -107,25 +102,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)
 
@@ -156,12 +155,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)
@@ -187,7 +183,7 @@
 
 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