diff --git a/readline/.Sanitize b/readline/.Sanitize index e04dc0d648..176115f50e 100644 --- a/readline/.Sanitize +++ b/readline/.Sanitize @@ -41,8 +41,11 @@ keymaps.c keymaps.h readline.c readline.h -sysdep-norm.h sysdep-aix.h +sysdep-irix.h +sysdep-newsos.h +sysdep-norm.h +sysdep-sco.h vi_keymap.c vi_mode.c diff --git a/readline/Makefile.in b/readline/Makefile.in index a3e16d7810..6e0794949d 100644 --- a/readline/Makefile.in +++ b/readline/Makefile.in @@ -79,7 +79,7 @@ history.info: history.texi readline.info: readline.texi inc-read.texi $(MAKEINFO) -o readline.info $(srcdir)/readline.texi -libreadline.a: readline.o history.o funmap.o keymaps.o tilde.o vi_mode.o +libreadline.a: readline.o history.o funmap.o keymaps.o ../glob/tilde.o vi_mode.o $(RM) -f libreadline.a $(AR) $(AR_FLAGS) libreadline.a readline.o history.o funmap.o keymaps.o tilde.o vi_mode.o $(RANLIB) libreadline.a @@ -88,8 +88,7 @@ readline.o: readline.h chardefs.h keymaps.h history.h readline.c vi_mode.c history.o: history.c history.h funmap.o: readline.h keymaps.o: emacs_keymap.c vi_keymap.c keymaps.h chardefs.h keymaps.c -tilde.o: ../glob/tilde.c - $(CC) -c $(CFLAGS) $(LOCAL_INCLUDES) $(CPPFLAGS) $(READLINE_DEFINES) ../glob/tilde.c +../glob/tilde.o: ../glob/tilde.c libtest: libreadline.a libtest.c $(CC) -o libtest $(CFLAGS) $(CPPFLAGS) -L. libtest.c -lreadline -ltermcap diff --git a/readline/configure.in b/readline/configure.in index e56aab61c6..ffc54b4547 100644 --- a/readline/configure.in +++ b/readline/configure.in @@ -14,7 +14,7 @@ files=sysdep-norm.h links=sysdep.h case "${host_os}" in -m88kbcs | sysv* | irix*) +m88kbcs | sysv*) host_makefile_frag=config/hm-sysv ;; @@ -24,11 +24,21 @@ aix*) rs6000) files=sysdep-aix.h esac ;; + +irix*) + host_makefile_frag=config/hm-sysv + files=sysdep-irix.h + ;; + +newsos*) + files=sysdep-newsos.h + ;; esac case "${host_vendor}" in sco* ) host_makefile_frag=config/hm-sco + files=sysdep-sco.h ;; esac