diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2011-11-23 19:26:12 -0500 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2011-11-23 19:26:12 -0500 |
| commit | b1b0b2d7c8574132c39d819dc54522b4fe7e6df9 (patch) | |
| tree | 95f51da88feb690d1af90b057fc5ce62819d25de /shlib | |
| parent | cdd796540cf235ad4b5d4a892570aba697c7fb61 (diff) | |
| download | readline-b1b0b2d7c8574132c39d819dc54522b4fe7e6df9.tar.gz | |
Readline-6.2 import
Diffstat (limited to 'shlib')
| -rw-r--r-- | shlib/Makefile.in | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/shlib/Makefile.in b/shlib/Makefile.in index 61724e7..902a5ab 100644 --- a/shlib/Makefile.in +++ b/shlib/Makefile.in @@ -129,7 +129,7 @@ CSOURCES = $(topdir)/readline.c $(topdir)/funmap.c $(topdir)/keymaps.c \ $(topdir)/display.c $(topdir)/signals.c $(topdir)/emacs_keymap.c \ $(topdir)/vi_keymap.c $(topdir)/util.c $(topdir)/kill.c \ $(topdir)/undo.c $(topdir)/macro.c $(topdir)/input.c \ - $(topdir)/callback.c $(topdir)/terminal.c $(topdir)/xmalloc.c \ + $(topdir)/callback.c $(topdir)/terminal.c $(topdir)/xmalloc.c $(topdir)/xfree.c \ $(topdir)/history.c $(topdir)/histsearch.c $(topdir)/histexpand.c \ $(topdir)/histfile.c $(topdir)/nls.c $(topdir)/search.c \ $(topdir)/shell.c $(topdir)/savestring.c $(topdir)/tilde.c \ @@ -147,7 +147,7 @@ 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 xmalloc.so xfree.so $(SHARED_HISTOBJ) $(SHARED_TILDEOBJ) \ compat.so ########################################################################## @@ -168,9 +168,9 @@ $(SHARED_READLINE): $(SHARED_OBJ) $(RM) $@ $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS) -$(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so +$(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so xfree.so $(RM) $@ - $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(SHLIB_LIBS) + $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so $(SHLIB_LIBS) # 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 @@ -181,6 +181,7 @@ tilde.so: tilde.c installdirs: $(topdir)/support/mkdirs -$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(libdir) + -$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(bindir) install: installdirs $(SHLIB_STATUS) $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_HISTORY) @@ -316,6 +317,8 @@ vi_mode.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h vi_mode.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h vi_mode.so: $(topdir)/history.h $(topdir)/ansi_stdlib.h $(topdir)/tilde.h vi_mode.so: $(topdir)/rltypedefs.h +xfree.so: ${BUILD_DIR}/config.h +xfree.so: $(topdir)/ansi_stdlib.h xmalloc.so: ${BUILD_DIR}/config.h xmalloc.so: $(topdir)/ansi_stdlib.h @@ -373,6 +376,7 @@ tilde.so: $(topdir)/xmalloc.h undo.so: $(topdir)/xmalloc.h util.so: $(topdir)/xmalloc.h vi_mode.so: $(topdir)/xmalloc.h +xfree.so: $(topdir)/xmalloc.h xmalloc.so: $(topdir)/xmalloc.h complete.o: $(topdir)/rlmbutil.h @@ -414,6 +418,7 @@ tilde.so: $(topdir)/tilde.c undo.so: $(topdir)/undo.c util.so: $(topdir)/util.c vi_mode.so: $(topdir)/vi_mode.c +xfree.so: $(topdir)/xfree.c xmalloc.so: $(topdir)/xmalloc.c histexpand.so: $(topdir)/histexpand.c @@ -448,6 +453,7 @@ tilde.so: tilde.c undo.so: undo.c util.so: util.c vi_mode.so: vi_mode.c +xfree.so: xfree.c xmalloc.so: xmalloc.c histexpand.so: histexpand.c |