1 diff -Nur ncurses-5.5.orig/mk-1st.awk ncurses-5.5.linking/mk-1st.awk
2 --- ncurses-5.5.orig/mk-1st.awk 2005-06-18 21:15:57.000000000 +0200
3 +++ ncurses-5.5.linking/mk-1st.awk 2006-08-05 18:50:18.000000000 +0200
7 if ( subset == "termlib" || subset == "termlib+ext_tinfo" ) {
8 - printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(TINFO_LIST) $(LDFLAGS)\n", OBJS
9 + printf "\t$(MK_SHARED_LIB) $(LDFLAGS) $(%s_OBJS) $(TINFO_LIST)\n", OBJS
11 - printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(SHLIB_LIST) $(LDFLAGS)\n", OBJS
12 + printf "\t$(MK_SHARED_LIB) $(LDFLAGS) $(%s_OBJS) $(SHLIB_LIST)\n", OBJS
16 diff -Nur ncurses-5.5.orig/progs/Makefile.in ncurses-5.5.linking/progs/Makefile.in
17 --- ncurses-5.5.orig/progs/Makefile.in 2006-08-05 18:50:12.000000000 +0200
18 +++ ncurses-5.5.linking/progs/Makefile.in 2006-08-05 18:50:21.000000000 +0200
21 LINK = @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
22 LDFLAGS = @EXTRA_LDFLAGS@ \
23 - @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
24 + @LDFLAGS@ @LD_MODEL@
25 +LIBS = @TINFO_ARGS@ @LIBS@
27 LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL)
28 LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
32 tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
33 - @ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_DEFAULT) -o $@
34 + @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TIC) $(LIBS) -o $@
40 toe$x: $(DEPS_TOE) $(DEPS_CURSES)
41 - @ECHO_LINK@ $(LINK) $(DEPS_TOE) $(LDFLAGS_DEFAULT) -o $@
42 + @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TOE) $(LIBS) -o $@
47 clear$x: $(DEPS_CLEAR) $(DEPS_CURSES)
48 - @ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_DEFAULT) -o $@
49 + @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_CLEAR) $(LIBS) -o $@
54 tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
55 - @ECHO_LINK@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_DEFAULT) -o $@
56 + @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TPUT) $(LIBS) -o $@
62 infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
63 - @ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_DEFAULT) -o $@
64 + @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_INFOCMP) $(LIBS) -o $@
70 tset$x: $(DEPS_TSET) $(DEPS_CURSES) transform.h
71 - @ECHO_LINK@ $(LINK) $(DEPS_TSET) $(LDFLAGS_DEFAULT) -o $@
72 + @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TSET) $(LIBS) -o $@
74 termsort.c: $(srcdir)/MKtermsort.sh
75 sh $(srcdir)/MKtermsort.sh $(AWK) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
76 diff -Nur ncurses-5.5.orig/tack/Makefile.in ncurses-5.5.linking/tack/Makefile.in
77 --- ncurses-5.5.orig/tack/Makefile.in 2005-06-19 01:01:59.000000000 +0200
78 +++ ncurses-5.5.linking/tack/Makefile.in 2006-08-05 18:51:31.000000000 +0200
81 LINK = @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
82 LDFLAGS = @EXTRA_LDFLAGS@ \
83 - @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
84 + @LDFLAGS@ @LD_MODEL@
85 +LIBS = @TINFO_ARGS@ @LIBS@
87 LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL)
88 LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
92 tack$x: $(DEPS_TACK) $(DEPS_CURSES)
93 - @ECHO_LINK@ $(LINK) $(DEPS_TACK) $(LDFLAGS_DEFAULT) -o $@
94 + @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TACK) $(LIBS) -o $@
97 # Utility productions start here