diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2012-08-05 01:08:02 -0400 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2012-08-05 01:08:02 -0400 |
| commit | 49a26ec8e574bda2f6b8c809a30a471c7f274ff6 (patch) | |
| tree | 2d9a9eaa430b6fe47cb4f0d6f10507d9618eecae /src | |
| parent | 526bf441a7a6b68bfa39cca1115040444775e834 (diff) | |
| download | lynx-snapshots-49a26ec8e574bda2f6b8c809a30a471c7f274ff6.tar.gz | |
snapshot of project "lynx", label v2-8-8dev_12j
Diffstat (limited to 'src')
| -rw-r--r-- | src/LYMain.c | 4 | ||||
| -rw-r--r-- | src/makefile.in | 22 |
2 files changed, 17 insertions, 9 deletions
diff --git a/src/LYMain.c b/src/LYMain.c index 86ea5331..9528be2f 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYMain.c,v 1.237 2012/02/20 01:32:18 Kihara.Hideto Exp $ + * $LynxId: LYMain.c,v 1.238 2012/08/05 01:03:03 tom Exp $ */ #include <HTUtils.h> #include <HTTP.h> @@ -3128,7 +3128,7 @@ G)oto's" }, print_help_strings(table[j].name, table[j].help, value, FALSE); } first = TRUE; - for (j = 0;; j++) { + for (j = 0; j < TABLESIZE(table); j++) { found = FALSE; if ((name = index_to_restriction(j)) == 0) { break; diff --git a/src/makefile.in b/src/makefile.in index 91696721..79860e46 100644 --- a/src/makefile.in +++ b/src/makefile.in @@ -1,4 +1,4 @@ -# $LynxId: makefile.in,v 1.65 2012/02/23 09:42:34 tom Exp $ +# $LynxId: makefile.in,v 1.68 2012/08/04 13:15:18 tom Exp $ # template-makefile for Lynx src directory SHELL = @CONFIG_SHELL@ @@ -34,6 +34,8 @@ BUILD_CFLAGS = @BUILD_CFLAGS@ BUILD_CPPFLAGS = @BUILD_CPPFLAGS@ @DEFS@ BUILD_EXEEXT = @BUILD_EXEEXT@ +MAKE_RECUR = $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" + YACC = @YACC@ WINDRES = @WINDRES@ @@ -103,7 +105,7 @@ all: lynx$x lynx$x: message do_chartrans_stuff $(top_builddir)/LYHelp.h $(OBJS) $(WWWLIB) @echo "Linking and creating Lynx executable" - $(CC) $(CC_OPTS) $(LDFLAGS) -o $@ $(OBJS) $(WWWLIB) $(LDFLAGS) $(LIBS) $(INTLLIB) + $(CC) $(CC_OPTS) $(LDFLAGS) -o $@ $(OBJS) $(WWWLIB) $(LIBS) $(INTLLIB) @echo "Copying Lynx executable into top-level directory" rm -f $(top_builddir)/$@ cp $@ $(top_builddir)/ @@ -113,7 +115,7 @@ message: @echo "Compiling Lynx sources" do_chartrans_stuff: - -cd chrtrans && $(MAKE) \ + -cd chrtrans && $(MAKE_RECUR) \ SITE_DEFS="$(SITE_DEFS)" \ BUILD_CFLAGS="$(BUILD_CFLAGS)" \ BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \ @@ -126,7 +128,7 @@ lint: clean: rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS test_* - cd chrtrans && $(MAKE) clean + cd chrtrans && $(MAKE_RECUR) clean tags: $(CTAGS) *.[ch] @@ -170,9 +172,11 @@ TABLES= \ $(CHRTR)cp775_uni.h \ $(CHRTR)cp850_uni.h \ $(CHRTR)cp852_uni.h \ + $(CHRTR)cp857_uni.h \ $(CHRTR)cp862_uni.h \ $(CHRTR)cp864_uni.h \ $(CHRTR)cp866_uni.h \ + $(CHRTR)cp866u_uni.h \ $(CHRTR)cp869_uni.h \ $(CHRTR)def7_uni.h \ $(CHRTR)dmcs_uni.h \ @@ -187,18 +191,22 @@ TABLES= \ $(CHRTR)iso08_uni.h \ $(CHRTR)iso09_uni.h \ $(CHRTR)iso10_uni.h \ + $(CHRTR)iso13_uni.h \ + $(CHRTR)iso14_uni.h \ $(CHRTR)iso15_uni.h \ $(CHRTR)koi8r_uni.h \ + $(CHRTR)koi8u_uni.h \ $(CHRTR)mac_uni.h \ - $(CHRTR)mnem_suni.h \ $(CHRTR)mnem2_suni.h \ + $(CHRTR)mnem_suni.h \ $(CHRTR)next_uni.h \ + $(CHRTR)pt154_uni.h \ $(CHRTR)rfc_suni.h \ $(CHRTR)utf8_uni.h \ $(CHRTR)viscii_uni.h $(TABLES): - -cd chrtrans && $(MAKE) tables + -cd chrtrans && $(MAKE_RECUR) tables UCdomap$o : UCdomap.c \ chrtrans/UCkd.h \ @@ -207,7 +215,7 @@ UCdomap$o : UCdomap.c \ UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h chrtrans/makeuctb$(BUILD_EXEEXT): - cd chrtrans; make makeuctb$(BUILD_EXEEXT) + cd chrtrans && $(MAKE_RECUR) makeuctb$(BUILD_EXEEXT) UCAux$o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h LYCookie$o : $(top_srcdir)/userdefs.h |