Add a bunch of config files to .Sanitize, add some config stuff to Makefile.in

and configure.in.  Fix compilation of ../glob/tilde.o in Makefile.

diff --git a/readline/.Sanitize b/readline/.Sanitize
index e04dc0d648966fd686a7e709ad7830e316312bf8..176115f50ef31d1779d80b8a00080cf58366a36d 100644 (file)
--- 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 a3e16d781031016607126a9021b8354c68cb10a9..6e0794949d7160a59428bcc7e20c252912a0f55b 100644 (file)
--- 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 e56aab61c6ccc864d50c7c11002e6d880731b339..ffc54b4547480e84bacad8bd6a3306166ce99f6d 100644 (file)
--- 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