* Makefile.in: Clean up ../glob/tilde.c -> tilde.o path.

Clean up makefile a bit in general.

diff --git a/readline/ChangeLog b/readline/ChangeLog
index 92a0d12..10f1186 100644 (file)
--- a/readline/ChangeLog
+++ b/readline/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 21 18:48:08 1991  John Gilmore  (gnu at cygnus.com)
+
+       * Makefile.in:  Clean up ../glob/tilde.c -> tilde.o path.
+       Clean up makefile a bit in general.
+
 Thu Nov 21 14:40:29 1991  Stu Grossman  (grossman at cygnus.com)
 
        * readline.c:  Move config stuff to sysdep.h, use typedef dirent

diff --git a/readline/Makefile.in b/readline/Makefile.in
index 6e07949..26edca4 100644 (file)
--- a/readline/Makefile.in
+++ b/readline/Makefile.in
@@ -2,7 +2,6 @@
 # Makefile for readline and history libraries.                    #
 #                                                                 #
 
-
 srcdir = .
 ddestdir = /usr/local
 idestdir = /usr/local
@@ -12,11 +11,6 @@ INSTALL_FILE = $(INSTALL_PROG)
 #### host and target dependent Makefile fragments come in here.
 ##
 
-# Here is a rule for making .o files from .c files that doesn't force
-# the type of the machine (like -sun3) into the flags.
-.c.o:
-       $(CC) -c $(CFLAGS) $(LOCAL_INCLUDES) $(CPPFLAGS) $(READLINE_DEFINES) $<
-
 # Destination installation directory.  The libraries are copied to DESTDIR
 # when you do a `make install', and the header files to INCDIR/readline/*.h.
 DESTDIR = $(ddestdir)/lib
@@ -39,11 +33,10 @@ READLINE_DEFINES = $(TYPES) -DVI_MODE
 MINUS_G=-g
 DEBUG_FLAGS = $(MINUS_G)
 LDFLAGS = $(DEBUG_FLAGS) 
-CFLAGS = $(DEBUG_FLAGS) $(USG) -I.
+CFLAGS = $(DEBUG_FLAGS) $(USG) -I. $(LOCAL_INCLUDES) $(CPPFLAGS) $(READLINE_DEFINES)
 
 # A good alternative is gcc -traditional.
 #CC = gcc -traditional
-CC = cc
 RANLIB = /bin/ranlib
 AR = ar
 AR_FLAGS = clq
@@ -79,19 +72,21 @@ 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 ../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
+libreadline.a: readline.o history.o funmap.o keymaps.o 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
 
 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
-../glob/tilde.o:       ../glob/tilde.c
+
+tilde.o:       $(srcdir)/../glob/tilde.c
+       $(CC) -c $(CFLAGS) $(srcdir)/../glob/tilde.c
 
 libtest:       libreadline.a libtest.c
-               $(CC) -o libtest $(CFLAGS) $(CPPFLAGS) -L. libtest.c -lreadline -ltermcap
+       $(CC) -o libtest $(CFLAGS) $(CPPFLAGS) -L. libtest.c -lreadline -ltermcap
 
 readline: readline.c history.o keymaps.o funmap.o readline.h chardefs.h vi_mode.o
        $(CC) $(CFLAGS) $(CPPFLAGS) $(READLINE_DEFINES) \