| @@ -1,61 +1,61 @@ | | | @@ -1,61 +1,61 @@ |
1 | $NetBSD: patch-ae,v 1.13 2007/11/21 23:33:14 minskim Exp $ | | 1 | $NetBSD: patch-ae,v 1.14 2009/02/23 12:35:46 wiz Exp $ |
2 | | | 2 | |
3 | --- Makefile.in.orig 2005-05-07 18:11:23.000000000 -0700 | | 3 | --- Makefile.in.orig 2009-01-06 17:03:14.000000000 +0000 |
4 | +++ Makefile.in | | 4 | +++ Makefile.in |
5 | @@ -18,6 +18,9 @@ | | 5 | @@ -18,6 +18,9 @@ |
6 | RL_LIBRARY_VERSION = @LIBVERSION@ | | 6 | RL_LIBRARY_VERSION = @LIBVERSION@ |
7 | RL_LIBRARY_NAME = readline | | 7 | RL_LIBRARY_NAME = readline |
8 | | | 8 | |
9 | +SHLIB_MAJOR = @SHLIB_MAJOR@ | | 9 | +SHLIB_MAJOR = @SHLIB_MAJOR@ |
10 | +SHLIB_MINOR = @SHLIB_MINOR@ | | 10 | +SHLIB_MINOR = @SHLIB_MINOR@ |
11 | + | | 11 | + |
12 | PACKAGE = @PACKAGE_NAME@ | | 12 | PACKAGE = @PACKAGE_NAME@ |
13 | VERSION = @PACKAGE_VERSION@ | | 13 | VERSION = @PACKAGE_VERSION@ |
14 | | | 14 | |
15 | @@ -72,6 +75,7 @@ CTAGS = ctags -tw | | 15 | @@ -74,6 +77,7 @@ CTAGS = ctags -tw |
16 | CFLAGS = @CFLAGS@ | | 16 | CFLAGS = @CFLAGS@ |
17 | LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"' | | 17 | LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"' |
18 | CPPFLAGS = @CPPFLAGS@ | | 18 | CPPFLAGS = @CPPFLAGS@ |
19 | +LDFLAGS = @LDFLAGS@ | | 19 | +LDFLAGS = @LDFLAGS@ |
20 | | | 20 | |
21 | DEFS = @DEFS@ @CROSS_COMPILE@ | | 21 | DEFS = @DEFS@ @CROSS_COMPILE@ |
22 | LOCAL_DEFS = @LOCAL_DEFS@ | | 22 | LOCAL_DEFS = @LOCAL_DEFS@ |
23 | @@ -94,9 +98,15 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT | | 23 | @@ -96,9 +100,15 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT |
24 | ${RM} $@ | | 24 | ${RM} $@ |
25 | $(CC) -c $(CCFLAGS) $< | | 25 | $(CC) -c $(CCFLAGS) $< |
26 | | | 26 | |
27 | +.SUFFIXES: .lo | | 27 | +.SUFFIXES: .lo |
28 | +.c.lo: | | 28 | +.c.lo: |
29 | + ${RM} $@ | | 29 | + ${RM} $@ |
30 | + $(LIBTOOL) --mode=compile $(CC) -c $(CCFLAGS) $< | | 30 | + $(LIBTOOL) --mode=compile $(CC) -c $(CCFLAGS) $< |
31 | + | | 31 | + |
32 | # The name of the main library target. | | 32 | # The name of the main library target. |
33 | LIBRARY_NAME = libreadline.a | | 33 | LIBRARY_NAME = libreadline.a |
34 | STATIC_LIBS = libreadline.a libhistory.a | | 34 | STATIC_LIBS = libreadline.a libhistory.a |
35 | +LIBTOOL_LIBS = libreadline.la libhistory.la | | 35 | +LIBTOOL_LIBS = libreadline.la libhistory.la |
36 | | | 36 | |
37 | # The C code source files for this library. | | 37 | # The C code source files for this library. |
38 | CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \ | | 38 | CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \ |
39 | @@ -145,6 +155,8 @@ INSTALL_TARGETS = @STATIC_INSTALL_TARGET | | 39 | @@ -147,6 +157,8 @@ INSTALL_TARGETS = @STATIC_INSTALL_TARGET |
40 | | | 40 | |
41 | all: $(TARGETS) | | 41 | all: $(TARGETS) |
42 | | | 42 | |
43 | +all-libtool: $(LIBTOOL_LIBS) | | 43 | +all-libtool: $(LIBTOOL_LIBS) |
44 | + | | 44 | + |
45 | everything: all examples | | 45 | everything: all examples |
46 | | | 46 | |
47 | static: $(STATIC_LIBS) | | 47 | static: $(STATIC_LIBS) |
48 | @@ -154,17 +166,33 @@ libreadline.a: $(OBJECTS) | | 48 | @@ -156,17 +168,33 @@ libreadline.a: $(OBJECTS) |
49 | $(AR) $(ARFLAGS) $@ $(OBJECTS) | | 49 | $(AR) $(ARFLAGS) $@ $(OBJECTS) |
50 | -test -n "$(RANLIB)" && $(RANLIB) $@ | | 50 | -test -n "$(RANLIB)" && $(RANLIB) $@ |
51 | | | 51 | |
52 | +libreadline.la: $(OBJECTS:.o=.lo) | | 52 | +libreadline.la: $(OBJECTS:.o=.lo) |
53 | + $(LIBTOOL) --mode=clean $(RM) $@ | | 53 | + $(LIBTOOL) --mode=clean $(RM) $@ |
54 | + $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS:.o=.lo) $(TERMCAP_LIB) \ | | 54 | + $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS:.o=.lo) $(TERMCAP_LIB) \ |
55 | + -rpath $(libdir) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR) \ | | 55 | + -rpath $(libdir) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR) \ |
56 | + $(LDFLAGS) | | 56 | + $(LDFLAGS) |
57 | + | | 57 | + |
58 | libhistory.a: $(HISTOBJ) xmalloc.o | | 58 | libhistory.a: $(HISTOBJ) xmalloc.o |
59 | $(RM) $@ | | 59 | $(RM) $@ |
60 | $(AR) $(ARFLAGS) $@ $(HISTOBJ) xmalloc.o | | 60 | $(AR) $(ARFLAGS) $@ $(HISTOBJ) xmalloc.o |
61 | -test -n "$(RANLIB)" && $(RANLIB) $@ | | 61 | -test -n "$(RANLIB)" && $(RANLIB) $@ |
| @@ -67,28 +67,28 @@ $NetBSD: patch-ae,v 1.13 2007/11/21 23:3 | | | @@ -67,28 +67,28 @@ $NetBSD: patch-ae,v 1.13 2007/11/21 23:3 |
67 | + $(LDFLAGS) | | 67 | + $(LDFLAGS) |
68 | + | | 68 | + |
69 | # Since tilde.c is shared between readline and bash, make sure we compile | | 69 | # Since tilde.c is shared between readline and bash, make sure we compile |
70 | # it with the right flags when it's built as part of readline | | 70 | # it with the right flags when it's built as part of readline |
71 | tilde.o: tilde.c | | 71 | tilde.o: tilde.c |
72 | rm -f $@ | | 72 | rm -f $@ |
73 | $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -c $(srcdir)/tilde.c | | 73 | $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -c $(srcdir)/tilde.c |
74 | | | 74 | |
75 | +tilde.lo: tilde.c | | 75 | +tilde.lo: tilde.c |
76 | + $(LIBTOOL) --mode=clean rm -f $@ | | 76 | + $(LIBTOOL) --mode=clean rm -f $@ |
77 | + $(LIBTOOL) --mode=compile $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -c $(srcdir)/tilde.c | | 77 | + $(LIBTOOL) --mode=compile $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -c $(srcdir)/tilde.c |
78 | + | | 78 | + |
79 | readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.a | | 79 | readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.a |
80 | $(CC) $(CCFLAGS) -o $@ ./examples/rl.c ./libreadline.a ${TERMCAP_LIB} | | 80 | $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -o $@ $(top_srcdir)/examples/rl.c ./libreadline.a ${TERMCAP_LIB} |
81 | | | 81 | |
82 | @@ -243,6 +271,12 @@ install-shared: installdirs install-head | | 82 | @@ -251,6 +279,12 @@ install-examples: installdirs install-he |
83 | uninstall-shared: maybe-uninstall-headers | | 83 | uninstall-examples: maybe-uninstall-headers |
84 | -( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall ) | | 84 | -( cd examples; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall ) |
85 | | | 85 | |
86 | +install-libtool: installdirs $(LIBTOOL_LIBS) install-headers install-doc | | 86 | +install-libtool: installdirs $(LIBTOOL_LIBS) install-headers install-doc |
87 | + -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libreadline.la | | 87 | + -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libreadline.la |
88 | + $(LIBTOOL) --mode=install $(INSTALL) libreadline.la $(DESTDIR)$(libdir) | | 88 | + $(LIBTOOL) --mode=install $(INSTALL) libreadline.la $(DESTDIR)$(libdir) |
89 | + -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libhistory.la | | 89 | + -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libhistory.la |
90 | + $(LIBTOOL) --mode=install $(INSTALL) libhistory.la $(DESTDIR)$(libdir) | | 90 | + $(LIBTOOL) --mode=install $(INSTALL) libhistory.la $(DESTDIR)$(libdir) |
91 | + | | 91 | + |
92 | install-doc: installdirs | | 92 | install-doc: installdirs |
93 | -( if test -d doc ; then \ | | 93 | -( if test -d doc ; then \ |
94 | cd doc && \ | | 94 | cd doc && \ |