1 --- ncurses-5.6/mk-1st.awk.orig 2006-12-30 17:40:34.164755215 +0100
2 +++ ncurses-5.6/mk-1st.awk 2006-12-30 17:42:11.054276635 +0100
6 function make_shlib(objs, shlib_list) {
7 - printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(%s) $(LDFLAGS)\n", objs, shlib_list
8 + printf "\t$(MK_SHARED_LIB) $(LDFLAGS) $(%s_OBJS) $(%s)\n", objs, shlib_list
10 function sharedlinks(directory) {
11 if ( ShlibVer != "auto" && ShlibVer != "cygdll" ) {
12 diff -Nur ncurses-5.5.orig/progs/Makefile.in ncurses-5.5.linking/progs/Makefile.in
13 --- ncurses-5.5.orig/progs/Makefile.in 2006-08-05 18:50:12.000000000 +0200
14 +++ ncurses-5.5.linking/progs/Makefile.in 2006-08-05 18:50:21.000000000 +0200
17 LINK = @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
18 LDFLAGS = @EXTRA_LDFLAGS@ \
19 - @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
20 + @LDFLAGS@ @LD_MODEL@
21 +LIBS = @TINFO_ARGS@ @LIBS@
23 LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL)
24 LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
28 tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
29 - @ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_DEFAULT) -o $@
30 + @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TIC) $(LIBS) -o $@
36 toe$x: $(DEPS_TOE) $(DEPS_CURSES)
37 - @ECHO_LINK@ $(LINK) $(DEPS_TOE) $(LDFLAGS_DEFAULT) -o $@
38 + @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TOE) $(LIBS) -o $@
43 clear$x: $(DEPS_CLEAR) $(DEPS_CURSES)
44 - @ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_DEFAULT) -o $@
45 + @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_CLEAR) $(LIBS) -o $@
50 tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
51 - @ECHO_LINK@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_DEFAULT) -o $@
52 + @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TPUT) $(LIBS) -o $@
58 infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
59 - @ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_DEFAULT) -o $@
60 + @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_INFOCMP) $(LIBS) -o $@
66 tset$x: $(DEPS_TSET) $(DEPS_CURSES) transform.h
67 - @ECHO_LINK@ $(LINK) $(DEPS_TSET) $(LDFLAGS_DEFAULT) -o $@
68 + @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TSET) $(LIBS) -o $@
70 termsort.c: $(srcdir)/MKtermsort.sh
71 sh $(srcdir)/MKtermsort.sh $(AWK) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
72 diff -Nur ncurses-5.5.orig/tack/Makefile.in ncurses-5.5.linking/tack/Makefile.in
73 --- ncurses-5.5.orig/tack/Makefile.in 2005-06-19 01:01:59.000000000 +0200
74 +++ ncurses-5.5.linking/tack/Makefile.in 2006-08-05 18:51:31.000000000 +0200
77 LINK = @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
78 LDFLAGS = @EXTRA_LDFLAGS@ \
79 - @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
80 + @LDFLAGS@ @LD_MODEL@
81 +LIBS = @TINFO_ARGS@ @LIBS@
83 LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL)
84 LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
88 tack$x: $(DEPS_TACK) $(DEPS_CURSES)
89 - @ECHO_LINK@ $(LINK) $(DEPS_TACK) $(LDFLAGS_DEFAULT) -o $@
90 + @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TACK) $(LIBS) -o $@
93 # Utility productions start here