diff -urk.orig readline-4.3.orig/examples/Makefile.in readline-4.3/examples/Makefile.in
--- readline-4.3.orig/examples/Makefile.in 2002-01-24 18:16:05 +0300
+++ readline-4.3/examples/Makefile.in 2004-03-22 01:34:44 +0300
@@ -38,12 +38,10 @@
INCLUDES = -I$(srcdir) -I$(top_srcdir) -I..
CCFLAGS = $(DEFS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(INCLUDES) $(CFLAGS)
-LDFLAGS = -g -L.. @LDFLAGS@
+LDFLAGS = -L../shlib @LDFLAGS@
-READLINE_LIB = ../libreadline.a
-HISTORY_LIB = ../libhistory.a
-
-TERMCAP_LIB = @TERMCAP_LIB@
+READLINE_LIB = ../shlib/libreadline.so
+HISTORY_LIB = ../shlib/libhistory.so
.c.o:
${RM} $@
@@ -56,22 +54,22 @@
everything: all rlfe
rl: rl.o $(READLINE_LIB)
- $(CC) $(LDFLAGS) -o $@ rl.o -lreadline $(TERMCAP_LIB)
+ $(CC) $(LDFLAGS) -o $@ rl.o -lreadline
rlcat: rlcat.o $(READLINE_LIB)
- $(CC) $(LDFLAGS) -o $@ rlcat.o -lreadline $(TERMCAP_LIB)
+ $(CC) $(LDFLAGS) -o $@ rlcat.o -lreadline
fileman: fileman.o $(READLINE_LIB)
- $(CC) $(LDFLAGS) -o $@ fileman.o -lreadline $(TERMCAP_LIB)
+ $(CC) $(LDFLAGS) -o $@ fileman.o -lreadline
rltest: rltest.o $(READLINE_LIB)
- $(CC) $(LDFLAGS) -o $@ rltest.o -lreadline $(TERMCAP_LIB)
+ $(CC) $(LDFLAGS) -o $@ rltest.o -lreadline
rlversion: rlversion.o $(READLINE_LIB)
- $(CC) $(LDFLAGS) -o $@ rlversion.o -lreadline $(TERMCAP_LIB)
+ $(CC) $(LDFLAGS) -o $@ rlversion.o -lreadline
histexamp: histexamp.o $(HISTORY_LIB)
- $(CC) $(LDFLAGS) -o $@ histexamp.o -lhistory $(TERMCAP_LIB)
+ $(CC) $(LDFLAGS) -o $@ histexamp.o -lhistory
clean mostlyclean:
$(RM) $(OBJECTS)
@@ -96,7 +94,7 @@
# Stuff for Per Bothner's `rlfe' program
rlfe: rlfe.o $(READLINE_LIB) $(HISTORY_LIB)
- $(CC) $(LDFLAGS) -o $@ rlfe.o -lreadline -lhistory ${TERMCAP_LIB}
+ $(CC) $(LDFLAGS) -o $@ rlfe.o -lreadline
rlfe.o: rlfe.c
diff -urk.orig readline-4.3.orig/Makefile.in readline-4.3/Makefile.in
--- readline-4.3.orig/Makefile.in 2002-01-24 18:15:24 +0300
+++ readline-4.3/Makefile.in 2004-03-22 01:31:15 +0300
@@ -64,8 +64,6 @@
DEFS = @DEFS@
LOCAL_DEFS = @LOCAL_DEFS@
-TERMCAP_LIB = @TERMCAP_LIB@
-
# For libraries which include headers from other libraries.
INCLUDES = -I. -I$(srcdir)
@@ -153,9 +151,6 @@
rm -f $@
$(CC) $(CCFLAGS) -DREADLINE_LIBRARY -c $(srcdir)/tilde.c
-readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.a
- $(CC) $(CCFLAGS) -o $@ ./examples/rl.c ./libreadline.a ${TERMCAP_LIB}
-
lint: force
$(MAKE) $(MFLAGS) CCFLAGS='$(GCC_LINT_CFLAGS)' static
@@ -182,15 +177,15 @@
shared: force
-test -d shlib || mkdir shlib
- -( cd shlib ; ${MAKE} ${MFLAGS} all )
+ ${MAKE} -C shlib ${MFLAGS} all
documentation: force
-test -d doc || mkdir doc
- -( cd doc && $(MAKE) $(MFLAGS) )
+ ${MAKE} -C doc ${MFLAGS} info
-examples: force
+examples: shared
-test -d examples || mkdir examples
- -(cd examples && ${MAKE} ${MFLAGS} all )
+ LD_LIBRARY_PATH="`pwd`/shlib" ${MAKE} -C examples ${MFLAGS} all
force:
diff -urk.orig readline-4.3.orig/shlib/Makefile.in readline-4.3/shlib/Makefile.in
--- readline-4.3.orig/shlib/Makefile.in 2002-01-24 18:15:02 +0300
+++ readline-4.3/shlib/Makefile.in 2004-03-22 01:31:15 +0300
@@ -58,6 +58,8 @@
DEFS = @DEFS@
LOCAL_DEFS = @LOCAL_DEFS@
+TERMCAP_LIB = @TERMCAP_LIB@
+
#
# These values are generated for configure by ${topdir}/support/shobj-conf.
# If your system is not supported by that script, but includes facilities for
@@ -123,12 +125,12 @@
ansi_stdlib.h tcap.h xmalloc.h rlprivate.h rlshell.h rlmbutil.h
SHARED_HISTOBJ = history.so histexpand.so histfile.so histsearch.so shell.so \
- mbutil.so
+ mbutil.so xmalloc.so
SHARED_TILDEOBJ = tilde.so
SHARED_OBJ = readline.so vi_mode.so funmap.so keymaps.so parens.so search.so \
rltty.so complete.so bind.so isearch.so display.so signals.so \
util.so kill.so undo.so macro.so input.so callback.so terminal.so \
- text.so nls.so misc.so xmalloc.so $(SHARED_HISTOBJ) $(SHARED_TILDEOBJ) \
+ text.so nls.so misc.so $(SHARED_TILDEOBJ) \
compat.so
##########################################################################
@@ -145,13 +147,15 @@
@echo "Please send the changes you made to bash-maintainers@gnu.org"
@echo "for inclusion in future bash and readline releases."
-$(SHARED_READLINE): $(SHARED_OBJ)
+$(SHARED_READLINE): $(SHARED_OBJ) $(SHARED_HISTORY)
$(RM) $@
- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS)
+ $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) -L. -lhistory ${TERMCAP_LIB} $(SHLIB_LIBS)
+ ln -sf $@ libreadline.so
-$(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so
+$(SHARED_HISTORY): $(SHARED_HISTOBJ)
$(RM) $@
- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(SHLIB_LIBS)
+ $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) $(SHLIB_LIBS)
+ ln -sf $@ libhistory.so
# Since tilde.c is shared between readline and bash, make sure we compile
# it with the right flags when it's built as part of readline
diff -urk.orig readline-4.3.orig/support/shobj-conf readline-4.3/support/shobj-conf
--- readline-4.3.orig/support/shobj-conf 2002-04-17 21:27:46 +0400
+++ readline-4.3/support/shobj-conf 2004-03-22 01:31:15 +0300
@@ -102,7 +102,7 @@
SHOBJ_LD='${CC}'
SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+# SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
;;
