projects / packages / compat-ncurses5.git / blame
| Commit | Line | Data |
|---|---|---|
| 9a82147f JB |
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 | |
| 3 | @@ -83,7 +83,7 @@ | |
| 4 | } | |
| 5 | } | |
| 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 | |
| 9 | } | |
| 10 | function sharedlinks(directory) { | |
| 11 | if ( ShlibVer != "auto" && ShlibVer != "cygdll" ) { | |
| a1a1cfd0 | 12 | diff -Nur ncurses-5.5.orig/progs/Makefile.in ncurses-5.5.linking/progs/Makefile.in |
| 7cb2b66c | 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 | |
| fcf043e7 | 15 | @@ -100,7 +100,8 @@ |
| a1a1cfd0 | 16 | LD = @LD@ |
| 17 | LINK = @LINK_PROGS@ $(LIBTOOL_LINK) $(CC) | |
| 18 | LDFLAGS = @EXTRA_LDFLAGS@ \ | |
| fcf043e7 | 19 | - @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ |
| f6ba453e | 20 | + @LDFLAGS@ @LD_MODEL@ |
| fcf043e7 | 21 | +LIBS = @TICS_ARGS@ @TINFO_ARGS@ @LIBS@ |
| a1a1cfd0 | 22 | |
| 23 | LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL) | |
| 24 | LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL) | |
| 25 | @@ -207,40 +208,40 @@ | |
| 26 | $(MODEL)/dump_entry$o | |
| 27 | ||
| 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 $@ | |
| 31 | ||
| 32 | DEPS_TOE = \ | |
| 33 | $(MODEL)/toe$o \ | |
| 34 | $(MODEL)/dump_entry$o | |
| 35 | ||
| 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 $@ | |
| 39 | ||
| 40 | DEPS_CLEAR = \ | |
| 41 | $(MODEL)/clear$o | |
| 42 | ||
| 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 $@ | |
| 46 | ||
| 47 | DEPS_TPUT = \ | |
| 48 | $(MODEL)/tput$o | |
| 49 | ||
| 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 $@ | |
| 53 | ||
| 54 | DEPS_INFOCMP = \ | |
| 55 | $(MODEL)/infocmp$o \ | |
| 56 | $(MODEL)/dump_entry$o | |
| 57 | ||
| 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 $@ | |
| 61 | ||
| 62 | DEPS_TSET = \ | |
| 63 | $(MODEL)/tset$o \ | |
| 64 | $(MODEL)/dump_entry$o | |
| 65 | ||
| 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 $@ | |
| 69 | ||
| 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 | |
| 7cb2b66c | 74 | +++ ncurses-5.5.linking/tack/Makefile.in 2006-08-05 18:51:31.000000000 +0200 |
| fcf043e7 | 75 | @@ -95,7 +95,8 @@ |
| a1a1cfd0 | 76 | LD = @LD@ |
| 77 | LINK = @LINK_PROGS@ $(LIBTOOL_LINK) $(CC) | |
| 78 | LDFLAGS = @EXTRA_LDFLAGS@ \ | |
| fcf043e7 | 79 | - @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ |
| f6ba453e | 80 | + @LDFLAGS@ @LD_MODEL@ |
| fcf043e7 | 81 | +LIBS = @TICS_ARGS@ @TINFO_ARGS@ @LIBS@ |
| a1a1cfd0 | 82 | |
| 83 | LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL) | |
| 84 | LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL) | |
| fcf043e7 | 85 | @@ -166,7 +167,7 @@ |
| a1a1cfd0 | 86 | $(MODEL)/tack$o |
| 87 | ||
| fcf043e7 | 88 | tack$x: $(DEPS_TACK) @NCURSES_TREE@$(DEPS_CURSES) |
| a1a1cfd0 | 89 | - @ECHO_LINK@ $(LINK) $(DEPS_TACK) $(LDFLAGS_DEFAULT) -o $@ |
| 7cb2b66c | 90 | + @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TACK) $(LIBS) -o $@ |
| a1a1cfd0 | 91 | |
| 92 | # | |
| 93 | # Utility productions start here | |
| fcf043e7 | 94 |