From: ayin <ayin>
Date: Fri, 28 Dec 2007 20:57:52 +0000 (+0000)
Subject: Remove leftovers of librxvt.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=617e9e5e8fded1462a50f5a0df4980cd02f001c6;p=dana%2Furxvt.git

Remove leftovers of librxvt.
---

diff --git a/Makefile.in b/Makefile.in
index 5bc350c6..70f9cf19 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,7 +65,7 @@ Makefiles:
 cleandir: realclean
 
 distclean-local:
-	rm -f *~ config.cache config.h config.log config.status libtool
+	rm -f *~ config.cache config.h config.log config.status
 	rm -f Makefile
 
 distdir:
diff --git a/configure.ac b/configure.ac
index e352837f..57ec5be4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,11 +13,9 @@ dnl RXVT version
 changequote(, )dnl
 VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
-dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 changequote([, ])dnl
 AC_SUBST(VERSION)dnl
 AC_SUBST(DATE)dnl
-dnl AC_SUBST(LIBVERSION)dnl
 
 echo ""
 echo "configuring for rxvt $VERSION"
@@ -84,10 +82,6 @@ dnl# solaris needs to link libnsl and socket
 AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl,    gethostbyname, [LIBS="$LIBS -lnsl"])])
 AC_CHECK_FUNC(socket,        [], [AC_CHECK_LIB(socket, socket,        [LIBS="$LIBS -lsocket"])])
 
-dnl AC_ENABLE_SHARED(no)dnl#	libtool
-dnl AC_ENABLE_STATIC(yes)dnl#	libtool
-dnl AC_PROG_LIBTOOL()dnl#		libtool
-
 support_frills=yes
 support_inheritpixmap=yes
 support_fading=yes
@@ -117,12 +111,6 @@ dnl# --------------------------------------------------------------------------
 dnl# CHECKING COMMAND LINE OPTIONS
 dnl# --------------------------------------------------------------------------
 
-dnl if test "x$enable_shared" = xyes; then
-dnl     AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only)
-dnl     INSTALL_LIBRXVT=yes
-dnl fi
-dnl AC_SUBST(INSTALL_LIBRXVT)
-
 AC_ARG_ENABLE(everything,
   [  --enable-everything     enable standard non-multichoice features
                      NOTE: this option is order dependent],
diff --git a/src/Makefile.in b/src/Makefile.in
index 1d12bee4..321614f3 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -57,33 +57,18 @@ RXVTD_BINNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)d$(EXEEXT)
 .C.o:
 	$(COMPILE) -c $<
 
-#.C.lo:
-#	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-#
-#.s.lo:
-#	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-#
-#.S.lo:
-#	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
 #-------------------------------------------------------------------------
 
 all: allbin
 
 rxvt: rxvt.o $(COMMON)
 	$(LINK) -o $@ rxvt.o $(COMMON) $(LIBS) $(XLIB) @PERLLIB@
-#	$(LIBTOOL) --mode=link $(LINK) rxvt.o librxvt.la $(LIBS) $(XLIB) -o $@
 
 rxvtd: rxvtd.o $(COMMON) $(COMMON_DAEMON)
 	$(LINK) -o $@ rxvtd.o $(COMMON) $(COMMON_DAEMON) $(LIBS) $(XLIB) @PERLLIB@
-#	$(LIBTOOL) --mode=link $(LINK) rxvtd.o rxvtdaemon.o librxvt.la $(LIBS) $(XLIB) -o $@
 
 rxvtc: rxvtc.o $(COMMON_DAEMON) fdpass.o ev_cpp.o
 	$(LINK) -o $@ rxvtc.o $(COMMON_DAEMON) fdpass.o ev_cpp.o $(LIBS)
-#	$(LIBTOOL) --mode=link $(LINK) rxvtc.o rxvtdaemon.o $(LIBS) -o $@
-
-#librxvt.la: $(LIBOBJS)
-#	$(LIBTOOL) --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) -o $@
 
 #-------------------------------------------------------------------------
 
@@ -101,7 +86,7 @@ alldoc:
 
 clean:
 	rm -f rxvt rxvtc rxvtd perlxsi.c rxvtperl.C
-	rm -f *.o *.lo .libs/* librxvt.la tmpproto *.tmp
+	rm -f *.o tmpproto *.tmp
 
 distclean: clean
 	rm -f Makefile
@@ -137,7 +122,6 @@ rxvtperl.o: rxvtperl.C perlxsi.c
 
 depend:
 	makedepend -f Makefile.in -I. -I.. -I../libev -Y *.C >/dev/null 2>&1
-#	makedepend -f Makefile.in -I. -Y *.C -a -o .lo >/dev/null 2>&1
 
 # DO NOT DELETE: nice dependency list follows