From da11cf325a02f2f2e9f778f98e0385a971f501eb Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Thu, 15 Sep 2005 18:25:37 +0200 Subject: [PATCH 01/52] Convert more bits from the .cvsignore files. Now cg-status doesn't list anything here. It might do in the future. --- .gitignore | 1 - config/.gitignore | 4 ++++ contrib/.gitignore | 1 + contrib/conv/.gitignore | 1 + contrib/lua/.gitignore | 1 + doc/man/.gitignore | 3 +++ doc/man/man1/.gitignore | 1 + po/.gitignore | 2 ++ src/intl/gettext/.gitignore | 3 +++ 9 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 config/.gitignore create mode 100644 contrib/.gitignore create mode 100644 contrib/conv/.gitignore create mode 100644 contrib/lua/.gitignore create mode 100644 doc/man/.gitignore create mode 100644 doc/man/man1/.gitignore create mode 100644 po/.gitignore create mode 100644 src/intl/gettext/.gitignore diff --git a/.gitignore b/.gitignore index 725642dc..a9d83d36 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,5 @@ stamp-h1 .deps elinks *.swp -*.html *.patch features.log diff --git a/config/.gitignore b/config/.gitignore new file mode 100644 index 00000000..f2ca53bf --- /dev/null +++ b/config/.gitignore @@ -0,0 +1,4 @@ +install-sh +missing +mkinstalldirs +depcomp diff --git a/contrib/.gitignore b/contrib/.gitignore new file mode 100644 index 00000000..ed7f59b7 --- /dev/null +++ b/contrib/.gitignore @@ -0,0 +1 @@ +elinks.spec diff --git a/contrib/conv/.gitignore b/contrib/conv/.gitignore new file mode 100644 index 00000000..43022620 --- /dev/null +++ b/contrib/conv/.gitignore @@ -0,0 +1 @@ +w3m2links.awk diff --git a/contrib/lua/.gitignore b/contrib/lua/.gitignore new file mode 100644 index 00000000..bfcf33cf --- /dev/null +++ b/contrib/lua/.gitignore @@ -0,0 +1 @@ +hooks.lua diff --git a/doc/man/.gitignore b/doc/man/.gitignore new file mode 100644 index 00000000..ab81ec23 --- /dev/null +++ b/doc/man/.gitignore @@ -0,0 +1,3 @@ +index.bt +manpage.links +manpage.refs diff --git a/doc/man/man1/.gitignore b/doc/man/man1/.gitignore new file mode 100644 index 00000000..d58cabe5 --- /dev/null +++ b/doc/man/man1/.gitignore @@ -0,0 +1 @@ +elinks.1 diff --git a/po/.gitignore b/po/.gitignore new file mode 100644 index 00000000..1499f881 --- /dev/null +++ b/po/.gitignore @@ -0,0 +1,2 @@ +*.gmo +elinks.pot diff --git a/src/intl/gettext/.gitignore b/src/intl/gettext/.gitignore new file mode 100644 index 00000000..0cef4408 --- /dev/null +++ b/src/intl/gettext/.gitignore @@ -0,0 +1,3 @@ +charset.alias +ref-add.sed +ref-del.sed From 206086636e57e8662f48d0d550bf458b6fc2a6b4 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Thu, 15 Sep 2005 18:27:10 +0200 Subject: [PATCH 02/52] pasky.or.cz GIT repo is only for developers. --- SITES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SITES b/SITES index da2c970c..778eb050 100644 --- a/SITES +++ b/SITES @@ -15,7 +15,7 @@ Cygwin binaries: GIT root: http://elinks.or.cz/elinks.git - git+ssh://pasky.or.cz/srv/git/elinks.git (master, DEPRECATED) + git+ssh://pasky.or.cz/srv/git/elinks.git (only for developers) Mailing list: http://elinks.or.cz/community.html#mailinglist From e54f78bf3f0f8f0df034fc1e2c17dcfd49e15923 Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Thu, 15 Sep 2005 18:29:59 +0200 Subject: [PATCH 03/52] Oops, missed the generated stuff in Unicode/. --- Unicode/.gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Unicode/.gitignore diff --git a/Unicode/.gitignore b/Unicode/.gitignore new file mode 100644 index 00000000..ea617a3a --- /dev/null +++ b/Unicode/.gitignore @@ -0,0 +1,4 @@ +Makefile +Makefile.in +.deps +*.swp From 7462f22635dd215ab24be9c6c26a84e6182c8f36 Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Thu, 15 Sep 2005 18:33:20 +0200 Subject: [PATCH 04/52] Remove now obsolete .cvsignore files. --- Unicode/.cvsignore | 4 ---- config/.cvsignore | 8 -------- contrib/.cvsignore | 5 ----- contrib/conv/.cvsignore | 5 ----- contrib/guile/.cvsignore | 5 ----- contrib/lua/.cvsignore | 2 -- contrib/perl/.cvsignore | 4 ---- contrib/ruby/.cvsignore | 1 - debian/.cvsignore | 11 ----------- doc/.cvsignore | 9 --------- doc/man/.cvsignore | 4 ---- doc/man/man1/.cvsignore | 6 ------ doc/man/man5/.cvsignore | 5 ----- doc/tools/.cvsignore | 4 ---- intl/.cvsignore | 3 --- po/.cvsignore | 6 ------ src/.cvsignore | 7 ------- src/bfu/.cvsignore | 4 ---- src/bookmarks/.cvsignore | 4 ---- src/bookmarks/backend/.cvsignore | 4 ---- src/cache/.cvsignore | 4 ---- src/config/.cvsignore | 4 ---- src/cookies/.cvsignore | 4 ---- src/dialogs/.cvsignore | 4 ---- src/document/.cvsignore | 4 ---- src/document/css/.cvsignore | 4 ---- src/document/dom/.cvsignore | 4 ---- src/document/html/.cvsignore | 4 ---- src/document/html/parser/.cvsignore | 4 ---- src/document/plain/.cvsignore | 4 ---- src/document/sgml/.cvsignore | 4 ---- src/document/sgml/html/.cvsignore | 4 ---- src/ecmascript/.cvsignore | 4 ---- src/ecmascript/spidermonkey/.cvsignore | 4 ---- src/encoding/.cvsignore | 4 ---- src/formhist/.cvsignore | 4 ---- src/globhist/.cvsignore | 4 ---- src/intl/.cvsignore | 8 -------- src/intl/gettext/.cvsignore | 7 ------- src/main/.cvsignore | 4 ---- src/mime/.cvsignore | 4 ---- src/mime/backend/.cvsignore | 4 ---- src/network/.cvsignore | 4 ---- src/network/ssl/.cvsignore | 4 ---- src/osdep/.cvsignore | 4 ---- src/osdep/beos/.cvsignore | 4 ---- src/osdep/os2/.cvsignore | 4 ---- src/osdep/riscos/.cvsignore | 4 ---- src/osdep/unix/.cvsignore | 4 ---- src/osdep/win32/.cvsignore | 4 ---- src/protocol/.cvsignore | 4 ---- src/protocol/auth/.cvsignore | 4 ---- src/protocol/bittorrent/.cvsignore | 4 ---- src/protocol/file/.cvsignore | 4 ---- src/protocol/finger/.cvsignore | 4 ---- src/protocol/ftp/.cvsignore | 4 ---- src/protocol/gopher/.cvsignore | 4 ---- src/protocol/http/.cvsignore | 4 ---- src/protocol/nntp/.cvsignore | 4 ---- src/protocol/rewrite/.cvsignore | 4 ---- src/protocol/smb/.cvsignore | 4 ---- src/scripting/.cvsignore | 4 ---- src/scripting/guile/.cvsignore | 4 ---- src/scripting/lua/.cvsignore | 4 ---- src/scripting/perl/.cvsignore | 4 ---- src/scripting/python/.cvsignore | 4 ---- src/scripting/ruby/.cvsignore | 4 ---- src/session/.cvsignore | 4 ---- src/terminal/.cvsignore | 4 ---- src/terminal/graphics/.cvsignore | 4 ---- src/terminal/text/.cvsignore | 4 ---- src/util/.cvsignore | 4 ---- src/viewer/.cvsignore | 4 ---- src/viewer/dump/.cvsignore | 4 ---- src/viewer/graphics/.cvsignore | 4 ---- src/viewer/text/.cvsignore | 4 ---- test/.cvsignore | 4 ---- 77 files changed, 336 deletions(-) delete mode 100644 Unicode/.cvsignore delete mode 100644 config/.cvsignore delete mode 100644 contrib/.cvsignore delete mode 100644 contrib/conv/.cvsignore delete mode 100644 contrib/guile/.cvsignore delete mode 100644 contrib/lua/.cvsignore delete mode 100644 contrib/perl/.cvsignore delete mode 100644 contrib/ruby/.cvsignore delete mode 100644 debian/.cvsignore delete mode 100644 doc/.cvsignore delete mode 100644 doc/man/.cvsignore delete mode 100644 doc/man/man1/.cvsignore delete mode 100644 doc/man/man5/.cvsignore delete mode 100644 doc/tools/.cvsignore delete mode 100644 intl/.cvsignore delete mode 100644 po/.cvsignore delete mode 100644 src/.cvsignore delete mode 100644 src/bfu/.cvsignore delete mode 100644 src/bookmarks/.cvsignore delete mode 100644 src/bookmarks/backend/.cvsignore delete mode 100644 src/cache/.cvsignore delete mode 100644 src/config/.cvsignore delete mode 100644 src/cookies/.cvsignore delete mode 100644 src/dialogs/.cvsignore delete mode 100644 src/document/.cvsignore delete mode 100644 src/document/css/.cvsignore delete mode 100644 src/document/dom/.cvsignore delete mode 100644 src/document/html/.cvsignore delete mode 100644 src/document/html/parser/.cvsignore delete mode 100644 src/document/plain/.cvsignore delete mode 100644 src/document/sgml/.cvsignore delete mode 100644 src/document/sgml/html/.cvsignore delete mode 100644 src/ecmascript/.cvsignore delete mode 100644 src/ecmascript/spidermonkey/.cvsignore delete mode 100644 src/encoding/.cvsignore delete mode 100644 src/formhist/.cvsignore delete mode 100644 src/globhist/.cvsignore delete mode 100644 src/intl/.cvsignore delete mode 100644 src/intl/gettext/.cvsignore delete mode 100644 src/main/.cvsignore delete mode 100644 src/mime/.cvsignore delete mode 100644 src/mime/backend/.cvsignore delete mode 100644 src/network/.cvsignore delete mode 100644 src/network/ssl/.cvsignore delete mode 100644 src/osdep/.cvsignore delete mode 100644 src/osdep/beos/.cvsignore delete mode 100644 src/osdep/os2/.cvsignore delete mode 100644 src/osdep/riscos/.cvsignore delete mode 100644 src/osdep/unix/.cvsignore delete mode 100644 src/osdep/win32/.cvsignore delete mode 100644 src/protocol/.cvsignore delete mode 100644 src/protocol/auth/.cvsignore delete mode 100644 src/protocol/bittorrent/.cvsignore delete mode 100644 src/protocol/file/.cvsignore delete mode 100644 src/protocol/finger/.cvsignore delete mode 100644 src/protocol/ftp/.cvsignore delete mode 100644 src/protocol/gopher/.cvsignore delete mode 100644 src/protocol/http/.cvsignore delete mode 100644 src/protocol/nntp/.cvsignore delete mode 100644 src/protocol/rewrite/.cvsignore delete mode 100644 src/protocol/smb/.cvsignore delete mode 100644 src/scripting/.cvsignore delete mode 100644 src/scripting/guile/.cvsignore delete mode 100644 src/scripting/lua/.cvsignore delete mode 100644 src/scripting/perl/.cvsignore delete mode 100644 src/scripting/python/.cvsignore delete mode 100644 src/scripting/ruby/.cvsignore delete mode 100644 src/session/.cvsignore delete mode 100644 src/terminal/.cvsignore delete mode 100644 src/terminal/graphics/.cvsignore delete mode 100644 src/terminal/text/.cvsignore delete mode 100644 src/util/.cvsignore delete mode 100644 src/viewer/.cvsignore delete mode 100644 src/viewer/dump/.cvsignore delete mode 100644 src/viewer/graphics/.cvsignore delete mode 100644 src/viewer/text/.cvsignore delete mode 100644 test/.cvsignore diff --git a/Unicode/.cvsignore b/Unicode/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/Unicode/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/config/.cvsignore b/config/.cvsignore deleted file mode 100644 index ad919704..00000000 --- a/config/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -Makefile -Makefile.in -install-sh -missing -mkinstalldirs -depcomp -.deps -*.swp diff --git a/contrib/.cvsignore b/contrib/.cvsignore deleted file mode 100644 index 15f43838..00000000 --- a/contrib/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile -Makefile.in -.deps -elinks.spec -*.swp diff --git a/contrib/conv/.cvsignore b/contrib/conv/.cvsignore deleted file mode 100644 index be1c0f9e..00000000 --- a/contrib/conv/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp -w3m2links.awk diff --git a/contrib/guile/.cvsignore b/contrib/guile/.cvsignore deleted file mode 100644 index 15f43838..00000000 --- a/contrib/guile/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile -Makefile.in -.deps -elinks.spec -*.swp diff --git a/contrib/lua/.cvsignore b/contrib/lua/.cvsignore deleted file mode 100644 index 4bbab60b..00000000 --- a/contrib/lua/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -hooks.lua -*.swp diff --git a/contrib/perl/.cvsignore b/contrib/perl/.cvsignore deleted file mode 100644 index ec5248bd..00000000 --- a/contrib/perl/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -*.swp -hooks.html -pod2htmd.tmp -pod2htmi.tmp diff --git a/contrib/ruby/.cvsignore b/contrib/ruby/.cvsignore deleted file mode 100644 index 1377554e..00000000 --- a/contrib/ruby/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/debian/.cvsignore b/debian/.cvsignore deleted file mode 100644 index 09d20dd2..00000000 --- a/debian/.cvsignore +++ /dev/null @@ -1,11 +0,0 @@ -*.swp -.deps -Makefile -Makefile.in -build-stamp -depcomp -elinks -elinks.postinst.debhelper -elinks.postrm.debhelper -elinks.substvars -files diff --git a/doc/.cvsignore b/doc/.cvsignore deleted file mode 100644 index 72ca4ee6..00000000 --- a/doc/.cvsignore +++ /dev/null @@ -1,9 +0,0 @@ -*.swp -Makefile -Makefile.in -html -perl.html -pod2htmd.tmp -pod2htmi.tmp -txt -xml diff --git a/doc/man/.cvsignore b/doc/man/.cvsignore deleted file mode 100644 index 508cb66f..00000000 --- a/doc/man/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -index.bt -*.swp diff --git a/doc/man/man1/.cvsignore b/doc/man/man1/.cvsignore deleted file mode 100644 index cc005bbe..00000000 --- a/doc/man/man1/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -elinks.1 -manpage.links -manpage.refs -*.swp diff --git a/doc/man/man5/.cvsignore b/doc/man/man5/.cvsignore deleted file mode 100644 index 59b2e364..00000000 --- a/doc/man/man5/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile -Makefile.in -manpage.links -manpage.refs -*.swp diff --git a/doc/tools/.cvsignore b/doc/tools/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/doc/tools/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/intl/.cvsignore b/intl/.cvsignore deleted file mode 100644 index 454f66d9..00000000 --- a/intl/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in -*.swp diff --git a/po/.cvsignore b/po/.cvsignore deleted file mode 100644 index f181b393..00000000 --- a/po/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -.deps -*.gmo -elinks.pot -*.swp diff --git a/src/.cvsignore b/src/.cvsignore deleted file mode 100644 index 1ea3cf72..00000000 --- a/src/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -Makefile -Makefile.in -.deps -elinks -*.swp -*.html -*.patch diff --git a/src/bfu/.cvsignore b/src/bfu/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/bfu/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/bookmarks/.cvsignore b/src/bookmarks/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/bookmarks/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/bookmarks/backend/.cvsignore b/src/bookmarks/backend/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/bookmarks/backend/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/cache/.cvsignore b/src/cache/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/cache/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/config/.cvsignore b/src/config/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/config/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/cookies/.cvsignore b/src/cookies/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/cookies/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/dialogs/.cvsignore b/src/dialogs/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/dialogs/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/document/.cvsignore b/src/document/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/document/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/document/css/.cvsignore b/src/document/css/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/document/css/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/document/dom/.cvsignore b/src/document/dom/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/document/dom/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/document/html/.cvsignore b/src/document/html/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/document/html/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/document/html/parser/.cvsignore b/src/document/html/parser/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/document/html/parser/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/document/plain/.cvsignore b/src/document/plain/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/document/plain/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/document/sgml/.cvsignore b/src/document/sgml/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/document/sgml/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/document/sgml/html/.cvsignore b/src/document/sgml/html/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/document/sgml/html/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/ecmascript/.cvsignore b/src/ecmascript/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/ecmascript/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/ecmascript/spidermonkey/.cvsignore b/src/ecmascript/spidermonkey/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/ecmascript/spidermonkey/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/encoding/.cvsignore b/src/encoding/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/encoding/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/formhist/.cvsignore b/src/formhist/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/formhist/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/globhist/.cvsignore b/src/globhist/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/globhist/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/intl/.cvsignore b/src/intl/.cvsignore deleted file mode 100644 index b910656e..00000000 --- a/src/intl/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -Makefile -Makefile.in -.deps -language.inc -lang_defs.h -stamp-intl -lng_*.inc -*.swp diff --git a/src/intl/gettext/.cvsignore b/src/intl/gettext/.cvsignore deleted file mode 100644 index 47c2a76e..00000000 --- a/src/intl/gettext/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -Makefile -Makefile.in -.deps -charset.alias -ref-add.sed -ref-del.sed -*.swp diff --git a/src/main/.cvsignore b/src/main/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/main/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/mime/.cvsignore b/src/mime/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/mime/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/mime/backend/.cvsignore b/src/mime/backend/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/mime/backend/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/network/.cvsignore b/src/network/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/network/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/network/ssl/.cvsignore b/src/network/ssl/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/network/ssl/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/osdep/.cvsignore b/src/osdep/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/osdep/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/osdep/beos/.cvsignore b/src/osdep/beos/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/osdep/beos/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/osdep/os2/.cvsignore b/src/osdep/os2/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/osdep/os2/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/osdep/riscos/.cvsignore b/src/osdep/riscos/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/osdep/riscos/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/osdep/unix/.cvsignore b/src/osdep/unix/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/osdep/unix/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/osdep/win32/.cvsignore b/src/osdep/win32/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/osdep/win32/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/protocol/.cvsignore b/src/protocol/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/protocol/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/protocol/auth/.cvsignore b/src/protocol/auth/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/protocol/auth/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/protocol/bittorrent/.cvsignore b/src/protocol/bittorrent/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/protocol/bittorrent/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/protocol/file/.cvsignore b/src/protocol/file/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/protocol/file/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/protocol/finger/.cvsignore b/src/protocol/finger/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/protocol/finger/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/protocol/ftp/.cvsignore b/src/protocol/ftp/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/protocol/ftp/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/protocol/gopher/.cvsignore b/src/protocol/gopher/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/protocol/gopher/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/protocol/http/.cvsignore b/src/protocol/http/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/protocol/http/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/protocol/nntp/.cvsignore b/src/protocol/nntp/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/protocol/nntp/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/protocol/rewrite/.cvsignore b/src/protocol/rewrite/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/protocol/rewrite/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/protocol/smb/.cvsignore b/src/protocol/smb/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/protocol/smb/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/scripting/.cvsignore b/src/scripting/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/scripting/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/scripting/guile/.cvsignore b/src/scripting/guile/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/scripting/guile/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/scripting/lua/.cvsignore b/src/scripting/lua/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/scripting/lua/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/scripting/perl/.cvsignore b/src/scripting/perl/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/scripting/perl/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/scripting/python/.cvsignore b/src/scripting/python/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/scripting/python/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/scripting/ruby/.cvsignore b/src/scripting/ruby/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/scripting/ruby/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/session/.cvsignore b/src/session/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/session/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/terminal/.cvsignore b/src/terminal/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/terminal/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/terminal/graphics/.cvsignore b/src/terminal/graphics/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/terminal/graphics/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/terminal/text/.cvsignore b/src/terminal/text/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/terminal/text/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/util/.cvsignore b/src/util/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/util/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/viewer/.cvsignore b/src/viewer/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/viewer/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/viewer/dump/.cvsignore b/src/viewer/dump/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/viewer/dump/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/viewer/graphics/.cvsignore b/src/viewer/graphics/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/viewer/graphics/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/src/viewer/text/.cvsignore b/src/viewer/text/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/src/viewer/text/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp diff --git a/test/.cvsignore b/test/.cvsignore deleted file mode 100644 index ea617a3a..00000000 --- a/test/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.swp From 163dfde9b803fae83f84d909af6636a6880da77a Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Thu, 15 Sep 2005 18:55:32 +0200 Subject: [PATCH 05/52] Mention the site with RISC OS binaries (which was recently added to the download webpage). --- SITES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SITES b/SITES index da2c970c..2b5112fc 100644 --- a/SITES +++ b/SITES @@ -13,6 +13,10 @@ RPMs: Cygwin binaries: http://www.pervalidus.net/cygwin/links/ +RISC OS binaries: + http://www.riscos.info/unix/indexes/browser.html + + GIT root: http://elinks.or.cz/elinks.git git+ssh://pasky.or.cz/srv/git/elinks.git (master, DEPRECATED) From 921c59ce0771599b74884cbdd1c6dc890b2c51ed Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Thu, 15 Sep 2005 20:24:24 +0200 Subject: [PATCH 06/52] Fix --remote commands: popUp() -> infoBox(), it was renamed shortly after entering and I forgot this part. --- src/config/cmdline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/cmdline.c b/src/config/cmdline.c index 6b1fa42a..e3c81f7d 100644 --- a/src/config/cmdline.c +++ b/src/config/cmdline.c @@ -786,7 +786,7 @@ struct option_info cmdline_options_info[] = { "\topenURL(URL, new-tab) : open URL in new tab\n" "\topenURL(URL, new-window) : open URL in new window\n" "\taddBookmark(URL) : bookmark URL\n" - "\tpopUp(text) : show text in a message box\n" + "\tinfoBox(text) : show text in a message box\n" "\txfeDoCommand(openBrowser) : open new window")), INIT_OPT_INT("", N_("Connect to session ring with given ID"), From 21387bc96654f4795310dac15eedc449cd50aeb8 Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Thu, 15 Sep 2005 20:47:06 +0200 Subject: [PATCH 07/52] Remove double 'black' from ensure_contrast option description. --- src/config/options.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/options.inc b/src/config/options.inc index 5aeee2ef..67c49536 100644 --- a/src/config/options.inc +++ b/src/config/options.inc @@ -568,7 +568,7 @@ static struct option_info config_options_info[] = { INIT_OPT_BOOL("document.colors", N_("Increase contrast"), "increase_contrast", 0, 1, N_("Increase the contrast between the foreground and background colors\n" - "to ensure readability. For example it disallows dark colors on a black\n" + "to ensure readability. For example it disallows dark colors on a\n" "black background. Note, this is different from ensuring the contrast\n" "with the ensure_contrast option.")), From 06ea255a226af344544f66b3576c0b40771f7528 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Thu, 15 Sep 2005 21:03:56 +0200 Subject: [PATCH 08/52] Convert part of the build to the new build system The root makefile is converted as well as some leaf Makefiles. This also brings in the required infrastructure and adjusts configure.in appropriately. I converted only makefiles containing no configurable stuff, since that'll require more consideration yet. --- .gitignore | 1 + Makefile | 18 ++++ Makefile.am | 25 ------ Makefile.config.in | 105 ++++++++++++++++++++++++ Makefile.lib | 72 ++++++++++++++++ Unicode/Makefile.am | 51 ------------ config/Makefile.am | 4 - configure.in | 16 +--- contrib/Makefile.am | 42 ---------- debian/Makefile.am | 19 ----- intl/Makefile.am | 4 - src/cache/Makefile.am | 12 --- src/config/Makefile | 11 +++ src/config/Makefile.am | 29 ------- src/ecmascript/Makefile | 14 ++++ src/ecmascript/Makefile.am | 22 ----- src/ecmascript/spidermonkey/Makefile | 12 +++ src/ecmascript/spidermonkey/Makefile.am | 30 ------- src/formhist/Makefile | 11 +++ src/formhist/Makefile.am | 12 --- src/globhist/Makefile | 11 +++ src/globhist/Makefile.am | 12 --- src/session/Makefile | 11 +++ src/session/Makefile.am | 18 ---- test/Makefile.am | 6 -- 25 files changed, 268 insertions(+), 300 deletions(-) create mode 100644 Makefile delete mode 100644 Makefile.am create mode 100644 Makefile.config.in create mode 100644 Makefile.lib delete mode 100644 Unicode/Makefile.am delete mode 100644 config/Makefile.am delete mode 100644 contrib/Makefile.am delete mode 100644 debian/Makefile.am delete mode 100644 intl/Makefile.am delete mode 100644 src/cache/Makefile.am create mode 100644 src/config/Makefile delete mode 100644 src/config/Makefile.am create mode 100644 src/ecmascript/Makefile delete mode 100644 src/ecmascript/Makefile.am create mode 100644 src/ecmascript/spidermonkey/Makefile delete mode 100644 src/ecmascript/spidermonkey/Makefile.am create mode 100644 src/formhist/Makefile delete mode 100644 src/formhist/Makefile.am create mode 100644 src/globhist/Makefile delete mode 100644 src/globhist/Makefile.am create mode 100644 src/session/Makefile delete mode 100644 src/session/Makefile.am delete mode 100644 test/Makefile.am diff --git a/.gitignore b/.gitignore index a9d83d36..8a65be87 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ config.status configure Makefile Makefile.in +Makefile.config stamp-h stamp-h.in depcomp diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..60de7457 --- /dev/null +++ b/Makefile @@ -0,0 +1,18 @@ +-include Makefile.config +# This should be _really_ ., but only after we have src/Makefile. +# Otherwise, it wouldn't be set right in the submakefiles. +path_to_top = .. + +# TODO: Automagically rerun autoconf. + +SUBDIRS = doc po src + + +all: all-recursive + +clean: clean-recursive + rm -rf features.log + +install: install-recursive + +-include Makefile.lib diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 8e9d7446..00000000 --- a/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.49 2005/05/13 21:45:27 rrowan Exp $ - -SUBDIRS = Unicode config contrib debian doc intl po src test - -EXTRA_DIST = \ - ABOUT-NLS \ - BUGS \ - Makefile.base \ - SITES \ - TODO \ - autogen.sh \ - features.conf - -install-exec-hook: - @if grep 'Lua' features.log > /dev/null; then \ - echo "**************************************************************"; \ - echo "Lua 4 support in ELinks is obsolete. If you are upgrading"; \ - echo "from ELinks <= 0.10.X, you must update $(CONFDIR)/hooks.lua."; \ - echo "**************************************************************"; \ - fi - - -CLEANFILES = $(srcdir)/features.log -MAINTAINERCLEANFILES = $(srcdir)/acinclude.m4 diff --git a/Makefile.config.in b/Makefile.config.in new file mode 100644 index 00000000..dbfe8f1c --- /dev/null +++ b/Makefile.config.in @@ -0,0 +1,105 @@ +# This is the automake's playground of our cool build system. +# $Id$ +# +# TODO: Make part of it autogenerated based on AC_SUBST() or something. + +SHELL = @SHELL@ + +top_srcdir = $(path_to_top)/@top_srcdir@ +top_builddir = $(path_to_top) +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ + +DESTDIR = + + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ + +ASCIIDOC = @ASCIIDOC@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CONFDIR = @CONFDIR@ +CONFIG_ASCIIDOC = @CONFIG_ASCIIDOC@ +CONFIG_JW = @CONFIG_JW@ +CONFIG_NLS = @CONFIG_NLS@ +CONFIG_POD2HTML = @CONFIG_POD2HTML@ +CONFIG_RUBY = @CONFIG_RUBY@ +CONFIG_XMLTO = @CONFIG_XMLTO@ +DATADIRNAME = @DATADIRNAME@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ +GUILE_CFLAGS = @GUILE_CFLAGS@ +GUILE_CONFIG = @GUILE_CONFIG@ +HAVE_LIB = @HAVE_LIB@ +HAVE_SMBCLIENT = @HAVE_SMBCLIENT@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +JW = @JW@ +LIB = @LIB@ +LIBDIR = @LIBDIR@ +LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ +LOCALEDIR = @LOCALEDIR@ +LTLIB = @LTLIB@ +LUA_CFLAGS = @LUA_CFLAGS@ +LUA_LIBS = @LUA_LIBS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +PACKAGE = @PACKAGE@ +PERL_CFLAGS = @PERL_CFLAGS@ +PERL_LIBS = @PERL_LIBS@ +POD2HTML = @POD2HTML@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_LIBS = @PYTHON_LIBS@ +RANLIB = @RANLIB@ +RUBY_CFLAGS = @RUBY_CFLAGS@ +RUBY_LIBS = @RUBY_LIBS@ +SPIDERMONKEY_CFLAGS = @SPIDERMONKEY_CFLAGS@ +SPIDERMONKEY_LIBS = @SPIDERMONKEY_LIBS@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +VERSION = @VERSION@ +XMLTO = @XMLTO@ +X_CFLAGS = @X_CFLAGS@ + +DEFS = @DEFS@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ + + +INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src + +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) diff --git a/Makefile.lib b/Makefile.lib new file mode 100644 index 00000000..43ac340e --- /dev/null +++ b/Makefile.lib @@ -0,0 +1,72 @@ +### The build commands and verbosity + +# If we are verbose, we will show commands prefixed by $(Q) (which acts as +# @ in the non-verbose mode), and we will show the "real" cmds instead of +# their quiet versions (which are used in the non-verbose mode). +# Inspired by the Linux kernel build system. +ifdef V + Q = + quiet = + mquiet = masq_ +else + Q = @ + quiet = quiet_ + mquiet = quiet_ +endif + +# Show the command (quiet or non-quiet version based on the assignment +# just above) and then execute it. +ncmd = $(if $($(quiet)cmd_$(1)),echo $($(quiet)cmd_$(1)) &&) $(cmd_$(1)) +cmd = @$(if $($(quiet)cmd_$(1)),echo $($(quiet)cmd_$(1)) &&) $(cmd_$(1)) +mcmd = @$(if $($(mquiet)cmd_$(1)),echo $($(mquiet)cmd_$(1)) &&) $(cmd_$(1)) + +quiet_cmd_compile = '[CC] $<' + masq_cmd_compile = $(COMPILE) -c $< + cmd_compile = $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + +quiet_cmd_archive = '[AR] $@' + cmd_archive = $(AR) r $@ $^ + + quiet_cmd_link = '[LINK] $@' + cmd_link = $(CC) $(LDFLAGS) -o $@ $^ + +# Recursive make +quiet_cmd_recmake = "[MAKE $$target] $$subdir" + cmd_recmake = $(MAKE) -C $$subdir $$target path_to_top="$(path_to_top)/.." + + + +### Internal build rules + +DEP_FILES_1 = $(foreach src,$(OBJS),.deps/$(src)) +DEP_FILES = $(DEP_FILES_1:%.o=%.P) + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +ifdef $(OBJS) +-include $(DEP_FILES) +endif + +%.o: %.c + $(call mcmd,compile) + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.a: + $(call cmd,archive) + + +# Recursion: + +.PHONY: all-recursive install-recursive clean-recursive +all-recursive install-recursive clean-recursive: + @target=`echo $@ | sed s/-recursive//`; \ + for subdir in $(SUBDIRS); do \ + $(call ncmd,recmake) || exit 1; \ + done + + +# vim:syntax=make diff --git a/Unicode/Makefile.am b/Unicode/Makefile.am deleted file mode 100644 index 103c835c..00000000 --- a/Unicode/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.3 2004/08/15 05:51:12 miciah Exp $ - -include $(top_srcdir)/Makefile.base - -EXTRA_DIST = \ - 7bit.cp \ - 7bitrepl.lnx \ - 8859_1.cp \ - 8859_10.cp \ - 8859_13.cp \ - 8859_14.cp \ - 8859_15.cp \ - 8859_16.cp \ - 8859_2.cp \ - 8859_3.cp \ - 8859_4.cp \ - 8859_5.cp \ - 8859_6.cp \ - 8859_7.cp \ - 8859_8.cp \ - 8859_9.cp \ - README \ - cp1125.cp \ - cp1250.cp \ - cp1251.cp \ - cp1252.cp \ - cp1256.cp \ - cp1257.cp \ - cp437.cp \ - cp737.cp \ - cp850.cp \ - cp852.cp \ - cp866.cp \ - entities.lnx \ - gen \ - gen-7b \ - gen-cp \ - gen-ent \ - index.txt \ - kamen.cp \ - koi8_r.cp \ - koi8_ru.cp \ - koi8_u.cp \ - mac_lat2.cp \ - macroman.cp \ - tcvn5712.cp \ - tr7bit.awk \ - utf_8.cp \ - viscii.cp - diff --git a/config/Makefile.am b/config/Makefile.am deleted file mode 100644 index eb14373f..00000000 --- a/config/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.1 2005/01/08 21:23:01 jonas Exp $ - -EXTRA_DIST = m4/*.m4 diff --git a/configure.in b/configure.in index d732b48b..79f71eff 100644 --- a/configure.in +++ b/configure.in @@ -1262,27 +1262,20 @@ dnl Generated files dnl =================================================================== AC_OUTPUT([ \ - Makefile \ - Unicode/Makefile \ - config/Makefile \ - contrib/Makefile \ + Makefile.config \ contrib/elinks.spec \ contrib/lua/hooks.lua \ contrib/conv/w3m2links.awk \ - debian/Makefile \ doc/Makefile \ doc/man/Makefile \ doc/man/man1/Makefile \ doc/man/man1/elinks.1 \ doc/man/man5/Makefile \ - intl/Makefile \ po/Makefile \ src/Makefile \ src/bfu/Makefile \ src/bookmarks/Makefile \ src/bookmarks/backend/Makefile \ - src/cache/Makefile \ - src/config/Makefile \ src/cookies/Makefile \ src/dialogs/Makefile \ src/document/Makefile \ @@ -1293,11 +1286,7 @@ AC_OUTPUT([ \ src/document/plain/Makefile \ src/document/sgml/Makefile \ src/document/sgml/html/Makefile \ - src/ecmascript/Makefile \ - src/ecmascript/spidermonkey/Makefile \ src/encoding/Makefile \ - src/formhist/Makefile \ - src/globhist/Makefile \ src/intl/Makefile \ src/intl/gettext/Makefile \ src/intl/gettext/ref-add.sed \ @@ -1335,8 +1324,7 @@ AC_OUTPUT([ \ src/util/Makefile \ src/viewer/Makefile \ src/viewer/dump/Makefile \ - src/viewer/text/Makefile \ - test/Makefile + src/viewer/text/Makefile ]) diff --git a/contrib/Makefile.am b/contrib/Makefile.am deleted file mode 100644 index 6a0820e0..00000000 --- a/contrib/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.19 2005/06/03 02:18:43 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -EXTRA_DIST = \ - LinksOS2Icon.zip \ - README \ - colws.diff \ - elinks.conf \ - elinks-vim.diff \ - elinks.fortune \ - elinks.spec.in \ - elinks.vim \ - js-1.5-rc6a+elinks.patch \ - keybind-full.conf \ - keybind.conf \ - links_wps.zip \ - wipe-out-ssl \ - wipe-out-ssl.awk \ - user.css \ - TIPS-AND-TRICKS \ - conv/conf-links2elinks.pl \ - conv/mailcap.pl \ - conv/old_to_new_bookmarks.sh \ - conv/w3m2links.awk \ - conv/w3m2links.awk.in \ - guile/internal-hooks.scm \ - guile/user-hooks.scm \ - lua/babelfish.lua \ - lua/bm-to-elinks-bookmarks.lua \ - lua/bm.lua \ - lua/config.lua \ - lua/elinks-remote \ - lua/highlight.lua \ - lua/hooks.lua.in \ - lua/md5check.lua \ - lua/remote.lua \ - perl/hooks.pl \ - perl/config.pl \ - python/hooks.py \ - ruby/hooks.rb diff --git a/debian/Makefile.am b/debian/Makefile.am deleted file mode 100644 index 6adf4349..00000000 --- a/debian/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.5 2005/02/22 14:39:03 jonas Exp $ - -EXTRA_DIST = \ - README.Debian \ - changelog \ - control \ - control.in \ - copyright \ - elinks.desktop \ - elinks.docs \ - elinks.postinst \ - elinks.preinst \ - elinks.prerm \ - menu \ - mime \ - rules - -DISTCLEANFILES = build-stamp elinks diff --git a/intl/Makefile.am b/intl/Makefile.am deleted file mode 100644 index 9e74e9a4..00000000 --- a/intl/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.4 2003/01/04 01:06:59 pasky Exp $ - -EXTRA_DIST = README diff --git a/src/cache/Makefile.am b/src/cache/Makefile.am deleted file mode 100644 index 77901a2b..00000000 --- a/src/cache/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.2 2003/11/17 17:58:57 pasky Exp $ - -include $(top_srcdir)/Makefile.base - -noinst_LIBRARIES = libcache.a -libcache_a_SOURCES = \ - cache.c \ - cache.h \ - dialogs.c \ - dialogs.h - diff --git a/src/config/Makefile b/src/config/Makefile new file mode 100644 index 00000000..64aa297a --- /dev/null +++ b/src/config/Makefile @@ -0,0 +1,11 @@ +-include ../../Makefile.config + +OBJS = cmdline.o conf.o dialogs.o home.o kbdbind.o options.o opttypes.o timer.o urlhist.o + +all: libconfig.a +libconfig.a: $(OBJS) + +clean: + rm -f *.o *.a + +-include ../../Makefile.lib diff --git a/src/config/Makefile.am b/src/config/Makefile.am deleted file mode 100644 index 9a65f243..00000000 --- a/src/config/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.17 2005/06/12 18:31:42 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -noinst_LIBRARIES = libconfig.a -libconfig_a_SOURCES = \ - actions-edit.inc \ - actions-main.inc \ - actions-menu.inc \ - cmdline.c \ - cmdline.h \ - conf.c \ - conf.h \ - dialogs.c \ - dialogs.h \ - home.c \ - home.h \ - kbdbind.c \ - kbdbind.h \ - options.c \ - options.h \ - options.inc \ - opttypes.c \ - opttypes.h \ - timer.c \ - timer.h \ - urlhist.c \ - urlhist.h diff --git a/src/ecmascript/Makefile b/src/ecmascript/Makefile new file mode 100644 index 00000000..378d7ab5 --- /dev/null +++ b/src/ecmascript/Makefile @@ -0,0 +1,14 @@ +-include ../../Makefile.config +INCLUDES += $(SPIDERMONKEY_CFLAGS) + +SUBDIRS = spidermonkey +SM_OBJS = document.o form.o location.o navigator.o unibar.o window.o +OBJS = ecmascript.o spidermonkey.o $(foreach obj,$(SM_OBJS),spidermonkey/$(obj)) + +all: all-recursive libecmascript.a +libecmascript.a: $(OBJS) + +clean: + rm -f *.o *.a + +-include ../../Makefile.lib diff --git a/src/ecmascript/Makefile.am b/src/ecmascript/Makefile.am deleted file mode 100644 index 31ac9230..00000000 --- a/src/ecmascript/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.10 2005/09/14 22:57:16 pasky Exp $ - -include $(top_srcdir)/Makefile.base - -SUBDIRS=spidermonkey - -INCLUDES += $(SPIDERMONKEY_CFLAGS) - -noinst_LIBRARIES = libecmascript.a -libecmascript_a_LIBADD = \ - spidermonkey/document.o \ - spidermonkey/form.o \ - spidermonkey/location.o \ - spidermonkey/navigator.o \ - spidermonkey/unibar.o \ - spidermonkey/window.o -libecmascript_a_SOURCES = \ - ecmascript.c \ - ecmascript.h \ - spidermonkey.c \ - spidermonkey.h diff --git a/src/ecmascript/spidermonkey/Makefile b/src/ecmascript/spidermonkey/Makefile new file mode 100644 index 00000000..eb16efdd --- /dev/null +++ b/src/ecmascript/spidermonkey/Makefile @@ -0,0 +1,12 @@ +-include ../../../Makefile.config +INCLUDES += $(SPIDERMONKEY_CFLAGS) + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +OBJS = document.o form.o location.o navigator.o unibar.o window.o + +all: $(OBJS) + +clean: + rm -f *.o *.a + +-include ../../../Makefile.lib diff --git a/src/ecmascript/spidermonkey/Makefile.am b/src/ecmascript/spidermonkey/Makefile.am deleted file mode 100644 index a318429e..00000000 --- a/src/ecmascript/spidermonkey/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.6 2005/09/14 22:57:17 pasky Exp $ - -include $(top_srcdir)/Makefile.base - -INCLUDES += $(SPIDERMONKEY_CFLAGS) - -# We don't want to expose this outside of /src/ecmascript/ at all, and we can't -# merge the whole library of these with libecmascript.a. So we only compile -# objects here and link them directly to libecmascript.a in ../Makefile.am. - -# However, we apparently need to create the library in order to convince -# automake to compile the objects :/. We DON'T use libbackend.a ANYWHERE. - -noinst_LIBRARIES = libbackend.a - -libbackend_a_SOURCES = \ - document.c \ - document.h \ - form.c \ - form.h \ - location.c \ - location.h \ - navigator.c \ - navigator.h \ - util.h \ - unibar.c \ - unibar.h \ - window.c \ - window.h diff --git a/src/formhist/Makefile b/src/formhist/Makefile new file mode 100644 index 00000000..ec9b3069 --- /dev/null +++ b/src/formhist/Makefile @@ -0,0 +1,11 @@ +-include ../../Makefile.config + +OBJS = formhist.o dialogs.o + +all: libformhist.a +libformhist.a: $(OBJS) + +clean: + rm -f *.o *.a + +-include ../../Makefile.lib diff --git a/src/formhist/Makefile.am b/src/formhist/Makefile.am deleted file mode 100644 index a5fec88f..00000000 --- a/src/formhist/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.3 2004/02/05 16:46:25 zas Exp $ - -include $(top_srcdir)/Makefile.base - -noinst_LIBRARIES = libformhist.a - -libformhist_a_SOURCES = \ - dialogs.c \ - dialogs.h \ - formhist.c \ - formhist.h diff --git a/src/globhist/Makefile b/src/globhist/Makefile new file mode 100644 index 00000000..baad9fae --- /dev/null +++ b/src/globhist/Makefile @@ -0,0 +1,11 @@ +-include ../../Makefile.config + +OBJS = globhist.o dialogs.o + +all: libglobhist.a +libglobhist.a: $(OBJS) + +clean: + rm -f *.o *.a + +-include ../../Makefile.lib diff --git a/src/globhist/Makefile.am b/src/globhist/Makefile.am deleted file mode 100644 index d395fe19..00000000 --- a/src/globhist/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.1 2002/08/29 23:58:23 pasky Exp $ - -include $(top_srcdir)/Makefile.base - -noinst_LIBRARIES = libglobhist.a -libglobhist_a_SOURCES = \ - dialogs.c \ - dialogs.h \ - globhist.c \ - globhist.h - diff --git a/src/session/Makefile b/src/session/Makefile new file mode 100644 index 00000000..2893ce0f --- /dev/null +++ b/src/session/Makefile @@ -0,0 +1,11 @@ +-include ../../Makefile.config + +OBJS = download.o history.o location.o session.o task.o + +all: libsession.a +libsession.a: $(OBJS) + +clean: + rm -f *.o *.a + +-include ../../Makefile.lib diff --git a/src/session/Makefile.am b/src/session/Makefile.am deleted file mode 100644 index 6ebefcb7..00000000 --- a/src/session/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.18 2005/06/14 12:25:21 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -noinst_LIBRARIES = libsession.a -libsession_a_SOURCES = \ - download.c \ - download.h \ - history.c \ - history.h \ - location.c \ - location.h \ - session.c \ - session.h \ - task.c \ - task.h - diff --git a/test/Makefile.am b/test/Makefile.am deleted file mode 100644 index dea928cf..00000000 --- a/test/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.7 2004/12/18 00:11:06 miciah Exp $ - -include $(top_srcdir)/Makefile.base - -EXTRA_DIST = README *.html *.htm *.txt css/*.html ecmascript/*.html From 1634eef7cf6aa49be09c0b167f4b6efa0bce3d1c Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Thu, 15 Sep 2005 21:04:02 +0200 Subject: [PATCH 09/52] Danish translation update Remove all fuzziness and cut the number of untranslated messages. --- po/da.po | 1690 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 867 insertions(+), 823 deletions(-) diff --git a/po/da.po b/po/da.po index 80c382ca..e3b76e27 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ELinks 0.10.CVS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-07-18 16:40+0200\n" +"POT-Creation-Date: 2005-09-15 20:47+0200\n" "PO-Revision-Date: 2005-06-12 02:00+0200\n" "Last-Translator: Jonas Fonseca \n" "Language-Team: Danish \n" @@ -15,93 +15,93 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: src/bfu/hierbox.c:331 +#: src/bfu/hierbox.c:330 msgid "Close" msgstr "Luk" #. | MSGBOX_SCROLLABLE -#: src/bfu/hierbox.c:426 src/bfu/hierbox.c:435 src/dialogs/document.c:44 +#: src/bfu/hierbox.c:425 src/bfu/hierbox.c:434 src/dialogs/document.c:44 #: src/dialogs/document.c:241 msgid "Info" msgstr "Info" -#: src/bfu/hierbox.c:427 +#: src/bfu/hierbox.c:426 msgid "Press space to expand this folder." msgstr "Tast mellemrum for at åbne denne mappe." -#: src/bfu/hierbox.c:438 src/bfu/inpfield.c:255 src/bfu/msgbox.c:173 +#: src/bfu/hierbox.c:437 src/bfu/inpfield.c:255 src/bfu/msgbox.c:173 #: src/bfu/msgbox.c:190 src/config/dialogs.c:57 src/config/dialogs.c:394 #: src/cookies/dialogs.c:355 src/dialogs/edit.c:98 src/dialogs/info.c:134 #: src/dialogs/options.c:209 src/dialogs/options.c:289 src/mime/dialogs.c:130 -#: src/protocol/auth/dialogs.c:111 src/protocol/protocol.c:230 +#: src/protocol/auth/dialogs.c:111 src/protocol/protocol.c:232 #: src/scripting/lua/core.c:378 src/scripting/lua/core.c:458 -#: src/session/session.c:766 src/viewer/text/search.c:1594 +#: src/session/session.c:798 src/viewer/text/search.c:1594 msgid "~OK" msgstr "~O.k." -#: src/bfu/hierbox.c:549 +#: src/bfu/hierbox.c:548 #, c-format msgid "Sorry, but the item \"%s\" cannot be deleted." msgstr "Beklager, men elementet \"%s\" kan ikke slettes." -#: src/bfu/hierbox.c:550 +#: src/bfu/hierbox.c:549 #, c-format msgid "Sorry, but the item \"%s\" is being used by something else." msgstr "Desværre, men elementet \"%s\" er optaget af en anden proces." #. cant_delete_folder -#: src/bfu/hierbox.c:553 src/bookmarks/dialogs.c:120 +#: src/bfu/hierbox.c:552 src/bookmarks/dialogs.c:120 #, c-format msgid "Sorry, but the folder \"%s\" cannot be deleted." msgstr "Desværre, mappen \"%s\" kan ikke slettes." #. cant_delete_used_folder -#: src/bfu/hierbox.c:554 src/bookmarks/dialogs.c:122 +#: src/bfu/hierbox.c:553 src/bookmarks/dialogs.c:122 #, c-format msgid "Sorry, but the folder \"%s\" is being used by something else." msgstr "Desværre, mappen \"%s\" er optaget af en anden proces." -#: src/bfu/hierbox.c:619 +#: src/bfu/hierbox.c:618 msgid "Delete error" msgstr "Sletningsfejl" -#: src/bfu/hierbox.c:713 +#: src/bfu/hierbox.c:712 msgid "Delete marked items" msgstr "Slet markerede elementer" -#: src/bfu/hierbox.c:714 +#: src/bfu/hierbox.c:713 msgid "Delete marked items?" msgstr "Slet markerede elementer?" -#: src/bfu/hierbox.c:727 src/bfu/hierbox.c:763 src/bfu/hierbox.c:784 -#: src/bfu/hierbox.c:855 src/config/dialogs.c:834 src/dialogs/menu.c:127 -#: src/formhist/formhist.c:419 src/mime/dialogs.c:70 src/session/task.c:271 -#: src/terminal/tab.c:191 src/terminal/tab.c:227 +#: src/bfu/hierbox.c:726 src/bfu/hierbox.c:762 src/bfu/hierbox.c:783 +#: src/bfu/hierbox.c:854 src/config/dialogs.c:835 src/dialogs/menu.c:127 +#: src/formhist/formhist.c:419 src/mime/dialogs.c:70 src/session/task.c:273 +#: src/terminal/tab.c:190 src/terminal/tab.c:226 msgid "~Yes" msgstr "~Ja" -#: src/bfu/hierbox.c:728 src/bfu/hierbox.c:764 src/bfu/hierbox.c:785 -#: src/bfu/hierbox.c:856 src/config/dialogs.c:835 src/dialogs/menu.c:128 -#: src/formhist/formhist.c:420 src/mime/dialogs.c:71 src/session/task.c:272 -#: src/terminal/tab.c:192 src/terminal/tab.c:228 +#: src/bfu/hierbox.c:727 src/bfu/hierbox.c:763 src/bfu/hierbox.c:784 +#: src/bfu/hierbox.c:855 src/config/dialogs.c:836 src/dialogs/menu.c:128 +#: src/formhist/formhist.c:420 src/mime/dialogs.c:71 src/session/task.c:274 +#: src/terminal/tab.c:191 src/terminal/tab.c:227 msgid "~No" msgstr "~Nej" #. delete_folder_title -#: src/bfu/hierbox.c:748 src/bookmarks/dialogs.c:128 +#: src/bfu/hierbox.c:747 src/bookmarks/dialogs.c:128 msgid "Delete folder" msgstr "Slet mappe" -#: src/bfu/hierbox.c:749 +#: src/bfu/hierbox.c:748 #, c-format msgid "Delete the folder \"%s\" and its content?" msgstr "Slet mappen \"%s\" og dens indhold?" -#: src/bfu/hierbox.c:766 +#: src/bfu/hierbox.c:765 msgid "Delete item" msgstr "Slet element" -#: src/bfu/hierbox.c:767 +#: src/bfu/hierbox.c:766 #, c-format msgid "" "Delete \"%s\"?\n" @@ -112,27 +112,27 @@ msgstr "" "\n" "%s" -#: src/bfu/hierbox.c:824 +#: src/bfu/hierbox.c:823 msgid "Clear all items" msgstr "Slet alle" -#: src/bfu/hierbox.c:825 +#: src/bfu/hierbox.c:824 msgid "Do you really want to remove all items?" msgstr "Vil du virkelig slette alle elementer?" -#: src/bfu/hierbox.c:922 src/bfu/hierbox.c:953 src/viewer/text/search.c:1014 +#: src/bfu/hierbox.c:921 src/bfu/hierbox.c:952 src/viewer/text/search.c:1014 #: src/viewer/text/search.c:1022 src/viewer/text/search.c:1038 #: src/viewer/text/search.c:1613 msgid "Search" msgstr "Søg" -#: src/bfu/hierbox.c:924 src/viewer/text/search.c:1015 +#: src/bfu/hierbox.c:923 src/viewer/text/search.c:1015 #, c-format msgid "Search string '%s' not found" msgstr "Søgningen \"%s\" gav intet resultat" -#: src/bfu/hierbox.c:953 src/config/dialogs.c:168 src/config/dialogs.c:360 -#: src/config/dialogs.c:489 src/cookies/dialogs.c:35 src/cookies/dialogs.c:349 +#: src/bfu/hierbox.c:952 src/config/dialogs.c:168 src/config/dialogs.c:360 +#: src/config/dialogs.c:507 src/cookies/dialogs.c:35 src/cookies/dialogs.c:349 #: src/dialogs/edit.c:92 src/dialogs/edit.c:94 src/scripting/lua/core.c:374 #: src/scripting/lua/core.c:375 src/scripting/lua/core.c:455 msgid "Name" @@ -151,7 +151,7 @@ msgstr "Tal forventet i felt" msgid "Number should be in the range from %d to %d." msgstr "Tallet skal ligge i intervallet fra %d til %d." -#: src/bfu/inpfield.c:99 +#: src/bfu/inpfield.c:99 src/config/dialogs.c:461 msgid "Bad string" msgstr "Ugyldig tekststreng" @@ -162,37 +162,37 @@ msgstr "Tom tekststreng ikke tilladt" #: src/bfu/inpfield.c:255 src/config/dialogs.c:395 src/cookies/dialogs.c:356 #: src/dialogs/edit.c:102 src/dialogs/edit.c:105 src/dialogs/options.c:212 #: src/dialogs/options.c:290 src/mime/dialogs.c:131 -#: src/protocol/auth/dialogs.c:112 src/protocol/bittorrent/dialogs.c:806 +#: src/protocol/auth/dialogs.c:112 src/protocol/bittorrent/dialogs.c:802 #: src/scripting/lua/core.c:379 src/scripting/lua/core.c:459 #: src/session/download.c:545 src/session/download.c:1122 #: src/viewer/text/search.c:1595 msgid "~Cancel" msgstr "~Annullér" -#: src/bfu/leds.c:73 +#: src/bfu/leds.c:75 msgid "Clock" msgstr "Ur" -#: src/bfu/leds.c:74 +#: src/bfu/leds.c:76 msgid "Digital clock in the status bar." msgstr "Digitalt ur i statuslinjen." -#: src/bfu/leds.c:76 src/bfu/leds.c:93 src/config/options.inc:1115 -#: src/config/options.inc:1122 src/ecmascript/ecmascript.c:41 +#: src/bfu/leds.c:78 src/bfu/leds.c:95 src/config/options.inc:1119 +#: src/config/options.inc:1126 src/ecmascript/ecmascript.c:41 #: src/globhist/globhist.c:64 src/mime/backend/mailcap.c:94 -#: src/mime/backend/mimetypes.c:53 src/network/ssl/ssl.c:82 +#: src/mime/backend/mimetypes.c:53 src/network/ssl/ssl.c:81 msgid "Enable" msgstr "Aktivér" -#: src/bfu/leds.c:78 +#: src/bfu/leds.c:80 msgid "Whether to display a digital clock in the status bar." msgstr "Om et digitalt ur skal vises i statuslinjen." -#: src/bfu/leds.c:80 +#: src/bfu/leds.c:82 msgid "Format" msgstr "Format" -#: src/bfu/leds.c:82 +#: src/bfu/leds.c:84 msgid "" "Format string for the digital clock. See the strftime(3)\n" "manpage for details." @@ -200,15 +200,15 @@ msgstr "" "Formateringsstreng for det digitale ur. Se manualsiden strftime(3)\n" "for hjælp." -#: src/bfu/leds.c:89 +#: src/bfu/leds.c:91 msgid "LEDs" msgstr "LED-indikatorer" -#: src/bfu/leds.c:91 +#: src/bfu/leds.c:93 msgid "LEDs (visual indicators) options." msgstr "Indstillinger for visuelle LED-indikatorer." -#: src/bfu/leds.c:95 +#: src/bfu/leds.c:97 msgid "" "Enable LEDs.\n" "These visual indicators will inform you about various states." @@ -217,11 +217,11 @@ msgstr "" "Disse visuelle indikatorer bruges til at markere forskellige tilstande." #. name: -#: src/bfu/leds.c:301 src/bfu/leds.c:343 +#: src/bfu/leds.c:303 src/bfu/leds.c:345 msgid "LED indicators" msgstr "LED-indikatorer" -#: src/bfu/leds.c:302 +#: src/bfu/leds.c:304 msgid "" "What the different LEDs indicate:\n" "\n" @@ -249,7 +249,7 @@ msgstr "" "\n" "'-' i almindelighed betyder at LED-indikatoren er deaktiveret." -#: src/bfu/menu.c:753 +#: src/bfu/menu.c:754 msgid "Search menu/" msgstr "Søg menu/" @@ -350,7 +350,7 @@ msgstr "" "af nedbrud.\n" "Denne egenskab kræver bogmærkeunderstøttelse." -#: src/bookmarks/dialogs.c:71 src/config/options.inc:967 +#: src/bookmarks/dialogs.c:71 src/config/options.inc:971 #: src/dialogs/document.c:146 src/globhist/dialogs.c:66 msgid "Title" msgstr "Titel" @@ -422,25 +422,25 @@ msgstr "Mappenavn" msgid "Edit bookmark" msgstr "Redigér bogmærke" -#: src/bookmarks/dialogs.c:463 src/cache/dialogs.c:229 +#: src/bookmarks/dialogs.c:463 src/cache/dialogs.c:230 #: src/globhist/dialogs.c:224 src/protocol/auth/dialogs.c:256 msgid "~Goto" msgstr "~Gå til" -#: src/bookmarks/dialogs.c:464 src/config/dialogs.c:512 +#: src/bookmarks/dialogs.c:464 src/config/dialogs.c:530 #: src/cookies/dialogs.c:422 msgid "~Edit" msgstr "R~edigér" -#: src/bookmarks/dialogs.c:465 src/cache/dialogs.c:230 -#: src/config/dialogs.c:514 src/config/dialogs.c:951 src/cookies/dialogs.c:423 +#: src/bookmarks/dialogs.c:465 src/cache/dialogs.c:231 +#: src/config/dialogs.c:532 src/config/dialogs.c:943 src/cookies/dialogs.c:423 #: src/dialogs/menu.c:447 src/formhist/dialogs.c:211 #: src/globhist/dialogs.c:229 src/protocol/auth/dialogs.c:258 msgid "~Delete" msgstr "~Slet" -#: src/bookmarks/dialogs.c:466 src/config/dialogs.c:513 -#: src/config/dialogs.c:950 src/cookies/dialogs.c:421 src/dialogs/menu.c:445 +#: src/bookmarks/dialogs.c:466 src/config/dialogs.c:531 +#: src/config/dialogs.c:942 src/cookies/dialogs.c:421 src/dialogs/menu.c:445 msgid "~Add" msgstr "~Tilføj" @@ -456,8 +456,8 @@ msgstr "Tilf msgid "~Move" msgstr "~Flyt" -#: src/bookmarks/dialogs.c:470 src/cache/dialogs.c:231 -#: src/config/dialogs.c:515 src/config/dialogs.c:953 src/dialogs/menu.c:398 +#: src/bookmarks/dialogs.c:470 src/cache/dialogs.c:232 +#: src/config/dialogs.c:533 src/config/dialogs.c:945 src/dialogs/menu.c:398 #: src/globhist/dialogs.c:230 msgid "~Search" msgstr "S~øg" @@ -505,96 +505,96 @@ msgstr "Proxyadresse" msgid "Redirect" msgstr "Omdirigering" -#: src/cache/dialogs.c:86 src/config/options.inc:504 +#: src/cache/dialogs.c:86 src/config/options.inc:509 #: src/dialogs/document.c:157 src/protocol/bittorrent/dialogs.c:127 msgid "Size" msgstr "Størrelse" -#: src/cache/dialogs.c:87 +#: src/cache/dialogs.c:88 msgid "Loaded size" msgstr "Indlæst størrelse" -#: src/cache/dialogs.c:90 +#: src/cache/dialogs.c:91 msgid "Content type" msgstr "Content-Type" -#: src/cache/dialogs.c:94 src/dialogs/document.c:202 +#: src/cache/dialogs.c:95 src/dialogs/document.c:202 msgid "Last modified" msgstr "Sidst opdateret" -#: src/cache/dialogs.c:102 src/dialogs/document.c:184 +#: src/cache/dialogs.c:103 src/dialogs/document.c:184 msgid "SSL Cipher" msgstr "SSL-chiffer" -#: src/cache/dialogs.c:106 src/dialogs/document.c:189 +#: src/cache/dialogs.c:107 src/dialogs/document.c:189 msgid "Encoding" msgstr "Kodning" -#: src/cache/dialogs.c:112 +#: src/cache/dialogs.c:113 msgid "Flags" msgstr "Flag" -#: src/cache/dialogs.c:115 src/dialogs/document.c:160 +#: src/cache/dialogs.c:116 src/dialogs/document.c:160 msgid "incomplete" msgstr "ufuldstændig" -#: src/cache/dialogs.c:118 src/protocol/auth/dialogs.c:178 +#: src/cache/dialogs.c:119 src/protocol/auth/dialogs.c:178 msgid "invalid" msgstr "ugyldig" -#: src/cache/dialogs.c:125 src/cookies/dialogs.c:41 src/cookies/dialogs.c:45 +#: src/cache/dialogs.c:126 src/cookies/dialogs.c:41 src/cookies/dialogs.c:45 #: src/cookies/dialogs.c:352 msgid "Expires" msgstr "Udløber" -#: src/cache/dialogs.c:131 +#: src/cache/dialogs.c:132 msgid "ID" msgstr "ID" -#: src/cache/dialogs.c:134 src/config/options.inc:635 +#: src/cache/dialogs.c:135 src/config/options.inc:639 msgid "Header" msgstr "Teksthoved" #. cant_delete_item -#: src/cache/dialogs.c:187 +#: src/cache/dialogs.c:188 #, c-format msgid "Sorry, but cache entry \"%s\" cannot be deleted." msgstr "Desværre, cache-elementet \"%s\" kan ikke slettes." #. cant_delete_used_item -#: src/cache/dialogs.c:189 +#: src/cache/dialogs.c:190 #, c-format msgid "Sorry, but cache entry \"%s\" is being used by something else." msgstr "Desværre, cache-elementet \"%s\" er optaget af en anden proces." #. delete_marked_items_title -#: src/cache/dialogs.c:195 +#: src/cache/dialogs.c:196 msgid "Delete marked cache entries" msgstr "Slet markerede cache-elementer" #. delete_marked_items -#: src/cache/dialogs.c:197 +#: src/cache/dialogs.c:198 msgid "Delete marked cache entries?" msgstr "Slet markerede cache-elementer?" #. delete_item_title -#: src/cache/dialogs.c:203 +#: src/cache/dialogs.c:204 msgid "Delete cache entry" msgstr "Slet cache-element" #. delete_item -#: src/cache/dialogs.c:205 +#: src/cache/dialogs.c:206 msgid "Delete this cache entry?" msgstr "Slet dette cache-element?" -#: src/cache/dialogs.c:228 src/config/dialogs.c:511 src/cookies/dialogs.c:420 +#: src/cache/dialogs.c:229 src/config/dialogs.c:529 src/cookies/dialogs.c:420 #: src/dialogs/download.c:249 src/dialogs/download.c:478 #: src/formhist/dialogs.c:210 src/globhist/dialogs.c:225 #: src/protocol/auth/dialogs.c:257 msgid "~Info" msgstr "~Info" -#: src/cache/dialogs.c:236 +#: src/cache/dialogs.c:237 msgid "Cache manager" msgstr "Cachehåndtering" @@ -611,96 +611,100 @@ msgid "Attempt to auto-complete the input" msgstr "Forsøg automatisk fuldførelse af indtastning" #: src/config/actions-edit.inc:8 +msgid "Attempt to auto-complete a local file" +msgstr "Forsøg automatisk fuldførelse af filnavnsindtastning" + +#: src/config/actions-edit.inc:9 msgid "Attempt to unambiguously auto-complete the input" msgstr "Forsøg entydig, automatisk fuldførelse af indtastning" -#: src/config/actions-edit.inc:9 +#: src/config/actions-edit.inc:10 msgid "Delete character in front of the cursor" msgstr "Slet tegn foran markøren" -#: src/config/actions-edit.inc:10 +#: src/config/actions-edit.inc:11 msgid "Go to the first line of the buffer" msgstr "Gå til første linje i bufferen" -#: src/config/actions-edit.inc:11 src/config/actions-menu.inc:8 +#: src/config/actions-edit.inc:12 src/config/actions-menu.inc:8 msgid "Cancel current state" msgstr "Annullér aktuelle tilstand" -#: src/config/actions-edit.inc:12 src/config/actions-main.inc:18 +#: src/config/actions-edit.inc:13 src/config/actions-main.inc:18 msgid "Copy text to clipboard" msgstr "Kopiér tekst til klippebord" -#: src/config/actions-edit.inc:13 +#: src/config/actions-edit.inc:14 msgid "Delete text from clipboard" msgstr "Slet tekst fra klippebord" -#: src/config/actions-edit.inc:14 src/config/actions-menu.inc:9 +#: src/config/actions-edit.inc:15 src/config/actions-menu.inc:9 msgid "Delete character under cursor" msgstr "Slet tegn under markør" -#: src/config/actions-edit.inc:15 src/config/actions-menu.inc:10 +#: src/config/actions-edit.inc:16 src/config/actions-menu.inc:10 msgid "Move cursor downwards" msgstr "Flyt markøren nedad" -#: src/config/actions-edit.inc:16 src/config/actions-menu.inc:11 +#: src/config/actions-edit.inc:17 src/config/actions-menu.inc:11 msgid "Go to the end of the page/line" msgstr "Flyt markøren til enden af siden/linjen" -#: src/config/actions-edit.inc:17 +#: src/config/actions-edit.inc:18 msgid "Go to the last line of the buffer" msgstr "Gå til sidste linje i bufferen" -#: src/config/actions-edit.inc:18 src/config/actions-main.inc:46 +#: src/config/actions-edit.inc:19 src/config/actions-main.inc:46 #: src/config/actions-menu.inc:12 msgid "Follow the current link" msgstr "Følg aktuelle link" -#: src/config/actions-edit.inc:19 src/config/actions-menu.inc:14 +#: src/config/actions-edit.inc:20 src/config/actions-menu.inc:14 msgid "Go to the start of the page/line" msgstr "Gå til begyndelsen af siden/linjen" -#: src/config/actions-edit.inc:20 +#: src/config/actions-edit.inc:21 msgid "Delete to beginning of line" msgstr "Slet til linjestart" -#: src/config/actions-edit.inc:21 +#: src/config/actions-edit.inc:22 msgid "Delete to end of line" msgstr "Slet til linjeslut" -#: src/config/actions-edit.inc:22 src/config/actions-menu.inc:15 +#: src/config/actions-edit.inc:23 src/config/actions-menu.inc:15 msgid "Move the cursor left" msgstr "Flyt markør til venstre" -#: src/config/actions-edit.inc:23 src/config/actions-menu.inc:17 +#: src/config/actions-edit.inc:24 src/config/actions-menu.inc:17 msgid "Move to the next item" msgstr "Flyt til næste element" -#: src/config/actions-edit.inc:24 +#: src/config/actions-edit.inc:25 msgid "Open in external editor" msgstr "Åbn i en ekstern editor" -#: src/config/actions-edit.inc:25 +#: src/config/actions-edit.inc:26 msgid "Paste text from the clipboard" msgstr "Kopiér tekst fra klippebord" -#: src/config/actions-edit.inc:26 src/config/actions-menu.inc:20 +#: src/config/actions-edit.inc:27 src/config/actions-menu.inc:20 msgid "Move to the previous item" msgstr "Flyt til forrige element" -#: src/config/actions-edit.inc:27 src/config/actions-main.inc:77 +#: src/config/actions-edit.inc:28 src/config/actions-main.inc:77 #: src/config/actions-menu.inc:21 msgid "Redraw the terminal" msgstr "Genopfrisk skærm" -#: src/config/actions-edit.inc:28 src/config/actions-menu.inc:22 +#: src/config/actions-edit.inc:29 src/config/actions-menu.inc:22 msgid "Move the cursor right" msgstr "Flyt markøren til højre" -#: src/config/actions-edit.inc:29 +#: src/config/actions-edit.inc:30 msgid "Toggle regex matching (type-ahead searching)" msgstr "Skift mellem søgning med regulære udtryk" -#: src/config/actions-edit.inc:30 src/config/actions-menu.inc:26 +#: src/config/actions-edit.inc:31 src/config/actions-menu.inc:26 msgid "Move cursor upwards" msgstr "Flyt markør op" @@ -1052,8 +1056,8 @@ msgstr "Indsend formular" msgid "Submit form and reload" msgstr "Indsend formular og genindlæs" -#: src/config/actions-main.inc:99 src/terminal/tab.c:188 -#: src/terminal/tab.c:224 +#: src/config/actions-main.inc:99 src/terminal/tab.c:187 +#: src/terminal/tab.c:223 msgid "Close tab" msgstr "Luk faneblad" @@ -1155,7 +1159,7 @@ msgstr "Fejl ved fortolkning af indstilingen %s: %s" msgid "Unknown option %s" msgstr "Ukendt indstilling %s" -#: src/config/cmdline.c:133 src/config/cmdline.c:157 src/config/cmdline.c:223 +#: src/config/cmdline.c:133 src/config/cmdline.c:157 src/config/cmdline.c:225 #: src/config/opttypes.c:39 msgid "Parameter expected" msgstr "Parameter forventet" @@ -1176,55 +1180,55 @@ msgstr "V msgid "Resolver error" msgstr "Kunne ikke omdanne værtsnavn til IP-adresse" -#: src/config/cmdline.c:320 +#: src/config/cmdline.c:330 msgid "Remote method not supported" msgstr "Fjernmetode ikke understøttet" -#: src/config/cmdline.c:372 +#: src/config/cmdline.c:382 msgid "Template option folder" msgstr "Mappe med skabelonindstillinger" -#: src/config/cmdline.c:395 +#: src/config/cmdline.c:405 #, c-format msgid "(default: %ld)" msgstr "(standard: %ld)" -#: src/config/cmdline.c:402 src/config/cmdline.c:431 +#: src/config/cmdline.c:412 src/config/cmdline.c:441 #, c-format msgid "(default: \"%s\")" msgstr "(standard: \"%s\")" -#: src/config/cmdline.c:407 +#: src/config/cmdline.c:417 #, c-format msgid "(alias for %s)" msgstr "(alias for %s)" -#: src/config/cmdline.c:412 src/config/cmdline.c:421 +#: src/config/cmdline.c:422 src/config/cmdline.c:431 #, c-format msgid "(default: %s)" msgstr "(standard: %s)" -#: src/config/cmdline.c:555 +#: src/config/cmdline.c:565 msgid "Configuration options" msgstr "Opsætningsindstillinger" -#: src/config/cmdline.c:559 +#: src/config/cmdline.c:569 msgid "Usage: elinks [OPTION]... [URL]..." msgstr "Brug: elinks [INDSTILLING]... [ADRESSE]..." -#: src/config/cmdline.c:560 +#: src/config/cmdline.c:570 msgid "Options" msgstr "Indstillinger" -#: src/config/cmdline.c:602 +#: src/config/cmdline.c:612 msgid "Internal consistency error" msgstr "Intern fejl" -#: src/config/cmdline.c:637 +#: src/config/cmdline.c:647 msgid "Restrict to anonymous mode" msgstr "Begræns til anonyme brugere" -#: src/config/cmdline.c:639 +#: src/config/cmdline.c:649 msgid "" "Restricts ELinks so it can run on an anonymous account.\n" "Local file browsing, downloads, and modification of options\n" @@ -1236,21 +1240,21 @@ msgstr "" "fremvisere er tilladt, men brugeren kan ikke tilføje eller ændre i\n" "opsætningen af hvilke fremvisere der bruges ved hvilke filtyper." -#: src/config/cmdline.c:644 +#: src/config/cmdline.c:654 msgid "Autosubmit first form" msgstr "Indsend første formular automatisk" -#: src/config/cmdline.c:646 +#: src/config/cmdline.c:656 msgid "Automatically submit the first form in the given URLs." msgstr "Indsend automatisk den første formular i de givne adresser." # rettet "ID" til fælleskøn, men måske er det et ID-nummer og så er din # bedre, men i så fald burde vi kalde det ID-nummer og ikke bare ID. -#: src/config/cmdline.c:648 +#: src/config/cmdline.c:658 msgid "Clone internal session with given ID" msgstr "Kloning af intern session med et givent id-nummer" -#: src/config/cmdline.c:650 +#: src/config/cmdline.c:660 msgid "" "Used internally when opening ELinks instances in new windows.\n" "The ID maps to information that will be used when creating the\n" @@ -1260,11 +1264,11 @@ msgstr "" "Det givne id-nummer henviser til information som den nye instans\n" "baseres på. Dette programargument bør ikke benyttes." -#: src/config/cmdline.c:656 +#: src/config/cmdline.c:666 msgid "Name of directory with configuration file" msgstr "Navn på katalog med opsætningsfil" -#: src/config/cmdline.c:658 +#: src/config/cmdline.c:668 msgid "" "Path of the directory ELinks will read and write its\n" "config and runtime state files to instead of ~/.elinks.\n" @@ -1276,11 +1280,11 @@ msgstr "" "den opfattet som absolut. Ellers antages den at være relativ i\n" "forhold til dit hjemmekatalog." -#: src/config/cmdline.c:663 +#: src/config/cmdline.c:673 msgid "Print default configuration file to stdout" msgstr "Udskriv standard opsætningsfil til standarduddata" -#: src/config/cmdline.c:665 +#: src/config/cmdline.c:675 msgid "" "Print a configuration file with options set to the built-in\n" "defaults to stdout." @@ -1288,11 +1292,11 @@ msgstr "" "Udskriv en opsætningsfil med indstillinger sat til de\n" "indbyggede standardværdier til standarduddata." -#: src/config/cmdline.c:670 +#: src/config/cmdline.c:680 msgid "Name of configuration file" msgstr "Navn på opsætningsfil" -#: src/config/cmdline.c:672 +#: src/config/cmdline.c:682 msgid "" "Name of the configuration file that all configuration\n" "options will be read from and written to. It should be\n" @@ -1301,27 +1305,27 @@ msgstr "" "Navn på opsætningsfil som alle indstillinger skrives til. Den bør\n" "angives relativt i forhold til opsætningskataloget." -#: src/config/cmdline.c:676 +#: src/config/cmdline.c:686 msgid "Print help for configuration options" msgstr "Udskriv hjælp til opsætningsindstillinger" -#: src/config/cmdline.c:678 +#: src/config/cmdline.c:688 msgid "Print help for configuration options and exit." msgstr "Udskriv hjælp til opsætningsindstillinger og afslut." -#: src/config/cmdline.c:680 +#: src/config/cmdline.c:690 msgid "MIME type assumed for unknown document types" msgstr "MIME-typen som antages for dokumenter af ukendt type" -#: src/config/cmdline.c:682 +#: src/config/cmdline.c:692 msgid "The default MIME type used for documents of unknown type." msgstr "Forvalgt MIME-type for dokumenter af ukendt type." -#: src/config/cmdline.c:684 +#: src/config/cmdline.c:694 msgid "Ignore user-defined keybindings" msgstr "Ignorér brugerdefinerede tasteturgenveje" -#: src/config/cmdline.c:686 +#: src/config/cmdline.c:696 msgid "" "When set, all keybindings from configuration files will be\n" "ignored. It forces use of default keybindings and will reset\n" @@ -1331,37 +1335,37 @@ msgstr "" "blive ignoreret. Dette tvinger brug af standard tasteturgenveje\n" "og vil nulstille brugerdefinerede genveje ved gemning." -#: src/config/cmdline.c:690 +#: src/config/cmdline.c:700 msgid "Print formatted versions of given URLs to stdout" msgstr "" "Udskriv tekstformaterede versioner af de givne adresser til standarduddata" -#: src/config/cmdline.c:692 +#: src/config/cmdline.c:702 msgid "Print formatted plain-text versions of given URLs to stdout." msgstr "" "Udskriv tekstformaterede versioner af de givne adresser til standarduddata." -#: src/config/cmdline.c:694 +#: src/config/cmdline.c:704 msgid "Codepage to use with -dump" msgstr "Tegnkodningstabel brugt med -dump" -#: src/config/cmdline.c:696 +#: src/config/cmdline.c:706 msgid "Codepage used when formatting dump output." msgstr "Tegnkodningstabel brugt i uddata fra -dump." -#: src/config/cmdline.c:698 +#: src/config/cmdline.c:708 msgid "Width of document formatted with -dump" msgstr "Bredde på dokumenter formateret med -dump" -#: src/config/cmdline.c:700 +#: src/config/cmdline.c:710 msgid "Width of the dump output." msgstr "Bredde på uddata fra -dump." -#: src/config/cmdline.c:702 +#: src/config/cmdline.c:712 msgid "Evaluate configuration file directive" msgstr "Evaluér angiven opsætningsindstilling" -#: src/config/cmdline.c:704 +#: src/config/cmdline.c:714 msgid "" "Specify configuration file directives on the command-line\n" "which will be evaluated after all configuration files has been\n" @@ -1374,11 +1378,11 @@ msgstr "" "\t-eval 'set protocol.file.allow_special_files = 1'" #. lynx compatibility -#: src/config/cmdline.c:710 +#: src/config/cmdline.c:720 msgid "Interpret documents of unknown types as HTML" msgstr "Fortolk dokumenter af ukendt type som HTML" -#: src/config/cmdline.c:712 +#: src/config/cmdline.c:722 msgid "" "Makes ELinks assume documents of unknown types are HTML.\n" "Useful when using ELinks as an external viewer from MUAs.\n" @@ -1388,19 +1392,19 @@ msgstr "" "når ELinks bruges som ekstern fremviser fra e-postprogrammer.\n" "Modsvarer kommandolinje-parameteren -default-mime-type text/html." -#: src/config/cmdline.c:722 +#: src/config/cmdline.c:732 msgid "Print usage help and exit" msgstr "Udskriv brugervejledning og afslut" -#: src/config/cmdline.c:724 +#: src/config/cmdline.c:734 msgid "Print usage help and exit." msgstr "Udskriv brugervejledning og afslut." -#: src/config/cmdline.c:726 +#: src/config/cmdline.c:736 msgid "Only permit local connections" msgstr "Tillad kun lokale forbindelser" -#: src/config/cmdline.c:728 +#: src/config/cmdline.c:738 msgid "" "Restricts ELinks to work offline and only connect to servers\n" "with local addresses (ie. 127.0.0.1). No connections to remote\n" @@ -1410,29 +1414,29 @@ msgstr "" "oprette forbindelse til servere med lokale netadresser\n" "(dvs. 127.0.0.1). Ingen forbindelser til fjernservere er tilladt." -#: src/config/cmdline.c:732 +#: src/config/cmdline.c:742 msgid "Print detailed usage help and exit" msgstr "Udskriv detaljeret brugervejledning og afslut" -#: src/config/cmdline.c:734 +#: src/config/cmdline.c:744 msgid "Print detailed usage help and exit." msgstr "Udskriv detaljeret brugervejledning og afslut." -#: src/config/cmdline.c:736 +#: src/config/cmdline.c:746 msgid "Look up specified host" msgstr "Kontakt den specificerede værtsmaskine" -#: src/config/cmdline.c:738 +#: src/config/cmdline.c:748 msgid "Look up specified host and print all DNS resolved IP addresses." msgstr "" "Kontakt den specificerede værtsmaskine og udskriv alle IP-adresser\n" "fundet ved DNS-opslag." -#: src/config/cmdline.c:740 +#: src/config/cmdline.c:750 msgid "Run as separate instance" msgstr "Kør som separat session" -#: src/config/cmdline.c:742 +#: src/config/cmdline.c:752 msgid "" "Run ELinks as a separate instance instead of connecting to an\n" "existing instance. Note that normally no runtime state files\n" @@ -1443,11 +1447,11 @@ msgstr "" "at ingen sessionstilknyttede filer (bogmærker, historik osv.) bliver\n" "skrevet til disken når denne indstilling bruges. Se også -touch-files." -#: src/config/cmdline.c:747 +#: src/config/cmdline.c:757 msgid "Disable use of files in ~/.elinks" msgstr "Brug ikke filer i ~/.elinks" -#: src/config/cmdline.c:749 +#: src/config/cmdline.c:759 msgid "" "Disables creation and use of files in the user specific home\n" "configuration directory (~/.elinks). It forces default configuration\n" @@ -1457,11 +1461,11 @@ msgstr "" "opsætningskatalog (~/.elinks). Dette tvinger brug af standardværdier\n" "for indstillinger og slår skrivning af køreselstids-tilstandsfiler fra." -#: src/config/cmdline.c:753 +#: src/config/cmdline.c:763 msgid "Disable link numbering in dump output" msgstr "Undlad at nummerere links i uddata fra -dump" -#: src/config/cmdline.c:755 +#: src/config/cmdline.c:765 msgid "" "Prevents printing of link number in dump output.\n" "Note that this really affects only -dump, nothing else." @@ -1469,11 +1473,11 @@ msgstr "" "Deaktiverer nummerering af links i uddata fra -dump.\n" "Bemærk at at dette kun påvirker -dump og ikke andet." -#: src/config/cmdline.c:758 +#: src/config/cmdline.c:768 msgid "Disable printing of link references in dump output" msgstr "Undlad at udskrive linkadresser i uddata fra -dump" -#: src/config/cmdline.c:760 +#: src/config/cmdline.c:770 msgid "" "Prevents printing of references (URIs) of document links\n" "in dump output.\n" @@ -1482,11 +1486,11 @@ msgstr "" "Deaktiverer udskrivning af linkadresser i uddata fra -dump.\n" "Bemærk at at dette kun påvirker -dump og ikke andet." -#: src/config/cmdline.c:764 +#: src/config/cmdline.c:774 msgid "Control an already running ELinks" msgstr "Kontrollér en allerede kørende ELinks" -#: src/config/cmdline.c:766 +#: src/config/cmdline.c:776 msgid "" "Control a remote ELinks instance by passing commands to it.\n" "The option takes an additional argument containing the method\n" @@ -1501,6 +1505,7 @@ msgid "" "\topenURL(URL, new-tab) : open URL in new tab\n" "\topenURL(URL, new-window) : open URL in new window\n" "\taddBookmark(URL) : bookmark URL\n" +"\tinfoBox(text) : show text in a message box\n" "\txfeDoCommand(openBrowser) : open new window" msgstr "" "Fjernkontroller en ELinks instans ved at videregive kommandoer\n" @@ -1516,13 +1521,14 @@ msgstr "" "\topenURL(URL, new-tab) : åbn adresse i et nyt faneblad\n" "\topenURL(URL, new-window) : åbn adresse i et nyt terminalvindue\n" "\taddBookmark(URL) : tilføj adresse til bogmærker\n" +"\tinfoBox(text) : vis tekst i et dialogvindue\n" "\txfeDoCommand(openBrowser) : åbn nyt terminalvindue" -#: src/config/cmdline.c:781 +#: src/config/cmdline.c:792 msgid "Connect to session ring with given ID" msgstr "Forbind til sessionskreds med angiven ID" -#: src/config/cmdline.c:783 +#: src/config/cmdline.c:794 msgid "" "ID of session ring this ELinks session should connect to. ELinks\n" "works in so-called session rings, whereby all instances of ELinks\n" @@ -1553,20 +1559,20 @@ msgstr "" "Bemærk i den forbindelse også at filer med oplysning om kørselstilstand\n" "ikke bliver skrevet til disk med -no-connect. Se også -touch-files." -#: src/config/cmdline.c:798 +#: src/config/cmdline.c:809 msgid "Print the source of given URLs to stdout" msgstr "Udskriv kildeteksten for givne adresser til standarduddata" -#: src/config/cmdline.c:800 +#: src/config/cmdline.c:811 msgid "Print given URLs in source form to stdout." msgstr "Udskriv kildeteksten for givne adresser til standarduddata." -#: src/config/cmdline.c:804 +#: src/config/cmdline.c:815 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring" msgstr "" "Opret filer i ~/.elinks når Elinks startes med -no-connect/-session-ring" -#: src/config/cmdline.c:806 +#: src/config/cmdline.c:817 msgid "" "When enabled, runtime state files (bookmarks, history, etc.) are\n" "written to disk, even when -no-connect or -session-ring is used.\n" @@ -1578,11 +1584,11 @@ msgstr "" "Indstillingen har kun effekt hvis den bruges i forbindelse med\n" "en af de ovennævnte indstillinger." -#: src/config/cmdline.c:811 +#: src/config/cmdline.c:822 msgid "Verbose level" msgstr "Verbositetsniveau" -#: src/config/cmdline.c:813 +#: src/config/cmdline.c:824 msgid "" "The verbose level controls what messages are shown at\n" "start up and while running:\n" @@ -1596,11 +1602,11 @@ msgstr "" "\t1 betyder vis kritiske fejl og advarsler\n" "\t1 betyder vis alle beskeder" -#: src/config/cmdline.c:819 +#: src/config/cmdline.c:830 msgid "Print version information and exit" msgstr "Udskriv versionsinformation og afslut" -#: src/config/cmdline.c:821 +#: src/config/cmdline.c:832 msgid "Print ELinks version information and exit." msgstr "Udskriv versionsnummer på ELinks og afslut." @@ -1737,7 +1743,7 @@ msgid "(expand by pressing space)" msgstr "(udfold ved at taste mellemrum)" #: src/config/dialogs.c:176 src/config/dialogs.c:361 -#: src/config/options.inc:776 +#: src/config/options.inc:780 msgid "Type" msgstr "Type" @@ -1764,9 +1770,10 @@ msgstr "-" msgid "Description" msgstr "Beskrivelse" -#: src/config/dialogs.c:323 src/protocol/bittorrent/dialogs.c:599 -#: src/protocol/protocol.c:224 src/session/session.c:252 -#: src/viewer/text/textarea.c:363 src/viewer/text/textarea.c:370 +#: src/config/dialogs.c:323 src/protocol/bittorrent/dialogs.c:595 +#: src/protocol/protocol.c:226 src/session/session.c:283 +#: src/session/session.c:952 src/viewer/text/textarea.c:363 +#: src/viewer/text/textarea.c:370 msgid "Error" msgstr "Fejl" @@ -1787,41 +1794,49 @@ msgstr "" "specialindstilling eksempelvis en mappe - prøv at taste mellemrum for at " "åbne den." -#: src/config/dialogs.c:464 src/config/dialogs.c:489 +#: src/config/dialogs.c:462 +msgid "" +"Option names may only contain alpha-numeric characters\n" +"in addition to '_' and '-'." +msgstr "" +"Navne på indstillinger må kun indeholde alfanumeriske tegn\n" +"ud over '_' og '-'." + +#: src/config/dialogs.c:482 src/config/dialogs.c:507 msgid "Add option" msgstr "Tilføj indstilling" -#: src/config/dialogs.c:465 +#: src/config/dialogs.c:483 msgid "Cannot add an option here." msgstr "Indstillinger kan ikke tilføjes her." -#: src/config/dialogs.c:516 src/config/dialogs.c:954 src/cookies/dialogs.c:425 +#: src/config/dialogs.c:534 src/config/dialogs.c:946 src/cookies/dialogs.c:425 #: src/dialogs/options.c:211 src/formhist/dialogs.c:214 -#: src/protocol/bittorrent/dialogs.c:793 src/session/download.c:1106 +#: src/protocol/bittorrent/dialogs.c:789 src/session/download.c:1106 msgid "Sa~ve" msgstr "~Gem" -#: src/config/dialogs.c:521 +#: src/config/dialogs.c:539 msgid "Option manager" msgstr "Opsætningshåndtering" -#: src/config/dialogs.c:692 +#: src/config/dialogs.c:701 msgid "Keystroke" msgstr "Tastetildeling" -#: src/config/dialogs.c:694 src/config/options.inc:1135 +#: src/config/dialogs.c:703 src/config/options.inc:1139 msgid "Action" msgstr "Handling" -#: src/config/dialogs.c:695 +#: src/config/dialogs.c:704 msgid "Keymap" msgstr "Tasteoversigt" -#: src/config/dialogs.c:828 +#: src/config/dialogs.c:829 msgid "Keystroke already used" msgstr "Tastetildeling allerede i brug" -#: src/config/dialogs.c:829 +#: src/config/dialogs.c:830 #, c-format msgid "" "The keystroke \"%s\" is currently used for \"%s\".\n" @@ -1830,23 +1845,23 @@ msgstr "" "Tastetildelingen \"%s\" bruges allerede af \"%s\".\n" "Er du sikker på at du vil erstatte den?" -#: src/config/dialogs.c:852 src/config/dialogs.c:869 src/config/dialogs.c:915 +#: src/config/dialogs.c:853 src/config/dialogs.c:870 src/config/dialogs.c:907 msgid "Add keybinding" msgstr "Tilføj tastetildeling" -#: src/config/dialogs.c:853 +#: src/config/dialogs.c:854 msgid "Invalid keystroke." msgstr "Ugyldig tastetildeling." -#: src/config/dialogs.c:870 +#: src/config/dialogs.c:871 msgid "Need to select a keymap." msgstr "Det er nødvendigt at vælge en tasteoversigt." -#: src/config/dialogs.c:952 src/dialogs/info.c:135 src/globhist/dialogs.c:231 +#: src/config/dialogs.c:944 src/dialogs/info.c:135 src/globhist/dialogs.c:231 msgid "~Toggle display" msgstr "Skift mellem ~visning" -#: src/config/dialogs.c:959 +#: src/config/dialogs.c:951 msgid "Keybinding manager" msgstr "Tastetildelingshåndtering" @@ -1873,31 +1888,31 @@ msgstr "" "om variablen $HOME har en korrekt værdi og om du har skriverettigheder til " "dit hjemmekatalog." -#: src/config/kbdbind.c:209 +#: src/config/kbdbind.c:210 msgid "Main mapping" msgstr "Primære tastetildelinger" -#: src/config/kbdbind.c:210 +#: src/config/kbdbind.c:211 msgid "Edit mapping" msgstr "Tastetildelinger ved redigering" -#: src/config/kbdbind.c:211 +#: src/config/kbdbind.c:212 msgid "Menu mapping" msgstr "Tastetildelinger i menu" -#: src/config/kbdbind.c:512 +#: src/config/kbdbind.c:525 msgid "Unrecognised keymap" msgstr "Ugenkendt tasteoversigt" -#: src/config/kbdbind.c:515 +#: src/config/kbdbind.c:528 msgid "Error parsing keystroke" msgstr "Fortolkningsfejl i tastetryk" -#: src/config/kbdbind.c:519 +#: src/config/kbdbind.c:532 msgid "Unrecognised action (internal error)" msgstr "Ukendt handling (intern fejl)" -#: src/config/kbdbind.c:535 +#: src/config/kbdbind.c:548 msgid "Error registering event" msgstr "Fejl ved registrering af event" @@ -2264,6 +2279,13 @@ msgid "" "variable $EDITOR. If $EDITOR is empty or not set, ELinks will then\n" "default to \"vi\"." msgstr "" +"Sti til programmet som ELinks skal start når brugeren ønsker\n" +"at redigere et tekstfelt (angivet med textarea-elementet)\n" +"med en ekstern editor.\n" +"\n" +"Hvis der ikke angives et program, vil værdien af miljøvariablen\n" +"$EDITOR blive brugt. Hvis $EDITOR ikke er tom eller ikke er sat\n" +"vil programmet \"vi\" blive benyttet." #: src/config/options.inc:203 msgid "Images" @@ -2409,13 +2431,13 @@ msgstr "Farver" msgid "Active link colors." msgstr "Farver for det aktuelle link." -#: src/config/options.inc:274 src/config/options.inc:534 -#: src/config/options.inc:861 +#: src/config/options.inc:274 src/config/options.inc:539 +#: src/config/options.inc:865 msgid "Background color" msgstr "Baggrundsfarve" -#: src/config/options.inc:276 src/config/options.inc:536 -#: src/config/options.inc:862 +#: src/config/options.inc:276 src/config/options.inc:541 +#: src/config/options.inc:866 msgid "Default background color." msgstr "Forvalgt baggrundsfarve." @@ -2427,13 +2449,13 @@ msgstr "Forvalgt baggrundsfarve." #. * on it. #. The colors and mono tree should be similar but with different default #. * values of course so always use the macros below. -#: src/config/options.inc:278 src/config/options.inc:530 -#: src/config/options.inc:859 +#: src/config/options.inc:278 src/config/options.inc:535 +#: src/config/options.inc:863 msgid "Text color" msgstr "Tekstfarve" -#: src/config/options.inc:280 src/config/options.inc:532 -#: src/config/options.inc:860 +#: src/config/options.inc:280 src/config/options.inc:537 +#: src/config/options.inc:864 msgid "Default text color." msgstr "Forvalgt tekstfarve." @@ -2465,7 +2487,7 @@ msgstr "Byt om p msgid "Invert the fore- and background color so the link stands out." msgstr "Byt om på for- og baggrundsfarve så linket fremhæves." -#: src/config/options.inc:296 src/config/options.inc:824 +#: src/config/options.inc:296 src/config/options.inc:828 #: src/dialogs/options.c:206 msgid "Underline" msgstr "Understreg" @@ -2499,18 +2521,20 @@ msgid "" "Define how to handle links having target=_blank set:\n" "0 means open link in current tab\n" "1 means open link in new tab in foreground\n" -"2 means open link in new tab in background" +"2 means open link in new tab in background\n" +"3 means open link in new window" msgstr "" "Definerer hvordan links med target=_blank sat håndteres:\n" "0 betyder åbn link i det aktuelle faneblad\n" "1 betyder åbn link i et nyt faneblad i forgrunden\n" -"2 betyder åbn link i et nyt faneblad i baggrunden" +"2 betyder åbn link i et nyt faneblad i baggrunden\n" +"3 betyder åbn link i et nyt vindue" -#: src/config/options.inc:323 +#: src/config/options.inc:324 msgid "Use tabindex" msgstr "Anvend tabindex" -#: src/config/options.inc:325 +#: src/config/options.inc:326 msgid "" "Whether to navigate links using tabindex specified ordering.\n" "The TABINDEX attribute in HTML elements specifies the order\n" @@ -2522,11 +2546,19 @@ msgstr "" "links skal fokuseres når tasteturet anvendes til at navigere\n" "dokumentet." -#: src/config/options.inc:330 +#: src/config/options.inc:331 +msgid "Missing fragment reporting" +msgstr "Rapportering af manglende fragment" + +#: src/config/options.inc:333 +msgid "Open a message box when document has no tag with given id." +msgstr "Åbn dialogvindue når et dokument ikke indeholder et angivet ID." + +#: src/config/options.inc:335 msgid "Number keys select links" msgstr "Numeriske taster vælger links" -#: src/config/options.inc:332 +#: src/config/options.inc:337 msgid "" "Number keys select links rather than specify command prefixes. This\n" "is a tristate:\n" @@ -2540,11 +2572,11 @@ msgstr "" "1 betyder hvis document.browse.links.numbering = 1\n" "2 betyder altid" -#: src/config/options.inc:338 +#: src/config/options.inc:343 msgid "Warn about maliciously crafted URIs" msgstr "Advar om ondskabsfuldt konstruerede adresser" -#: src/config/options.inc:340 +#: src/config/options.inc:345 msgid "" "When following a link the user ID part of the URI is\n" "checked and if a maliciously crafted URI is detected a\n" @@ -2557,12 +2589,12 @@ msgstr "" #. TODO - this is somehow implemented by ff, but disabled #. * for now as it doesn't work. -#: src/config/options.inc:346 +#: src/config/options.inc:351 msgid "Wrap-around links cycling" msgstr "Bund/top navigeringscyklus for links" #. 0 -#: src/config/options.inc:348 +#: src/config/options.inc:353 msgid "" "When pressing 'down' on the last link, jump at the first one, and\n" "vice versa." @@ -2570,19 +2602,19 @@ msgstr "" "Når der tastes \"pil ned\" på det sidste link, hop da til\n" "det første og omvendt." -#: src/config/options.inc:352 +#: src/config/options.inc:357 msgid "Scrolling" msgstr "Rulning" -#: src/config/options.inc:354 +#: src/config/options.inc:359 msgid "Scrolling options." msgstr "Indstillinger for rulning." -#: src/config/options.inc:356 +#: src/config/options.inc:361 msgid "Horizontal step" msgstr "Vandret tekstmargin" -#: src/config/options.inc:358 +#: src/config/options.inc:363 msgid "" "Number of columns to scroll when a key bound to scroll-left or scroll-\n" "right is pressed and no prefix was given." @@ -2590,11 +2622,11 @@ msgstr "" "Antal linjer der rulles når en taste der er tildelt scroll-up\n" "eller scroll-down trykkes og intet præfiks er angivet." -#: src/config/options.inc:361 +#: src/config/options.inc:366 msgid "Extended horizontal scrolling" msgstr "Udvidet horisontal rul" -#: src/config/options.inc:363 +#: src/config/options.inc:368 msgid "" "Whether to allow horizontal scrolling when the document\n" "does not extend off the screen. Useful for copy/paste\n" @@ -2604,11 +2636,11 @@ msgstr "" "dokumentet ikke er bredere end skærmen. Brugbart ved\n" "kopiering til og indsættelse fra klippebord." -#: src/config/options.inc:367 +#: src/config/options.inc:372 msgid "Margin" msgstr "Margin" -#: src/config/options.inc:369 +#: src/config/options.inc:374 msgid "" "Size of the virtual margin - when you click inside of that margin,\n" "document scrolls in that direction." @@ -2616,11 +2648,11 @@ msgstr "" "Størrelse på virtuel margin. Når du klikker indenfor denne\n" "margin, ruller dokumentet i denne retning." -#: src/config/options.inc:372 +#: src/config/options.inc:377 msgid "Vertical step" msgstr "Vertikal skridt" -#: src/config/options.inc:374 +#: src/config/options.inc:379 msgid "" "Number of lines to scroll when a key bound to scroll-up or scroll-\n" "down is pressed and no prefix was given." @@ -2628,29 +2660,29 @@ msgstr "" "Antal linjer der rulles når en taste der er tildelt scroll-up\n" "eller scroll-down trykkes og intet præfiks er angivet." -#: src/config/options.inc:378 +#: src/config/options.inc:383 msgid "Searching" msgstr "Søgning" -#: src/config/options.inc:380 +#: src/config/options.inc:385 msgid "Options for searching." msgstr "Indstillinger for søgning." -#: src/config/options.inc:382 +#: src/config/options.inc:387 msgid "Case sensitivity" msgstr "Versalfølsomhed" -#: src/config/options.inc:384 +#: src/config/options.inc:389 msgid "" "Whether the search should match the document text while maintaining\n" "case sensitivity." msgstr "Om der skelnes mellem store og små bogstaver i søgemønstre." -#: src/config/options.inc:388 +#: src/config/options.inc:393 msgid "Regular expressions" msgstr "Regulære udtryk" -#: src/config/options.inc:390 +#: src/config/options.inc:395 msgid "" "Enable searching with regular expressions:\n" "0 for plain text searching\n" @@ -2662,11 +2694,11 @@ msgstr "" "1 betyder søg med basale regulære udtryk\n" "2 betyder søg med udvidede regulære udtryk" -#: src/config/options.inc:396 +#: src/config/options.inc:401 msgid "Show search hit top or bottom dialogs" msgstr "Vis dialoger hvis søgning rammer top eller bund" -#: src/config/options.inc:398 +#: src/config/options.inc:403 msgid "" "Whether to show a dialog when the search hits top or bottom of the\n" "document." @@ -2674,21 +2706,21 @@ msgstr "" "Om en dialogboks skal vises der underretter bruger om at\n" "en søgning har nået dokumentets top eller bund." -#: src/config/options.inc:401 +#: src/config/options.inc:406 msgid "Wraparound" msgstr "Fortsæt søgning fra begyndelse/slut af dokument" -#: src/config/options.inc:403 +#: src/config/options.inc:408 msgid "Wrap around when searching. Currently only used for typeahead." msgstr "" "Fortsæt søgning fra begyndelse/slut af dokument hvis bunden/toppen\n" "rammes. I øjeblikket kun brugt ved tast og find." -#: src/config/options.inc:405 +#: src/config/options.inc:410 msgid "Show not found" msgstr "Vis ikke-fundet" -#: src/config/options.inc:407 +#: src/config/options.inc:412 msgid "" "How to inform the user when nothing is matched:\n" "0 means do nothing\n" @@ -2700,11 +2732,11 @@ msgstr "" "1 betyder at der gives et \"bip\"\n" "2 betyder at en påmindelse popper op" -#: src/config/options.inc:412 +#: src/config/options.inc:417 msgid "Typeahead searching" msgstr "Tast og find" -#: src/config/options.inc:414 +#: src/config/options.inc:419 msgid "" "Start typeahead searching when an unbound key is pressed without\n" "any modifiers. Note that most keys have default bindings, so this\n" @@ -2725,19 +2757,19 @@ msgstr "" "1 betyder begynd automatisk tast og find søgning af linktekst\n" "2 betyder begynd automatisk tast og find søgning af dokumenttekst" -#: src/config/options.inc:423 +#: src/config/options.inc:428 msgid "Horizontal text margin" msgstr "Vandret tekstmargin" -#: src/config/options.inc:425 +#: src/config/options.inc:430 msgid "Horizontal text margin." msgstr "Vandret tekstmargin." -#: src/config/options.inc:427 +#: src/config/options.inc:432 msgid "Document meta refresh" msgstr "Dokument meta-genopfriskning" -#: src/config/options.inc:429 +#: src/config/options.inc:434 msgid "" "Automatically follow document-specified refresh directives ('\n" "refresh' tags). Web-page authors use these to instruct the browser\n" @@ -2754,11 +2786,11 @@ msgstr "" "Brug document.browse.minimum_refresh_time til at styre det\n" "mindste antal sekunder en genopfriskning må vente." -#: src/config/options.inc:436 +#: src/config/options.inc:441 msgid "Document meta refresh minimum time" msgstr "Minimumstid for genopfriskning af dokument" -#: src/config/options.inc:438 +#: src/config/options.inc:443 msgid "" "The minimum number of milliseconds that should pass before\n" "refreshing. If set to zero the document refresh time is used\n" @@ -2771,28 +2803,28 @@ msgstr "" "dokumenter fra historikken hvor genopfriskning er sat\n" "til nul." -#: src/config/options.inc:443 +#: src/config/options.inc:448 msgid "Tables navigation order" msgstr "Navigeringsorden i tabeller" -#: src/config/options.inc:445 +#: src/config/options.inc:450 msgid "Move by columns in table, instead of rows." msgstr "Naviger tabeller kolonnevis i stedet for rækkevis." #. Keep options in alphabetical order. -#: src/config/options.inc:451 +#: src/config/options.inc:456 msgid "Cache" msgstr "Cache" -#: src/config/options.inc:453 +#: src/config/options.inc:458 msgid "Cache options." msgstr "Cacheindstillinger." -#: src/config/options.inc:455 +#: src/config/options.inc:460 msgid "Cache information about redirects" msgstr "Gem informationer om omdirigeringer i cachen" -#: src/config/options.inc:457 +#: src/config/options.inc:462 msgid "" "Cache even redirects sent by server (usually thru HTTP by a 302\n" "HTTP code and a Location header). This was the original behaviour\n" @@ -2832,11 +2864,11 @@ msgstr "" "omdirigeringer derfor blive hentet i cachen og ikke ved at\n" "sende en forespørgsel til serveren." -#: src/config/options.inc:475 +#: src/config/options.inc:480 msgid "Ignore cache-control info from server" msgstr "Ignorér cachestyringsinfo fra server" -#: src/config/options.inc:477 +#: src/config/options.inc:482 msgid "" "Ignore Cache-Control and Pragma server headers.\n" "When set, the document is cached even with 'Cache-Control: no-cache'." @@ -2845,19 +2877,19 @@ msgstr "" "Når denne er aktiv, vil dokumentet blive gemt i cachen,\n" "selv med \"Cache-Control: no-cache\"." -#: src/config/options.inc:480 +#: src/config/options.inc:485 msgid "Formatted documents" msgstr "Formaterede dokumenter" -#: src/config/options.inc:482 +#: src/config/options.inc:487 msgid "Format cache options." msgstr "Indstillinger for tekstformaterede dokumenter." -#: src/config/options.inc:484 +#: src/config/options.inc:489 msgid "Number" msgstr "Antal" -#: src/config/options.inc:486 +#: src/config/options.inc:491 msgid "" "Number of cached formatted pages. Do not get too generous\n" "here, 'formatted' means that all the accompanying structures\n" @@ -2889,31 +2921,31 @@ msgstr "" "betyder at størrelsen på hukommelsecachen overskrider maksimum.\n" "Efterfølgende kan yderligere dokumenter ikke tilføjes i cachen." -#: src/config/options.inc:500 src/dialogs/info.c:201 +#: src/config/options.inc:505 src/dialogs/info.c:201 msgid "Memory cache" msgstr "Hukommelsescache" -#: src/config/options.inc:502 +#: src/config/options.inc:507 msgid "Memory cache options." msgstr "Indstillinger for hukommelsescache." -#: src/config/options.inc:506 +#: src/config/options.inc:511 msgid "Memory cache size (in bytes)." msgstr "Størrelse på hukommelsescache (i bytes)." -#: src/config/options.inc:510 +#: src/config/options.inc:515 msgid "Charset" msgstr "Tegnsæt" -#: src/config/options.inc:512 +#: src/config/options.inc:517 msgid "Charset options." msgstr "Tegnsætindstillinger." -#: src/config/options.inc:514 +#: src/config/options.inc:519 msgid "Default codepage" msgstr "Forvalgt tegnkodningstabel" -#: src/config/options.inc:516 +#: src/config/options.inc:521 msgid "" "Default document codepage. 'System' stands for\n" "a codepage determined by a selected locale." @@ -2922,59 +2954,59 @@ msgstr "" "at tegnkodningstabellen vælges på baggrund af den valgte\n" "sprogindstilling." -#: src/config/options.inc:519 +#: src/config/options.inc:524 msgid "Ignore charset info from server" msgstr "Ignorér information om tegnsæt fra server" -#: src/config/options.inc:521 +#: src/config/options.inc:526 msgid "Ignore charset info sent by server." msgstr "Ignorér information om tegnsæt sendt fra server." -#: src/config/options.inc:525 +#: src/config/options.inc:530 msgid "Default color settings" msgstr "Forvalgte farveindstillinger" -#: src/config/options.inc:527 +#: src/config/options.inc:532 msgid "Default document color settings." msgstr "Forvalgte farveindstillinger for dokumenter." -#: src/config/options.inc:538 +#: src/config/options.inc:543 msgid "Link color" msgstr "Linkfarve" -#: src/config/options.inc:540 +#: src/config/options.inc:545 msgid "Default link color." msgstr "Forvalgt linkfarve." -#: src/config/options.inc:542 +#: src/config/options.inc:547 msgid "Visited-link color" msgstr "Farve for besøgte links" -#: src/config/options.inc:544 +#: src/config/options.inc:549 msgid "Default visited link color." msgstr "Forvalgt farve for besøgte links." -#: src/config/options.inc:546 +#: src/config/options.inc:551 msgid "Image-link color" msgstr "Farve for billedlinks" -#: src/config/options.inc:548 +#: src/config/options.inc:553 msgid "Default image link color." msgstr "Forvalgt billedlinkfarve." -#: src/config/options.inc:550 +#: src/config/options.inc:555 msgid "Bookmarked-link color" msgstr "Linkfarve for tilføjede bogmærker" -#: src/config/options.inc:552 +#: src/config/options.inc:557 msgid "Default bookmarked link color." msgstr "Forvalgt farve for links til gemte bogmærker." -#: src/config/options.inc:554 +#: src/config/options.inc:559 msgid "Directory color" msgstr "Farve for kataloger" -#: src/config/options.inc:556 +#: src/config/options.inc:561 msgid "" "Default directory color.\n" "See document.browse.links.color_dirs option." @@ -2982,39 +3014,37 @@ msgstr "" "Forvalgt farve for kataloger.\n" "Se indstillingen document.browse.links.color_dirs." -#: src/config/options.inc:563 +#: src/config/options.inc:568 msgid "Increase contrast" msgstr "Øgning af kontrast" -#: src/config/options.inc:565 +#: src/config/options.inc:570 msgid "" -"Setting this option to 0 will increase the contrast\n" -"between the foreground and background colors to ensure\n" -"readability. For example it disallows dark colors on a\n" -"black background. Note, this is different from ensuring\n" -"the contrast with the ensure_contrast option." +"Increase the contrast between the foreground and background colors\n" +"to ensure readability. For example it disallows dark colors on a\n" +"black background. Note, this is different from ensuring the contrast\n" +"with the ensure_contrast option." msgstr "" -"Ved at sætte denne indstilling til 0 øges kontrasten mellem\n" -"for- og baggrundsfarver således at læsbarheden forbedres.\n" -"Eksempelvis forbydes mørke farver på en sort baggrund. Bemærk,\n" -"at dette er forskelligt fra at kontrasten sikret med\n" +"Øger kontrasten mellem for- og baggrundsfarver således at læsbarhede\n" +"forbedres. Eksempelvis forbydes mørke farver på en sort baggrund.\n" +"Bemærk, at dette er forskelligt fra at sikre kontrasten med\n" "indstillingen ensure_contrast." -#: src/config/options.inc:571 +#: src/config/options.inc:575 msgid "Ensure contrast" msgstr "Sørg for kontrast" -#: src/config/options.inc:573 +#: src/config/options.inc:577 msgid "Makes sure that the back- and foreground color are never equal." msgstr "Sikrer at bag- og forgrundsfarver aldrig er ens." #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action #. * handling. -#: src/config/options.inc:578 +#: src/config/options.inc:582 msgid "Use document-specified colors" msgstr "Brug farver fra dokument" -#: src/config/options.inc:580 +#: src/config/options.inc:584 msgid "" "Use colors specified in document:\n" "0 is use always the default settings\n" @@ -3034,27 +3064,27 @@ msgstr "" " (transparency) på din skærm hvis du bruger en sådan." #. Keep options in alphabetical order. -#: src/config/options.inc:593 +#: src/config/options.inc:597 msgid "Downloading" msgstr "Downloadning" -#: src/config/options.inc:595 +#: src/config/options.inc:599 msgid "Options regarding files downloading and handling." msgstr "Indstillinger for downloadning og filhåndtering." -#: src/config/options.inc:597 +#: src/config/options.inc:601 msgid "Default download directory" msgstr "Forvalgt downloadkatalog" -#: src/config/options.inc:599 +#: src/config/options.inc:603 msgid "Default download directory." msgstr "Forvalgt downloadkatalog." -#: src/config/options.inc:601 +#: src/config/options.inc:605 msgid "Set original time" msgstr "Sæt oprindeligt tidsstempel" -#: src/config/options.inc:603 +#: src/config/options.inc:607 msgid "" "Set the timestamp of each downloaded file to the timestamp\n" "stored on the server." @@ -3063,11 +3093,11 @@ msgstr "" "på serveren." #. Does automatic resuming make sense as an option? -#: src/config/options.inc:607 +#: src/config/options.inc:611 msgid "Prevent overwriting" msgstr "Undgå overskrivning" -#: src/config/options.inc:609 +#: src/config/options.inc:613 msgid "" "Prevent overwriting the local files:\n" "0 is files will silently be overwritten\n" @@ -3079,11 +3109,11 @@ msgstr "" "1 betyder tilføj en cifferendelse (f.eks. \".1\") til filnavnet\n" "2 betyder spørg brugeren" -#: src/config/options.inc:614 +#: src/config/options.inc:618 msgid "Notify download completion by bell" msgstr "Lydpåmindelse om fuldendt filoverførsel (\"bell\")" -#: src/config/options.inc:616 +#: src/config/options.inc:620 msgid "" "Audio notification when download is completed:\n" "0 is never\n" @@ -3095,20 +3125,20 @@ msgstr "" "1 betyder kun når baggrundspåmindelse er aktiveret\n" "2 betyder altid" -#: src/config/options.inc:622 +#: src/config/options.inc:626 msgid "Dump output" msgstr "Dump-uddata" -#: src/config/options.inc:624 +#: src/config/options.inc:628 msgid "Dump output options." msgstr "Indstillinger for dump-uddata." -#: src/config/options.inc:626 src/config/options.inc:828 +#: src/config/options.inc:630 src/config/options.inc:832 #: src/config/opttypes.c:395 src/dialogs/document.c:164 msgid "Codepage" msgstr "Tegnkodningstabel" -#: src/config/options.inc:628 +#: src/config/options.inc:632 msgid "" "Codepage used in dump output. 'System' stands for\n" "a codepage determined by a selected locale." @@ -3117,37 +3147,37 @@ msgstr "" "tegnkodningstabellen vælges på baggrund af den valgte\n" "sprogindstilling." -#: src/config/options.inc:631 +#: src/config/options.inc:635 msgid "Footer" msgstr "Tekstfod" -#: src/config/options.inc:633 +#: src/config/options.inc:637 #, c-format msgid "Footer string used in dumps. %u is substituted by URL." msgstr "" "Tekstfod brugt ved dumpet udskrift.\n" "%u udskiftes med adressen for det dumpede dokument." -#: src/config/options.inc:637 +#: src/config/options.inc:641 #, c-format msgid "Header string used in dumps. %u is substituted by URL." msgstr "" "Teksthoved brugt ved dumpet udskrift.\n" "%u udskiftes med adressen for det dumpede dokument." -#: src/config/options.inc:639 +#: src/config/options.inc:643 msgid "Numbering" msgstr "Nummerering" -#: src/config/options.inc:641 +#: src/config/options.inc:645 msgid "Whether to print link numbers in dump output." msgstr "Vælg om linknumre skal udskrives i uddata fra -dump" -#: src/config/options.inc:643 +#: src/config/options.inc:647 msgid "References" msgstr "Referencer" -#: src/config/options.inc:645 +#: src/config/options.inc:649 msgid "" "Whether to print references (URIs) of document links\n" "in dump output." @@ -3155,83 +3185,83 @@ msgstr "" "Vælg om linkadresser (URI) i dokumentet skal udskrives\n" "i uddata fra -dump." -#: src/config/options.inc:648 +#: src/config/options.inc:652 msgid "Separator" msgstr "Separator" -#: src/config/options.inc:650 +#: src/config/options.inc:654 msgid "String which separates two dumps." msgstr "Streng som adskiller udskrift af to dumpede dokumenter." -#: src/config/options.inc:652 +#: src/config/options.inc:656 msgid "Width" msgstr "Bredde" -#: src/config/options.inc:654 +#: src/config/options.inc:658 msgid "Width of screen in characters when dumping documents." msgstr "Skærmbredde i tegn ved dumpning af dokumenter." -#: src/config/options.inc:658 +#: src/config/options.inc:662 msgid "History" msgstr "Historik" -#: src/config/options.inc:660 +#: src/config/options.inc:664 msgid "History options." msgstr "Historikindstillinger." -#: src/config/options.inc:662 +#: src/config/options.inc:666 msgid "Keep unhistory" msgstr "Behold forlæns historik" -#: src/config/options.inc:664 +#: src/config/options.inc:668 msgid "Keep unhistory (\"forward history\")." msgstr "Behold forlæns historik." -#: src/config/options.inc:667 +#: src/config/options.inc:671 msgid "HTML rendering" msgstr "HTML-gengivelse" -#: src/config/options.inc:669 +#: src/config/options.inc:673 msgid "Options concerning the display of HTML pages." msgstr "Indstillinger der styrer hvorledes HTML-sider vises." -#: src/config/options.inc:671 +#: src/config/options.inc:675 msgid "Display frames" msgstr "Vis rammer" -#: src/config/options.inc:673 +#: src/config/options.inc:677 msgid "Display frames." msgstr "Vis rammer." -#: src/config/options.inc:675 +#: src/config/options.inc:679 msgid "Display tables" msgstr "Vis tabeller" -#: src/config/options.inc:677 +#: src/config/options.inc:681 msgid "Display tables." msgstr "Vis tabeller." -#: src/config/options.inc:679 +#: src/config/options.inc:683 msgid "Display subscripts" msgstr "Vis matematisk indeks ( tag)" -#: src/config/options.inc:681 +#: src/config/options.inc:685 msgid "Display subscripts (as [thing])." msgstr "Vis matematisk indeks ( tag) som [indeks]." -#: src/config/options.inc:683 +#: src/config/options.inc:687 msgid "Display superscripts" msgstr "Vis matematisk overskrift ( tag)" -#: src/config/options.inc:685 +#: src/config/options.inc:689 msgid "Display superscripts (as ^thing)." msgstr "Vis matematisk overskrift ( tag) som ^overskrift." -#: src/config/options.inc:687 +#: src/config/options.inc:691 msgid "Rendering of html link element" msgstr "Gengivelse af HTML-links" -#: src/config/options.inc:689 +#: src/config/options.inc:693 msgid "" "How to render tags from the HTML header:\n" "0 is nothing\n" @@ -3249,11 +3279,11 @@ msgstr "" "4 betyder vis titel, navn, hreflang og type\n" "5 betyder vis det hele" -#: src/config/options.inc:697 +#: src/config/options.inc:701 msgid "Underline links" msgstr "Understreg links" -#: src/config/options.inc:699 +#: src/config/options.inc:703 msgid "Underline links." msgstr "Understreg links." @@ -3261,11 +3291,11 @@ msgstr "Understreg links." # "hard/soft wrapping" - hard wrapping er en bogstavelig linjeombrydning # hvor linjen afsluttes med et nylinjetegn, og soft wrapping er en visuel # ombrydning uden noget nylinjetegn. -#: src/config/options.inc:701 +#: src/config/options.inc:705 msgid "Wrap non breaking space" msgstr "Ombryd hårde blanktegn" -#: src/config/options.inc:703 +#: src/config/options.inc:707 msgid "" "If set do not honour non breaking space (the nbsp entity)\n" "but allow to wrap the text. This can help keeping the width\n" @@ -3276,39 +3306,39 @@ msgstr "" "bredden på dokumenter, så man ikke behøver at\n" "bladre vandret i dokumentet." -#: src/config/options.inc:708 +#: src/config/options.inc:712 msgid "Plain rendering" msgstr "Gengivelse af klartekst" -#: src/config/options.inc:710 +#: src/config/options.inc:714 msgid "Options concerning the display of plain text pages." msgstr "Indstillinger der styrer hvorledes klartekstsider vises." -#: src/config/options.inc:712 +#: src/config/options.inc:716 msgid "Display URIs" msgstr "Vis adresser" -#: src/config/options.inc:714 +#: src/config/options.inc:718 msgid "Display URIs in the document as links." msgstr "Vis adresser i dokumentet som links." -#: src/config/options.inc:716 +#: src/config/options.inc:720 msgid "Compress empty lines" msgstr "Komprimer tomme linjer" -#: src/config/options.inc:718 +#: src/config/options.inc:722 msgid "Compress successive empty lines to only one in displayed text." msgstr "Komprimer mere end to på hinanden følgende linjer til en." -#: src/config/options.inc:721 +#: src/config/options.inc:725 msgid "URI passing" msgstr "Ekstern URI håndtering" -#: src/config/options.inc:723 +#: src/config/options.inc:727 msgid "Rules for passing URIs to external commands." msgstr "Regler for håndtering af adresser af eksterne kommandoer." -#: src/config/options.inc:727 +#: src/config/options.inc:731 msgid "" "A rule for passing URI to an external command.\n" "The format is:\n" @@ -3325,19 +3355,19 @@ msgstr "" "Omring _ikke_ %c med enkelt- eller dobbelt-citationstegn." #. Keep options in alphabetical order. -#: src/config/options.inc:737 +#: src/config/options.inc:741 msgid "Information files" msgstr "Informationsfiler" -#: src/config/options.inc:739 +#: src/config/options.inc:743 msgid "Options for information files in ~/.elinks." msgstr "Indstillinger for informationsfiler i ~/.elinks." -#: src/config/options.inc:741 +#: src/config/options.inc:745 msgid "Save interval" msgstr "Gemningsinterval" -#: src/config/options.inc:743 +#: src/config/options.inc:747 msgid "" "Interval at which to trigger information files in ~/.elinks\n" "to be saved to disk if they has changed (seconds; 0 to disable)" @@ -3345,11 +3375,11 @@ msgstr "" "Interval i sekunder for skrivning af informationsfiler i ~/.elinks\n" "(hvis ændret) til disk. En værdi af 0 deaktiverer." -#: src/config/options.inc:746 +#: src/config/options.inc:750 msgid "Use secure file saving" msgstr "Gem filer på en sikker måde" -#: src/config/options.inc:748 +#: src/config/options.inc:752 msgid "" "First write data to unique temporary file, then rename this file\n" "upon successfully finishing this. Note that this relates only to\n" @@ -3372,11 +3402,11 @@ msgstr "" "atomiseringen og reducerer troværdigheden af denne\n" "funktion." -#: src/config/options.inc:757 +#: src/config/options.inc:761 msgid "Use fsync(3) with secure file saving" msgstr "Brug fsync(3) ved sikker filgemning" -#: src/config/options.inc:759 +#: src/config/options.inc:763 msgid "" "When using secure file saving, call fsync(3), if the OS\n" "supports it, to force the OS immediately to write the data\n" @@ -3389,19 +3419,19 @@ msgstr "" "undgå unødig disk I/O." #. Keep options in alphabetical order. -#: src/config/options.inc:768 +#: src/config/options.inc:772 msgid "Terminals" msgstr "Terminaler" -#: src/config/options.inc:770 +#: src/config/options.inc:774 msgid "Terminal options." msgstr "Indstillinger for skærmstyring af terminaler." -#: src/config/options.inc:774 +#: src/config/options.inc:778 msgid "Options specific to this terminal type (according to $TERM value)." msgstr "Indstillinger for denne terminaltype (ifølge $TERM-variablen)." -#: src/config/options.inc:778 +#: src/config/options.inc:782 msgid "" "Terminal type; matters mostly only when drawing frames and\n" "dialog box borders:\n" @@ -3419,11 +3449,11 @@ msgstr "" "3 er KOI-8\n" "4 er FreeBSD" -#: src/config/options.inc:786 src/dialogs/options.c:202 +#: src/config/options.inc:790 src/dialogs/options.c:202 msgid "Switch fonts for line drawing" msgstr "Skift skrifttype ved linjetegning" -#: src/config/options.inc:788 +#: src/config/options.inc:792 msgid "" "Switch fonts when drawing lines, enabling both local characters\n" "and lines working at the same time. Makes sense only with linux\n" @@ -3433,11 +3463,11 @@ msgstr "" "nationale tegn og linjetegn kan bruges samtidig. Giver\n" "kun mening med en terminal af typen \"linux\"." -#: src/config/options.inc:792 src/dialogs/options.c:207 +#: src/config/options.inc:796 src/dialogs/options.c:207 msgid "UTF-8 I/O" msgstr "UTF-8 I/O" -#: src/config/options.inc:794 +#: src/config/options.inc:798 msgid "" "Enable I/O in UTF8 for Unicode terminals. Note that currently,\n" "only the subset of UTF8 according to terminal codepage is used." @@ -3447,11 +3477,11 @@ msgstr "" "svarer til de tegn der er indeholdt i terminalens\n" "tegnkodningstabel." -#: src/config/options.inc:797 src/dialogs/options.c:203 +#: src/config/options.inc:801 src/dialogs/options.c:203 msgid "Restrict frames in cp850/852" msgstr "Begræns rammer i cp850/852" -#: src/config/options.inc:799 +#: src/config/options.inc:803 msgid "" "Restrict the characters used when drawing lines. Makes sense\n" "only with linux terminals using the cp850/852 character sets." @@ -3459,11 +3489,11 @@ msgstr "" "Begræns linjetegningstegn. Giver kun mening med terminaler\n" "af typen \"linux\" sammen med tegnsættene cp850/852." -#: src/config/options.inc:802 src/dialogs/options.c:204 +#: src/config/options.inc:806 src/dialogs/options.c:204 msgid "Block cursor" msgstr "Udfyldt markør" -#: src/config/options.inc:804 +#: src/config/options.inc:808 msgid "" "Move cursor to bottom right corner when done drawing.\n" "This is particularly useful when we have a block cursor,\n" @@ -3474,11 +3504,11 @@ msgstr "" "bruges en udfyldt markør, således at farveinverteret\n" "tekst vises korrekt." -#: src/config/options.inc:808 +#: src/config/options.inc:812 msgid "Color mode" msgstr "Farvetilstand" -#: src/config/options.inc:810 +#: src/config/options.inc:814 msgid "" "The color mode controls what colors are used and how they are\n" "output to the terminal. The color modes are:\n" @@ -3492,11 +3522,11 @@ msgstr "" "1 betyder tilstanden 16-farver, som bruger de normale ANSI-farver\n" "2 betyder tilstanden 256-farve, som bruger XTerm RGB-farvekoder" -#: src/config/options.inc:816 src/dialogs/options.c:205 +#: src/config/options.inc:820 src/dialogs/options.c:205 msgid "Transparency" msgstr "Gennemsigtighed" -#: src/config/options.inc:818 +#: src/config/options.inc:822 msgid "" "If we should not set the background to black. This is particularly\n" "useful when we have a terminal (typically in some windowing\n" @@ -3510,11 +3540,11 @@ msgstr "" "- en sådan baggrund vil også blive synlig i ELinks. Dette\n" "giver kun mening hvis farver er aktiveret." -#: src/config/options.inc:826 +#: src/config/options.inc:830 msgid "If we should use underline or enhance the color instead." msgstr "Om understregning eller farvemarkering skal bruges." -#: src/config/options.inc:830 +#: src/config/options.inc:834 msgid "" "Codepage of charset used for displaying content on terminal.\n" "'System' stands for a codepage determined by a selected locale." @@ -3524,332 +3554,332 @@ msgstr "" "sprogindstilling." #. Keep options in alphabetical order. -#: src/config/options.inc:837 +#: src/config/options.inc:841 msgid "User interface" msgstr "Brugergrænseflade" -#: src/config/options.inc:839 +#: src/config/options.inc:843 msgid "User interface options." msgstr "Indstillinger for brugergrænseflade." -#: src/config/options.inc:843 +#: src/config/options.inc:847 msgid "Color settings" msgstr "Farveindstillinger" -#: src/config/options.inc:845 +#: src/config/options.inc:849 msgid "Default user interface color settings." msgstr "Forvalgte farveindstillinger for brugergrænseflade." -#: src/config/options.inc:872 +#: src/config/options.inc:876 msgid "Color terminals" msgstr "Farveterminaler" -#: src/config/options.inc:874 +#: src/config/options.inc:878 msgid "Color settings for color terminal." msgstr "Farveindstillinger for farveterminaler." -#: src/config/options.inc:876 +#: src/config/options.inc:880 msgid "Non-color terminals" msgstr "Monokrome terminaler" -#: src/config/options.inc:878 +#: src/config/options.inc:882 msgid "Color settings for non-color terminal." msgstr "Farveindstillinger for monokrome terminaler." #. FIXME: obsolete, how to alias them correctly ? --Zas -#: src/config/options.inc:881 +#: src/config/options.inc:885 msgid "Main menu bar" msgstr "Hovedmenubjælke" -#: src/config/options.inc:883 +#: src/config/options.inc:887 msgid "Main menu bar colors." msgstr "Farver for hovedmenubjælke." -#: src/config/options.inc:885 +#: src/config/options.inc:889 msgid "Unselected main menu bar item" msgstr "Inaktive menupunkter i hovedmenu" -#: src/config/options.inc:887 +#: src/config/options.inc:891 msgid "Unselected main menu bar item colors." msgstr "Farver for inaktive menupunkter i hovedmenu." -#: src/config/options.inc:889 +#: src/config/options.inc:893 msgid "Selected main menu bar item" msgstr "Aktive menupunkter i hovedmenu" -#: src/config/options.inc:891 +#: src/config/options.inc:895 msgid "Selected main menu bar item colors." msgstr "Farver for aktive menupunkter i hovedmenu." -#: src/config/options.inc:893 src/config/options.inc:922 +#: src/config/options.inc:897 src/config/options.inc:926 msgid "Hotkey" msgstr "Hurtigtast" -#: src/config/options.inc:895 +#: src/config/options.inc:899 msgid "Main menu hotkey colors." msgstr "Farver for hurtigtaster i hovedmenu." -#: src/config/options.inc:897 src/config/options.inc:926 +#: src/config/options.inc:901 src/config/options.inc:930 msgid "Unselected hotkey" msgstr "Inaktiv hurtigtast" -#: src/config/options.inc:899 +#: src/config/options.inc:903 msgid "Main menu unselected hotkey colors." msgstr "Farver for inaktiv hurtigtast." -#: src/config/options.inc:901 src/config/options.inc:930 +#: src/config/options.inc:905 src/config/options.inc:934 msgid "Selected hotkey" msgstr "Aktiv hurtigtast" -#: src/config/options.inc:903 +#: src/config/options.inc:907 msgid "Main menu selected hotkey colors." msgstr "Farver for aktiv hurtigtast i hovedmenu." -#: src/config/options.inc:906 +#: src/config/options.inc:910 msgid "Menu bar" msgstr "Menulinje" -#: src/config/options.inc:908 +#: src/config/options.inc:912 msgid "Menu bar colors." msgstr "Farver for menulinje." -#: src/config/options.inc:910 +#: src/config/options.inc:914 msgid "Unselected menu item" msgstr "Inaktivt menupunkt" -#: src/config/options.inc:912 +#: src/config/options.inc:916 msgid "Unselected menu item colors." msgstr "Farver for inaktivt menupunkt i menu." -#: src/config/options.inc:914 +#: src/config/options.inc:918 msgid "Selected menu item" msgstr "Aktivt menupunkt" -#: src/config/options.inc:916 +#: src/config/options.inc:920 msgid "Selected menu item colors." msgstr "Farver for aktivt menupunkt." -#: src/config/options.inc:918 +#: src/config/options.inc:922 msgid "Marked menu item" msgstr "Markeret menupunkt" -#: src/config/options.inc:920 +#: src/config/options.inc:924 msgid "Marked menu item colors." msgstr "Farver for markeret menupunkt." -#: src/config/options.inc:924 +#: src/config/options.inc:928 msgid "Menu item hotkey colors." msgstr "Farver for hurtigtast i menupunkt." -#: src/config/options.inc:928 +#: src/config/options.inc:932 msgid "Menu item unselected hotkey colors." msgstr "Farver for inaktive hurtigtaster i menupunkter." -#: src/config/options.inc:932 +#: src/config/options.inc:936 msgid "Menu item selected hotkey colors." msgstr "Farver for aktive hurtigtaster i menupunkter." -#: src/config/options.inc:934 +#: src/config/options.inc:938 msgid "Menu frame" msgstr "Menuramme" -#: src/config/options.inc:936 +#: src/config/options.inc:940 msgid "Menu frame colors." msgstr "Farver for menuramme." -#: src/config/options.inc:939 +#: src/config/options.inc:943 msgid "Dialog" msgstr "Dialogboks" -#: src/config/options.inc:941 +#: src/config/options.inc:945 msgid "Dialog colors." msgstr "Farver for dialogboks." -#: src/config/options.inc:951 +#: src/config/options.inc:955 msgid "Generic" msgstr "Fælles" -#: src/config/options.inc:953 +#: src/config/options.inc:957 msgid "Generic dialog colors." msgstr "Fælles farver for dialogbokse." -#: src/config/options.inc:955 +#: src/config/options.inc:959 msgid "Frame" msgstr "Ramme" -#: src/config/options.inc:957 +#: src/config/options.inc:961 msgid "Dialog frame colors." msgstr "Farve på ramme om dialogboks." -#: src/config/options.inc:959 +#: src/config/options.inc:963 msgid "Scrollbar" msgstr "Rullebjælke" -#: src/config/options.inc:961 +#: src/config/options.inc:965 msgid "Scrollbar colors." msgstr "Farver for rullebjælke." -#: src/config/options.inc:963 +#: src/config/options.inc:967 msgid "Selected scrollbar" msgstr "Farver for aktivt faneblad" -#: src/config/options.inc:965 +#: src/config/options.inc:969 msgid "Scrollbar selected colors." msgstr "Farver for aktiv rullebjælke." -#: src/config/options.inc:969 +#: src/config/options.inc:973 msgid "Dialog title colors." msgstr "Farve på titel i dialogboks." -#: src/config/options.inc:971 +#: src/config/options.inc:975 msgid "Text" msgstr "Tekst" -#: src/config/options.inc:973 +#: src/config/options.inc:977 msgid "Dialog text colors." msgstr "Farver på tekst i dialogboks." -#: src/config/options.inc:975 src/viewer/text/form.c:1452 +#: src/config/options.inc:979 src/viewer/text/form.c:1452 msgid "Checkbox" msgstr "Afkrydsningsboks" -#: src/config/options.inc:977 +#: src/config/options.inc:981 msgid "Dialog checkbox colors." msgstr "Farver for afkrydsningsboks." -#: src/config/options.inc:979 +#: src/config/options.inc:983 msgid "Selected checkbox" msgstr "Aktiv afkrydsningsboks" -#: src/config/options.inc:981 +#: src/config/options.inc:985 msgid "Dialog selected checkbox colors." msgstr "Farver for aktiv afkrydsningsboks." -#: src/config/options.inc:983 +#: src/config/options.inc:987 msgid "Checkbox label" msgstr "Mærkat på afkrydsningsboks" -#: src/config/options.inc:985 +#: src/config/options.inc:989 msgid "Dialog checkbox label colors." msgstr "Farver på afkrydsningsboksens mærkat." -#: src/config/options.inc:987 +#: src/config/options.inc:991 msgid "Button" msgstr "Knap" -#: src/config/options.inc:989 src/config/options.inc:997 +#: src/config/options.inc:993 src/config/options.inc:1001 msgid "Dialog button colors." msgstr "Farver på knapper i dialogbokse." -#: src/config/options.inc:991 +#: src/config/options.inc:995 msgid "Selected button" msgstr "Valgt knap" -#: src/config/options.inc:993 src/config/options.inc:1001 +#: src/config/options.inc:997 src/config/options.inc:1005 msgid "Dialog selected button colors." msgstr "Farver på den aktive knap i dialogbokse." -#: src/config/options.inc:995 +#: src/config/options.inc:999 msgid "Button shortcut" msgstr "Knapgenveje" -#: src/config/options.inc:999 +#: src/config/options.inc:1003 msgid "Selected button shortcut" msgstr "Genvejstast for aktiv knap" -#: src/config/options.inc:1003 src/viewer/text/form.c:1456 +#: src/config/options.inc:1007 src/viewer/text/form.c:1456 msgid "Text field" msgstr "Tekstfelt" -#: src/config/options.inc:1005 +#: src/config/options.inc:1009 msgid "Dialog text field colors." msgstr "Farver på tekstfelter i dialogbokse." -#: src/config/options.inc:1007 +#: src/config/options.inc:1011 msgid "Text field text" msgstr "Tekstfelt tekst" -#: src/config/options.inc:1009 +#: src/config/options.inc:1013 msgid "Dialog field text colors." msgstr "Farver på tekst i dialogbokses tekstfelter." -#: src/config/options.inc:1011 +#: src/config/options.inc:1015 msgid "Meter" msgstr "Måler" -#: src/config/options.inc:1013 +#: src/config/options.inc:1017 msgid "Dialog meter colors." msgstr "Farve på måler i dialogboks." -#: src/config/options.inc:1015 +#: src/config/options.inc:1019 msgid "Shadow" msgstr "Skygge" -#: src/config/options.inc:1017 +#: src/config/options.inc:1021 msgid "Dialog shadow colors (see ui.shadows option)." msgstr "Farver på dialogbokses skygger (se ui.shadows option)." -#: src/config/options.inc:1019 +#: src/config/options.inc:1023 msgid "Title bar" msgstr "Titelbjælke" -#: src/config/options.inc:1021 +#: src/config/options.inc:1025 msgid "Title bar colors." msgstr "Farver for titelbjælke." -#: src/config/options.inc:1023 +#: src/config/options.inc:1027 msgid "Generic title bar" msgstr "Fælles titelbjælke" -#: src/config/options.inc:1025 +#: src/config/options.inc:1029 msgid "Generic title bar colors." msgstr "Farver for fælles titelbjælke." -#: src/config/options.inc:1027 +#: src/config/options.inc:1031 msgid "Title bar text" msgstr "Titelbjælketekst" -#: src/config/options.inc:1029 +#: src/config/options.inc:1033 msgid "Title bar text colors." msgstr "Tekstfarve for titelbjælke." -#: src/config/options.inc:1032 +#: src/config/options.inc:1036 msgid "Status bar" msgstr "Statusbjælke" -#: src/config/options.inc:1034 +#: src/config/options.inc:1038 msgid "Status bar colors." msgstr "Farver på statusbjælke." -#: src/config/options.inc:1036 +#: src/config/options.inc:1040 msgid "Generic status bar" msgstr "Fælles statusbjælke" -#: src/config/options.inc:1038 +#: src/config/options.inc:1042 msgid "Generic status bar colors." msgstr "Fælles farver for statusbjælke." -#: src/config/options.inc:1040 +#: src/config/options.inc:1044 msgid "Status bar text" msgstr "Tekst for statusbjælke" -#: src/config/options.inc:1042 +#: src/config/options.inc:1046 msgid "Status bar text colors." msgstr "Tekstfarver i statusbjælke." -#: src/config/options.inc:1045 +#: src/config/options.inc:1049 msgid "Tabs bar" msgstr "Fanebladsbjælke" -#: src/config/options.inc:1047 +#: src/config/options.inc:1051 msgid "Tabs bar colors." msgstr "Farver for fanebladsbjælke." -#: src/config/options.inc:1049 +#: src/config/options.inc:1053 msgid "Unvisited tab" msgstr "Ubesøgt faneblad" -#: src/config/options.inc:1051 +#: src/config/options.inc:1055 msgid "" "Tab colors for tabs that have not been\n" "selected since they completed loading." @@ -3857,43 +3887,43 @@ msgstr "" "Farver på faneblade der ikke har været besøgt\n" "efter at indlæsningen af dem fuldførtes." -#: src/config/options.inc:1054 +#: src/config/options.inc:1058 msgid "Unselected tab" msgstr "Inaktivt faneblad" -#: src/config/options.inc:1056 +#: src/config/options.inc:1060 msgid "Unselected tab colors." msgstr "Farver for inaktivt faneblad." -#: src/config/options.inc:1058 +#: src/config/options.inc:1062 msgid "Loading tab" msgstr "Indlæsende faneblade" -#: src/config/options.inc:1060 +#: src/config/options.inc:1064 msgid "Tab colors for tabs that are loading in the background." msgstr "Farve på faneblade som indlæses i baggrunden." -#: src/config/options.inc:1062 +#: src/config/options.inc:1066 msgid "Selected tab" msgstr "Aktivt faneblad" -#: src/config/options.inc:1064 +#: src/config/options.inc:1068 msgid "Selected tab colors." msgstr "Farver for aktivt faneblad." -#: src/config/options.inc:1066 +#: src/config/options.inc:1070 msgid "Tab separator" msgstr "Fanebladsskilletegn" -#: src/config/options.inc:1068 +#: src/config/options.inc:1072 msgid "Tab separator colors." msgstr "Farver for skilletegn mellem faneblade." -#: src/config/options.inc:1071 +#: src/config/options.inc:1075 msgid "Searched strings" msgstr "Søgeudtryk" -#: src/config/options.inc:1073 +#: src/config/options.inc:1077 msgid "Searched string highlight colors." msgstr "Farver for fremhævning af søgeord." @@ -3901,19 +3931,19 @@ msgstr "Farver for fremh #. ============= BORING PART (colors) END =================== #. ========================================================== #. Keep options in alphabetical order. -#: src/config/options.inc:1082 +#: src/config/options.inc:1086 msgid "Dialog settings" msgstr "Indstillinger for dialogbokse" -#: src/config/options.inc:1084 +#: src/config/options.inc:1088 msgid "Dialogs-specific appearance and behaviour settings." msgstr "Indstillinger der vedrører dialogbokses udseende og adfærd." -#: src/config/options.inc:1087 +#: src/config/options.inc:1091 msgid "Minimal height of listbox widget" msgstr "Minimumhøjde på listeboks-element" -#: src/config/options.inc:1089 +#: src/config/options.inc:1093 msgid "" "Minimal height of the listbox widget (used e.g. for bookmarks\n" "or global history)." @@ -3921,11 +3951,11 @@ msgstr "" "Minimumhøjde på listeboks-element. Bruges f.eks. af\n" "bogmærke- og historikhåndtering." -#: src/config/options.inc:1092 +#: src/config/options.inc:1096 msgid "Drop shadows" msgstr "Slagskygger" -#: src/config/options.inc:1094 +#: src/config/options.inc:1098 msgid "" "Make dialogs drop shadows (the shadows are solid, you can\n" "adjust their color by ui.colors.*.dialog.shadow). You may\n" @@ -3935,11 +3965,11 @@ msgstr "" "og farven kan ændres med ui.colors.*.dialog.shadow.\n" "Du kan fjerne de brede kanter ved at rette i setup.h." -#: src/config/options.inc:1098 +#: src/config/options.inc:1102 msgid "Underline menu hotkeys" msgstr "Understreg hurtigtaster i menu" -#: src/config/options.inc:1100 +#: src/config/options.inc:1104 msgid "" "Whether to underline hotkeys in menus to make them more\n" "visible. Requires the underlining is enabled for the terminal." @@ -3948,11 +3978,11 @@ msgstr "" "gøre dem mere synlige. Kræver at terminalen understøtter\n" "understregning." -#: src/config/options.inc:1103 +#: src/config/options.inc:1107 msgid "Underline button shortcuts" msgstr "Understreg knap-genvejstaster" -#: src/config/options.inc:1105 +#: src/config/options.inc:1109 msgid "" "Whether to underline button shortcuts to make them more\n" "visible. Requires the underlining is enabled for the terminal." @@ -3961,11 +3991,11 @@ msgstr "" "gøre dem mere synlige. Kræver at terminalen understøtter\n" "understregning." -#: src/config/options.inc:1109 +#: src/config/options.inc:1113 msgid "Timer options" msgstr "Timerindstillinger" -#: src/config/options.inc:1111 +#: src/config/options.inc:1115 msgid "" "Timed action after certain interval of user inactivity. Someone can\n" "even find this useful, although you may not believe that." @@ -3974,7 +4004,7 @@ msgstr "" "inaktivitet. Der er faktisk nogen der finder dette\n" "nyttigt selvom det lyder utroligt." -#: src/config/options.inc:1117 +#: src/config/options.inc:1121 msgid "" "Whether to enable the timer or not:\n" "0 is don't count down anything\n" @@ -3986,7 +4016,7 @@ msgstr "" "1 betyder tæl ned, men vis ikke timeren\n" "2 betyder tæl ned og vis timeren ved LED-indikatorer" -#: src/config/options.inc:1124 +#: src/config/options.inc:1128 msgid "" "Whether to enable the timer or not:\n" "0 is don't count down anything\n" @@ -3998,11 +4028,11 @@ msgstr "" "1 betyder tæl ned, men vis ikke timeren\n" "2 betyder tæl ned og vis timeren ved LED-indikatorer (DEAKTIVERET)" -#: src/config/options.inc:1130 +#: src/config/options.inc:1134 msgid "Duration" msgstr "Varighed" -#: src/config/options.inc:1132 +#: src/config/options.inc:1136 msgid "" "Inactivity timeout in seconds. The maximum of one day\n" "should be enough for just everyone (TM)." @@ -4010,23 +4040,23 @@ msgstr "" "Nedtælling for inaktivitet i sekunder. En dag bør række\n" "for de fleste (TM)." -#: src/config/options.inc:1137 +#: src/config/options.inc:1141 msgid "Keybinding action to be triggered when timer reaches zero." msgstr "Handling der udløses når nedtælling er fuldført." -#: src/config/options.inc:1140 +#: src/config/options.inc:1144 msgid "Window tabs" msgstr "Vinduesfaneblade" -#: src/config/options.inc:1142 +#: src/config/options.inc:1146 msgid "Window tabs settings." msgstr "Indstillinger for vinduesfaneblade." -#: src/config/options.inc:1144 +#: src/config/options.inc:1148 msgid "Display tabs bar" msgstr "Vis fanebladsbjælke" -#: src/config/options.inc:1146 +#: src/config/options.inc:1150 msgid "" "Show tabs bar on the screen:\n" "0 means never\n" @@ -4038,11 +4068,11 @@ msgstr "" "1 betyder kun ved to eller flere åbne faneblade\n" "2 betyder altid" -#: src/config/options.inc:1151 +#: src/config/options.inc:1155 msgid "Wrap-around tabs cycling" msgstr "Side til side navigeringscyklus for faneblade" -#: src/config/options.inc:1153 +#: src/config/options.inc:1157 msgid "" "When moving right from the last tab, jump at the first one, and\n" "vice versa." @@ -4050,19 +4080,19 @@ msgstr "" "Når der flyttes til højre fra det sidste faneblad, hop da til\n" "det første og omvendt." -#: src/config/options.inc:1156 +#: src/config/options.inc:1160 msgid "Confirm tab closing" msgstr "Bekræft lukning af faneblad" -#: src/config/options.inc:1158 +#: src/config/options.inc:1162 msgid "When closing a tab show confirmation dialog." msgstr "Vis bekræftelsesdialog ved lukning af faneblad." -#: src/config/options.inc:1162 src/config/opttypes.c:396 +#: src/config/options.inc:1166 src/config/opttypes.c:396 msgid "Language" msgstr "Sprog" -#: src/config/options.inc:1164 +#: src/config/options.inc:1168 msgid "" "Language of user interface. 'System' means that the language will\n" "be extracted from the environment dynamically." @@ -4070,27 +4100,27 @@ msgstr "" "Sprog i brugerfladen. \"System\" betyder at systemets\n" "sprogindstillinger vil blive anvendt." -#: src/config/options.inc:1167 +#: src/config/options.inc:1171 msgid "Display status bar" msgstr "Vis statusbjælke" -#: src/config/options.inc:1169 +#: src/config/options.inc:1173 msgid "Show status bar on the screen." msgstr "Vis statusbjælke på skærmen." -#: src/config/options.inc:1171 +#: src/config/options.inc:1175 msgid "Display title bar" msgstr "Vis titelbjælke" -#: src/config/options.inc:1173 +#: src/config/options.inc:1177 msgid "Show title bar on the screen." msgstr "Vis titelbjælke på skærmen." -#: src/config/options.inc:1175 +#: src/config/options.inc:1179 msgid "Display goto dialog in new tabs" msgstr "Vis \"Gå til\"-dialogboks i nye faneblade" -#: src/config/options.inc:1177 +#: src/config/options.inc:1181 msgid "" "Pop up goto dialog in newly created tabs when there's no homepage\n" "set. This means also showing goto dialog on startup." @@ -4099,11 +4129,11 @@ msgstr "" "når ingen hjemmeside er angivet. Dette indebærer også visning\n" "af \"gå til adresse\"-dialog ved opstart." -#: src/config/options.inc:1180 +#: src/config/options.inc:1184 msgid "Show a message box when file is saved successfully" msgstr "Vis en meddelelse når en fil er gemt" -#: src/config/options.inc:1182 +#: src/config/options.inc:1186 msgid "" "When you pressed a [ Save ] button in some manager, this option\n" "will make sure that a box confirming success of the operation will\n" @@ -4113,19 +4143,19 @@ msgstr "" "gemt ved at vise en dialogboks herom når der trykkes på\n" "knappen [ Gem ] i en opsætningsmenu." -#: src/config/options.inc:1187 +#: src/config/options.inc:1191 msgid "Sessions" msgstr "Sessioner" -#: src/config/options.inc:1189 +#: src/config/options.inc:1193 msgid "Sessions settings." msgstr "Indstillinger for sessioner." -#: src/config/options.inc:1191 +#: src/config/options.inc:1195 msgid "Auto save session" msgstr "Autogem session" -#: src/config/options.inc:1193 +#: src/config/options.inc:1197 msgid "" "Automatically save the session when quitting.\n" "This feature requires bookmark support." @@ -4133,11 +4163,11 @@ msgstr "" "Gem session automatisk ved afslutning. Dette kræver\n" "understøttelse af bogmærker." -#: src/config/options.inc:1196 +#: src/config/options.inc:1200 msgid "Auto restore session" msgstr "Autogenskab session" -#: src/config/options.inc:1198 +#: src/config/options.inc:1202 msgid "" "Automatically restore the session at start.\n" "This feature requires bookmark support." @@ -4145,11 +4175,11 @@ msgstr "" "Genskab session automatisk ved opstart. Dette kræver\n" "understøttelse af bogmærker." -#: src/config/options.inc:1201 +#: src/config/options.inc:1205 msgid "Auto save and restore session folder name" msgstr "Katalognavn for autogem og autogenskab session" -#: src/config/options.inc:1203 +#: src/config/options.inc:1207 msgid "" "Name of the bookmarks folder used for auto saving and restoring session.\n" "The name has to be unique. Any folders with the same name will be deleted.\n" @@ -4159,11 +4189,11 @@ msgstr "" "autogenskabelse af en session. Giver kun mening med\n" "understøttelse af bogmærker." -#: src/config/options.inc:1207 +#: src/config/options.inc:1211 msgid "Homepage URI" msgstr "Hjemmesideadresse" -#: src/config/options.inc:1209 +#: src/config/options.inc:1213 msgid "" "The URI to load either at startup time when no URI was given\n" "on the command line or when requested by the goto-url-home action.\n" @@ -4175,19 +4205,19 @@ msgstr "" "\"goto-url-home\". Sæt værdien til \"\" hvis miljøvariablen\n" "WWW_HOME skal bruges som adresse på hjemmeside i stedet." -#: src/config/options.inc:1215 +#: src/config/options.inc:1219 msgid "Date format" msgstr "Datoformat" -#: src/config/options.inc:1217 +#: src/config/options.inc:1221 msgid "Date format to use in dialogs. See strftime(3)." msgstr "Datoformat i dialoger. Se strftime(3)." -#: src/config/options.inc:1220 +#: src/config/options.inc:1224 msgid "Set window title" msgstr "Sæt vinduestitel" -#: src/config/options.inc:1222 +#: src/config/options.inc:1226 msgid "" "Set the window title when running in a windowing environment\n" "in an xterm-like terminal. This way the document's title is\n" @@ -4259,6 +4289,16 @@ msgstr "Alias" msgid "Folder" msgstr "Katalog" +#. name: +#: src/config/timer.c:74 +msgid "Periodic Saving" +msgstr "Periodisk Gemning" + +#. name: +#: src/config/urlhist.c:62 +msgid "Goto URL History" +msgstr "Gå til adresse historik" + #. name: #: src/cookies/cookies.c:81 src/cookies/cookies.c:825 msgid "Cookies" @@ -4350,7 +4390,7 @@ msgid "Domain" msgstr "Domæne" #: src/cookies/dialogs.c:38 src/mime/backend/mailcap.c:98 -#: src/mime/backend/mimetypes.c:57 src/protocol/file/file.c:47 +#: src/mime/backend/mimetypes.c:57 src/protocol/file/file.c:48 msgid "Path" msgstr "Sti" @@ -4522,7 +4562,7 @@ msgid "No header info." msgstr "Ingen serverinformation om side." #: src/dialogs/download.c:237 src/dialogs/menu.c:574 -#: src/protocol/bittorrent/dialogs.c:233 src/session/download.c:363 +#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:363 msgid "Download" msgstr "Download" @@ -4598,6 +4638,11 @@ msgstr "~Ryd" msgid "Download manager" msgstr "Downloadhåndtering" +#. name: +#: src/dialogs/exmode.c:150 +msgid "Exmode" +msgstr "Kommandotilstand" + #: src/dialogs/info.c:42 msgid "About" msgstr "Om" @@ -4641,47 +4686,47 @@ msgstr "Ressourcer" #: src/dialogs/info.c:175 #, c-format -msgid "%d handle" -msgid_plural "%d handles" -msgstr[0] "%d håndtag" -msgstr[1] "%d handtag" +msgid "%ld handle" +msgid_plural "%ld handles" +msgstr[0] "%ld håndtag" +msgstr[1] "%ld handtag" #: src/dialogs/info.c:179 #, c-format -msgid "%d timer" -msgid_plural "%d timers" -msgstr[0] "%d timer" -msgstr[1] "%d timere" +msgid "%ld timer" +msgid_plural "%ld timers" +msgstr[0] "%ld timer" +msgstr[1] "%ld timere" -#: src/dialogs/info.c:186 src/protocol/bittorrent/dialogs.c:324 +#: src/dialogs/info.c:186 #, c-format -msgid "%d connection" -msgid_plural "%d connections" -msgstr[0] "%d forbindelse" -msgstr[1] "%d forbindelser" +msgid "%ld connection" +msgid_plural "%ld connections" +msgstr[0] "%ld forbindelse" +msgstr[1] "%ld forbindelser" #: src/dialogs/info.c:190 #, c-format -msgid "%d connecting" -msgid_plural "%d connecting" -msgstr[0] "%d opretter" -msgstr[1] "%d opretter" +msgid "%ld connecting" +msgid_plural "%ld connecting" +msgstr[0] "%ld opretter" +msgstr[1] "%ld opretter" #: src/dialogs/info.c:194 #, c-format -msgid "%d transferring" -msgid_plural "%d transferring" -msgstr[0] "%d overfører" -msgstr[1] "%d overfører" +msgid "%ld transferring" +msgid_plural "%ld transferring" +msgstr[0] "%ld overfører" +msgstr[1] "%ld overfører" #: src/dialogs/info.c:198 #, c-format -msgid "%d keepalive" -msgid_plural "%d keepalive" -msgstr[0] "%d holdes i live" -msgstr[1] "%d holdes i live" +msgid "%ld keepalive" +msgid_plural "%ld keepalive" +msgstr[0] "%ld holdes i live" +msgstr[1] "%ld holdes i live" -#: src/dialogs/info.c:206 +#: src/dialogs/info.c:206 src/dialogs/info.c:258 #, c-format msgid "%ld byte" msgid_plural "%ld bytes" @@ -4690,24 +4735,24 @@ msgstr[1] "%ld bytes" #: src/dialogs/info.c:210 #, c-format -msgid "%d file" -msgid_plural "%d files" -msgstr[0] "%d fil" -msgstr[1] "%d filer" +msgid "%ld file" +msgid_plural "%ld files" +msgstr[0] "%ld fil" +msgstr[1] "%ld filer" #: src/dialogs/info.c:214 src/dialogs/info.c:229 #, c-format -msgid "%d in use" -msgid_plural "%d in use" -msgstr[0] "%d i brug" -msgstr[1] "%d i brug" +msgid "%ld in use" +msgid_plural "%ld in use" +msgstr[0] "%ld i brug" +msgstr[1] "%ld i brug" #: src/dialogs/info.c:218 #, c-format -msgid "%d loading" -msgid_plural "%d loading" -msgstr[0] "%d indlæses" -msgstr[1] "%d indlæses" +msgid "%ld loading" +msgid_plural "%ld loading" +msgstr[0] "%ld indlæses" +msgstr[1] "%ld indlæses" #: src/dialogs/info.c:221 msgid "Document cache" @@ -4715,17 +4760,17 @@ msgstr "Dokumentcache" #: src/dialogs/info.c:225 #, c-format -msgid "%d formatted" -msgid_plural "%d formatted" -msgstr[0] "%d formateret" -msgstr[1] "%d formaterede" +msgid "%ld formatted" +msgid_plural "%ld formatted" +msgstr[0] "%ld formateret" +msgstr[1] "%ld formaterede" #: src/dialogs/info.c:233 #, c-format -msgid "%d refreshing" -msgid_plural "%d refreshing" -msgstr[0] "%d genopfriskes" -msgstr[1] "%d genopfriskes" +msgid "%ld refreshing" +msgid_plural "%ld refreshing" +msgstr[0] "%ld genopfriskes" +msgstr[1] "%ld genopfriskes" #: src/dialogs/info.c:236 msgid "Interlinking" @@ -4741,35 +4786,28 @@ msgstr "klient terminal" #: src/dialogs/info.c:245 #, c-format -msgid "%d terminal" -msgid_plural "%d terminals" -msgstr[0] "%d terminal" -msgstr[1] "%d terminaler" +msgid "%ld terminal" +msgid_plural "%ld terminals" +msgstr[0] "%ld terminal" +msgstr[1] "%ld terminaler" #: src/dialogs/info.c:249 #, c-format -msgid "%d session" -msgid_plural "%d sessions" -msgstr[0] "%d session" -msgstr[1] "%d sessioner" +msgid "%ld session" +msgid_plural "%ld sessions" +msgstr[0] "%ld session" +msgstr[1] "%ld sessioner" #: src/dialogs/info.c:254 msgid "Memory allocated" msgstr "Hukommelse allokeret" -#: src/dialogs/info.c:258 -#, c-format -msgid "%d byte" -msgid_plural "%d bytes" -msgstr[0] "%d byte" -msgstr[1] "%d bytes" - #: src/dialogs/info.c:262 #, c-format -msgid "%d byte overhead" -msgid_plural "%d bytes overhead" -msgstr[0] "%d byte for meget" -msgstr[1] "%d bytes for meget" +msgid "%ld byte overhead" +msgid_plural "%ld bytes overhead" +msgstr[0] "%ld byte for meget" +msgstr[1] "%ld bytes for meget" #: src/dialogs/menu.c:97 msgid "Save URL" @@ -5083,27 +5121,27 @@ msgstr "G msgid "Save to file" msgstr "Gem i fil" -#: src/dialogs/menu.c:871 +#: src/dialogs/menu.c:874 msgid "~Pass frame URI to external command" msgstr "Videregiv rammens adresse til ekstern ~kommando" -#: src/dialogs/menu.c:876 +#: src/dialogs/menu.c:879 msgid "Pass link URI to e~xternal command" msgstr "Videregiv linkadresse til ekstern ~kommando" -#: src/dialogs/menu.c:882 +#: src/dialogs/menu.c:885 msgid "Pass tab URI to e~xternal command" msgstr "~Videregiv fanebladets adresse til ekstern kommando" -#: src/dialogs/menu.c:907 +#: src/dialogs/menu.c:910 msgid "Empty directory" msgstr "Tom mappe" -#: src/dialogs/menu.c:951 +#: src/dialogs/menu.c:954 msgid "Directories:" msgstr "Mapper:" -#: src/dialogs/menu.c:964 +#: src/dialogs/menu.c:967 msgid "Files:" msgstr "Filer:" @@ -5361,25 +5399,21 @@ msgstr "Blokering af pop-up-vinduer" msgid "Whether to disallow scripts to open new windows or tabs." msgstr "Om scripts skal forbydes at åbne nye vinduer eller faneblade." -#: src/ecmascript/spidermonkey.c:371 -msgid "JavaScript Alert" -msgstr "JavaScript advarsel" - -#: src/ecmascript/spidermonkey.c:2002 +#: src/ecmascript/spidermonkey.c:93 #, c-format msgid "A script embedded in the current document raised the following%s%s%s%s" msgstr "" "Et script indlejret i det aktuelle dokument rejste den følgende%s%s%s%s" -#: src/ecmascript/spidermonkey.c:2018 +#: src/ecmascript/spidermonkey.c:109 msgid "JavaScript Error" msgstr "JavaScript-fejl" -#: src/ecmascript/spidermonkey.c:2037 +#: src/ecmascript/spidermonkey.c:128 msgid "JavaScript Emergency" msgstr "JavaScript-nødsituation" -#: src/ecmascript/spidermonkey.c:2039 +#: src/ecmascript/spidermonkey.c:130 #, c-format msgid "" "A script embedded in the current document was running\n" @@ -5392,6 +5426,10 @@ msgstr "" "kunne have afsluttet hele ELinks, så eksekveringen af scriptet blev\n" "afbrudt." +#: src/ecmascript/spidermonkey/window.c:287 +msgid "JavaScript Alert" +msgstr "JavaScript advarsel" + #: src/formhist/dialogs.c:68 msgid "Forms are never saved for this URL." msgstr "Formularer bliver aldrig gemt for denne adresse." @@ -5737,29 +5775,29 @@ msgstr "Ukrainsk" msgid "The call to %s failed: %d (%s)" msgstr "Kaldet til %s fejlede: %d (%s)" -#: src/main/main.c:138 +#: src/main/main.c:140 msgid "Cannot create a pipe for internal communication." msgstr "Kan ikke oprette datakanal til intern kommunikation." -#: src/main/main.c:198 +#: src/main/main.c:204 #, c-format msgid "URL expected after -%s" msgstr "Adresse forventes efter -%s." -#: src/main/main.c:206 +#: src/main/main.c:212 msgid "No running ELinks found." msgstr "Ingen eksisterende ELinks blev fundet." #. The remote session(s) can not be created -#: src/main/main.c:213 +#: src/main/main.c:219 msgid "No remote session to connect to." msgstr "Ingen fjernsession at forbinde til." -#: src/main/main.c:222 +#: src/main/main.c:228 msgid "Unable to encode session info." msgstr "Kunne ikke indkode sessionsinformation." -#: src/main/main.c:239 +#: src/main/main.c:245 msgid "Unable to attach_terminal()." msgstr "Kunne ikke forbinde til terminal med attach_terminal()." @@ -6059,11 +6097,11 @@ msgstr "" "MIME-type der bruges til dokumenter hvor denne ikke kan findes\n" "ud fra de oplysninger som er indeholdt i dokumentet." -#: src/network/ssl/ssl.c:73 src/network/ssl/ssl.c:158 +#: src/network/ssl/ssl.c:72 src/network/ssl/ssl.c:157 msgid "Verify certificates" msgstr "Verificér certifikater" -#: src/network/ssl/ssl.c:75 +#: src/network/ssl/ssl.c:74 msgid "" "Verify the peer's SSL certificate. Note that this\n" "needs extensive configuration of OpenSSL by the user." @@ -6071,15 +6109,15 @@ msgstr "" "Verificér værtsserverens SSL-certifikat. Bemærk at dette\n" "kræver omfattende opsætning af OpenSSL af brugeren." -#: src/network/ssl/ssl.c:78 +#: src/network/ssl/ssl.c:77 msgid "Client Certificates" msgstr "Klientcertifikater" -#: src/network/ssl/ssl.c:80 +#: src/network/ssl/ssl.c:79 msgid "X509 client certificate options." msgstr "Indstillinger for X509-klientcertifikater." -#: src/network/ssl/ssl.c:84 +#: src/network/ssl/ssl.c:83 msgid "" "Enable or not the sending of X509 client certificates\n" "to servers which request them." @@ -6087,11 +6125,11 @@ msgstr "" "Aktivér/deaktivér afsendelse af X509-klientcertifikater\n" "til servere der beder om dem." -#: src/network/ssl/ssl.c:87 +#: src/network/ssl/ssl.c:86 msgid "Certificate File" msgstr "Certifikatsfil" -#: src/network/ssl/ssl.c:89 +#: src/network/ssl/ssl.c:88 msgid "" "The location of a file containing the client certificate\n" "and unencrypted private key in PEM format. If unset, the\n" @@ -6103,7 +6141,7 @@ msgstr "" "fil som miljøvariablen X509_CLIENT_CERT peger på blive\n" "brugt i stedet." -#: src/network/ssl/ssl.c:160 +#: src/network/ssl/ssl.c:159 msgid "" "Verify the peer's SSL certificate. Note that this\n" "probably doesn't work properly at all with GnuTLS." @@ -6112,11 +6150,11 @@ msgstr "" "sandsynligvis ikke virker ordentligt med GnuTLS." #. name: -#: src/network/ssl/ssl.c:179 src/network/ssl/ssl.c:196 +#: src/network/ssl/ssl.c:178 src/network/ssl/ssl.c:195 msgid "SSL" msgstr "SSL" -#: src/network/ssl/ssl.c:181 +#: src/network/ssl/ssl.c:180 msgid "SSL options." msgstr "SSL-indstillinger." @@ -6276,47 +6314,51 @@ msgstr "Fejl ved msgid "CGI script not in CGI path" msgstr "CGI-script ikke fundet i CGI-sti" -#: src/network/state.c:80 +#: src/network/state.c:78 +msgid "Local file access is not allowed in anonymous mode" +msgstr "Adgang til lokale filer er ikke tilladt i anonymtilstand" + +#: src/network/state.c:81 msgid "Bad FTP response" msgstr "Fejl i FTP-svar" -#: src/network/state.c:81 +#: src/network/state.c:82 msgid "FTP service unavailable" msgstr "FTP-tjeneste ikke tilgængelig" -#: src/network/state.c:82 +#: src/network/state.c:83 msgid "Bad FTP login" msgstr "Fejl ved FTP-indlogning" -#: src/network/state.c:83 +#: src/network/state.c:84 msgid "FTP PORT command failed" msgstr "FTP PORT-kommando mislykkedes" -#: src/network/state.c:84 +#: src/network/state.c:85 msgid "File not found" msgstr "Fil ikke fundet" -#: src/network/state.c:85 +#: src/network/state.c:86 msgid "FTP file error" msgstr "FTP filfejl" -#: src/network/state.c:89 +#: src/network/state.c:90 msgid "SSL error" msgstr "SSL-fejl" -#: src/network/state.c:91 +#: src/network/state.c:92 msgid "This version of ELinks does not contain SSL/TLS support" msgstr "Denne version af ELinks understøtter ikke SSL/TSL" -#: src/network/state.c:94 -msgid "JavaScript support is not enabled." +#: src/network/state.c:95 +msgid "JavaScript support is not enabled" msgstr "JavaScript er ikke aktiveret." -#: src/network/state.c:97 +#: src/network/state.c:98 msgid "Bad NNTP response" msgstr "Fejl i NNTP-svar" -#: src/network/state.c:98 +#: src/network/state.c:99 msgid "" "Unable to handle news: URI because no news server has been\n" "been configured. Either set the option protocol.nntp.server\n" @@ -6327,35 +6369,35 @@ msgstr "" "indstillingen protocol.nntp.server eller via miljøvariablen\n" "NNTPSERVER." -#: src/network/state.c:101 +#: src/network/state.c:102 msgid "Server hang up for some reason" msgstr "Serveren afbrød forbindelsen af en eller anden grund" -#: src/network/state.c:102 +#: src/network/state.c:103 msgid "No such newsgroup" msgstr "Nyhedsgruppen findes ikke" -#: src/network/state.c:103 +#: src/network/state.c:104 msgid "No such article" msgstr "Artiklen findes ikke" -#: src/network/state.c:104 +#: src/network/state.c:105 msgid "Transfer failed" msgstr "Overførelse mislykkedes" -#: src/network/state.c:105 +#: src/network/state.c:106 msgid "Authorization required" msgstr "Autentifikation påkrævet" -#: src/network/state.c:106 +#: src/network/state.c:107 msgid "Access to server denied" msgstr "Adgang til serveren nægtet" -#: src/network/state.c:110 +#: src/network/state.c:111 msgid "The CSO phone-book protocol is not supported." msgstr "Telefonbogsprotokollen CSO understøttes ikke." -#: src/network/state.c:113 +#: src/network/state.c:114 msgid "" "Configuration of the proxy server failed.\n" "This might be caused by an incorrect proxy\n" @@ -6377,19 +6419,19 @@ msgstr "" "af et kolon og et portnummer, f.eks.\n" "\"localhost:8080\"." -#: src/network/state.c:123 -msgid "BitTorrent error" -msgstr "" - #: src/network/state.c:124 -msgid "The BitTorrent metainfo file contained errors" -msgstr "" +msgid "BitTorrent error" +msgstr "BitTorrent-fejl" #: src/network/state.c:125 -msgid "The tracker requesting failed" -msgstr "" +msgid "The BitTorrent metainfo file contained errors" +msgstr "BitTorrent metainfo-filen indeholdte fejl" -#: src/network/state.c:149 +#: src/network/state.c:126 +msgid "The tracker requesting failed" +msgstr "Forespørgsel hos tracker fejlede" + +#: src/network/state.c:150 msgid "Unknown error" msgstr "Ukendt fejl" @@ -6590,6 +6632,8 @@ msgid "" "The maximum number of peers to request from the tracker.\n" "Set to 0 to use the server default." msgstr "" +"Det maksimalle antal peers der skal hentes fra trackeren.\n" +"Sæt til 0 for at benytte serverens standardværdi." #: src/protocol/bittorrent/bittorrent.c:79 msgid "Minimum peers to skip rerequesting" @@ -6736,6 +6780,7 @@ msgid "" "The number of seconds to pause between sending keepalive\n" "messages." msgstr "" +"Antal sekunder mellem afsendelse af 'i live'-beskeder (keepalive)." #: src/protocol/bittorrent/bittorrent.c:172 msgid "Number of pending requests" @@ -6743,10 +6788,10 @@ msgstr "Antal udest #: src/protocol/bittorrent/bittorrent.c:174 msgid "" -"How many piece requests to continuosly keep queue. Pipelining\n" +"How many piece requests to continuously keep in queue. Pipelining\n" "of requests is essential to saturate connections and get a good\n" -"good connection performance and thus a faster download. However,\n" -"a very big queue size can lead to wasting bandwidth near the end\n" +"connection performance and thus a faster download. However, a\n" +"very big queue size can lead to wasting bandwidth near the end\n" "of the connection since remaining piece blocks will be requested\n" "from multiple peers." msgstr "" @@ -6754,25 +6799,26 @@ msgstr "" #. Bram uses 30 seconds here. #: src/protocol/bittorrent/bittorrent.c:183 msgid "Peer snubbing interval" -msgstr "" +msgstr "Peer fornærmelsessinterval" #: src/protocol/bittorrent/bittorrent.c:185 msgid "" "The number of seconds to wait for file data before assuming\n" "the peer has been snubbed." msgstr "" +"Antal sekunder der skal ventes på fildata før det antages\n" +"at klienten er blevet udnyttet." #: src/protocol/bittorrent/bittorrent.c:188 -#, fuzzy msgid "Peer choke interval" -msgstr "Gemningsinterval" +msgstr "Peer afbrydningsinterval" #: src/protocol/bittorrent/bittorrent.c:190 msgid "" "The number of seconds between updating the connection state\n" "and most importantly choke and unchoke peer connections. The\n" "choke period should be big enough for newly unchoked connections\n" -"to get started but small enough to not allow freeriders to much\n" +"to get started but small enough to not allow freeriders too much\n" "room for stealing bandwidth." msgstr "" @@ -6791,44 +6837,38 @@ msgid "Allow blacklisting" msgstr "Tillad sortlistning" #: src/protocol/bittorrent/bittorrent.c:203 -#, fuzzy msgid "Allow blacklisting of buggy peers." -msgstr "Tillad sortlistning af fejlbehæftede servere." +msgstr "Tillad sortlistning af fejlbehæftede peers." #: src/protocol/bittorrent/dialogs.c:123 msgid "Warning: potential malicious path detected" -msgstr "" +msgstr "Advarsel: potentiel ondskabsful sti detekteret" #: src/protocol/bittorrent/dialogs.c:142 -#, fuzzy msgid "Info hash" -msgstr "Info" +msgstr "Info hash" #: src/protocol/bittorrent/dialogs.c:146 msgid "Announce URI" -msgstr "" +msgstr "Annonceringaddresse" -#: src/protocol/bittorrent/dialogs.c:151 src/protocol/bittorrent/dialogs.c:188 -#, fuzzy -msgid "Comment" -msgstr "Kommentarer" - -#: src/protocol/bittorrent/dialogs.c:156 -#, fuzzy +#: src/protocol/bittorrent/dialogs.c:152 msgid "Creation date" -msgstr "Opsætningssystem" +msgstr "Oprettelsesdato" -#: src/protocol/bittorrent/dialogs.c:165 -#, fuzzy +#: src/protocol/bittorrent/dialogs.c:161 msgid "Directory" -msgstr "Mapper:" +msgstr "Mappe" -#: src/protocol/bittorrent/dialogs.c:175 -#, fuzzy +#: src/protocol/bittorrent/dialogs.c:171 msgid "Files" -msgstr "Filer:" +msgstr "Filer" -#: src/protocol/bittorrent/dialogs.c:234 src/session/download.c:364 +#: src/protocol/bittorrent/dialogs.c:184 +msgid "Comment" +msgstr "Kommentar" + +#: src/protocol/bittorrent/dialogs.c:230 src/session/download.c:364 #, c-format msgid "" "Download complete:\n" @@ -6837,225 +6877,219 @@ msgstr "" "Filoverførsel fuldført:\n" "%s" -#: src/protocol/bittorrent/dialogs.c:261 -#, fuzzy +#: src/protocol/bittorrent/dialogs.c:257 msgid "Download info" -msgstr "Downloadning" +msgstr "Downloadinfo" -#: src/protocol/bittorrent/dialogs.c:281 -#, fuzzy +#: src/protocol/bittorrent/dialogs.c:277 msgid "downloading (random)" -msgstr "Downloadning" +msgstr "downloadning (tilfældig)" -#: src/protocol/bittorrent/dialogs.c:282 +#: src/protocol/bittorrent/dialogs.c:278 msgid "downloading (rarest first)" -msgstr "" +msgstr "downloadning (sjældnest først)" -#: src/protocol/bittorrent/dialogs.c:283 -#, fuzzy +#: src/protocol/bittorrent/dialogs.c:279 msgid "downloading (end game)" -msgstr "Downloadning" +msgstr "downloadning (slutspil)" -#: src/protocol/bittorrent/dialogs.c:284 -#, fuzzy +#: src/protocol/bittorrent/dialogs.c:280 msgid "seeding" -msgstr "hastighed" +msgstr "uploader" + +#: src/protocol/bittorrent/dialogs.c:308 +msgid "Status" +msgstr "Status" #: src/protocol/bittorrent/dialogs.c:312 -#, fuzzy -msgid "Status" -msgstr "Statusbjælke" - -#: src/protocol/bittorrent/dialogs.c:316 msgid "partial" -msgstr "" +msgstr "partiel" #. Peers: -#: src/protocol/bittorrent/dialogs.c:320 +#: src/protocol/bittorrent/dialogs.c:316 msgid "Peers" -msgstr "" +msgstr "Peers" -#: src/protocol/bittorrent/dialogs.c:334 src/protocol/bittorrent/dialogs.c:350 +#: src/protocol/bittorrent/dialogs.c:320 #, c-format -msgid "%d seeder" -msgid_plural "%d seeders" -msgstr[0] "" -msgstr[1] "" +msgid "%u connection" +msgid_plural "%u connections" +msgstr[0] "%u forbindelse" +msgstr[1] "%u forbindelser" -#: src/protocol/bittorrent/dialogs.c:340 -#, fuzzy, c-format -msgid "%d available" -msgid_plural "%d available" -msgstr[0] "%d fil" -msgstr[1] "%d filer" +#: src/protocol/bittorrent/dialogs.c:330 src/protocol/bittorrent/dialogs.c:346 +#, c-format +msgid "%u seeder" +msgid_plural "%u seeders" +msgstr[0] "%u uploader" +msgstr[1] "%u uploadere" -#: src/protocol/bittorrent/dialogs.c:345 -#, fuzzy +#: src/protocol/bittorrent/dialogs.c:336 +#, c-format +msgid "%u available" +msgid_plural "%u available" +msgstr[0] "%u tilgængelig" +msgstr[1] "%u tilgængelig" + +#: src/protocol/bittorrent/dialogs.c:341 msgid "Swarm info" -msgstr "Serverinformation om side" +msgstr "Sværminfo" -#: src/protocol/bittorrent/dialogs.c:358 -#, fuzzy, c-format -msgid "%d downloader" -msgid_plural "%d downloaders" -msgstr[0] "Download" -msgstr[1] "Download" +#: src/protocol/bittorrent/dialogs.c:354 +#, c-format +msgid "%u downloader" +msgid_plural "%u downloaders" +msgstr[0] "%u downloader" +msgstr[1] "%u downloadere" #. Upload: -#: src/protocol/bittorrent/dialogs.c:364 -#, fuzzy +#: src/protocol/bittorrent/dialogs.c:360 msgid "Upload" -msgstr "Gen~indlæs" +msgstr "Upload" -#: src/protocol/bittorrent/dialogs.c:372 -#, fuzzy +#: src/protocol/bittorrent/dialogs.c:368 msgid "average" -msgstr "gennemsnitshastighed" +msgstr "gennemsnitlig" -#: src/protocol/bittorrent/dialogs.c:377 +#: src/protocol/bittorrent/dialogs.c:373 msgid "1:1 in" -msgstr "" +msgstr "1:1 om" #. Sharing: -#: src/protocol/bittorrent/dialogs.c:383 -#, fuzzy +#: src/protocol/bittorrent/dialogs.c:379 msgid "Sharing" -msgstr "Tekststreng" +msgstr "Deling" -#: src/protocol/bittorrent/dialogs.c:392 -#, fuzzy +#: src/protocol/bittorrent/dialogs.c:388 msgid "uploaded" -msgstr "Fil-upload" +msgstr "uploadet" -#: src/protocol/bittorrent/dialogs.c:394 -#, fuzzy +#: src/protocol/bittorrent/dialogs.c:390 msgid "downloaded" -msgstr "Download" +msgstr "downloadet" #. Pieces: -#: src/protocol/bittorrent/dialogs.c:398 +#: src/protocol/bittorrent/dialogs.c:394 msgid "Pieces" -msgstr "" +msgstr "Stykker" -#: src/protocol/bittorrent/dialogs.c:402 -#, fuzzy, c-format -msgid "%d completed" -msgid_plural "%d completed" -msgstr[0] "ufuldstændig" -msgstr[1] "ufuldstændig" +#: src/protocol/bittorrent/dialogs.c:398 +#, c-format +msgid "%u completed" +msgid_plural "%u completed" +msgstr[0] "%u fuldført" +msgstr[1] "%u fuldført" -#: src/protocol/bittorrent/dialogs.c:408 -#, fuzzy, c-format -msgid "%d in progress" -msgid_plural "%d in progress" -msgstr[0] "%d i brug" -msgstr[1] "%d i brug" +#: src/protocol/bittorrent/dialogs.c:404 +#, c-format +msgid "%u in progress" +msgid_plural "%u in progress" +msgstr[0] "%u undervejs" +msgstr[1] "%u undervejs" -#: src/protocol/bittorrent/dialogs.c:419 -#, fuzzy, c-format -msgid "%d remaining" -msgid_plural "%d remaining" -msgstr[0] "%d overfører" -msgstr[1] "%d overfører" +#: src/protocol/bittorrent/dialogs.c:415 +#, c-format +msgid "%u remaining" +msgid_plural "%u remaining" +msgstr[0] "%u tilbage" +msgstr[1] "%u tilbage" #. Statistics: -#: src/protocol/bittorrent/dialogs.c:424 +#: src/protocol/bittorrent/dialogs.c:420 msgid "Statistics" -msgstr "" +msgstr "Statistik" -#: src/protocol/bittorrent/dialogs.c:428 -#, fuzzy, c-format -msgid "%d in memory" -msgid_plural "%d in memory" -msgstr[0] "%d timer" -msgstr[1] "%d timere" +#: src/protocol/bittorrent/dialogs.c:424 +#, c-format +msgid "%u in memory" +msgid_plural "%u in memory" +msgstr[0] "%u i hukommelsen" +msgstr[1] "%u i hukommelsen" -#: src/protocol/bittorrent/dialogs.c:434 -#, fuzzy, c-format -msgid "%d locked" -msgid_plural "%d locked" -msgstr[0] "%d indlæses" -msgstr[1] "%d indlæses" +#: src/protocol/bittorrent/dialogs.c:430 +#, c-format +msgid "%u locked" +msgid_plural "%u locked" +msgstr[0] "%u låst" +msgstr[1] "%u låste" -#: src/protocol/bittorrent/dialogs.c:441 -#, fuzzy, c-format -msgid "%d rejected" -msgid_plural "%d rejected" -msgstr[0] "%d formateret" -msgstr[1] "%d formaterede" +#: src/protocol/bittorrent/dialogs.c:437 +#, c-format +msgid "%u rejected" +msgid_plural "%u rejected" +msgstr[0] "%d afvist" +msgstr[1] "%d afviste" -#: src/protocol/bittorrent/dialogs.c:448 -#, fuzzy, c-format -msgid "%d unavailable" -msgid_plural "%d unavailable" -msgstr[0] "FTP-tjeneste ikke tilgængelig" -msgstr[1] "FTP-tjeneste ikke tilgængelig" +#: src/protocol/bittorrent/dialogs.c:444 +#, c-format +msgid "%u unavailable" +msgid_plural "%u unavailable" +msgstr[0] "%u utilgængelig" +msgstr[1] "%u utilgængelige" -#: src/protocol/bittorrent/dialogs.c:584 src/session/session.c:243 +#: src/protocol/bittorrent/dialogs.c:580 src/session/session.c:274 #, c-format msgid "Unable to retrieve %s" msgstr "Kan ikke hente %s" -#: src/protocol/bittorrent/dialogs.c:730 -#, fuzzy, c-format +#: src/protocol/bittorrent/dialogs.c:726 +#, c-format msgid "What would you like to do with the file '%s'?" -msgstr "Hvad vil du gøre med filen \"%s\" (type: %s%s%s)?" +msgstr "Hvad vil du gøre med filen \"%s\"?" -#: src/protocol/bittorrent/dialogs.c:746 -#, fuzzy +#: src/protocol/bittorrent/dialogs.c:742 msgid "Information about the torrent" -msgstr "Vis information om den aktuelle side" +msgstr "Information om torrent-filen" -#: src/protocol/bittorrent/dialogs.c:768 src/session/download.c:1018 +#: src/protocol/bittorrent/dialogs.c:764 src/session/download.c:1018 msgid "What to do?" msgstr "Hvad skal der ske med filen?" -#: src/protocol/bittorrent/dialogs.c:790 -#, fuzzy +#: src/protocol/bittorrent/dialogs.c:786 msgid "Down~load" -msgstr "Download" +msgstr "Down~load" -#: src/protocol/bittorrent/dialogs.c:796 src/session/download.c:1112 +#: src/protocol/bittorrent/dialogs.c:792 src/session/download.c:1112 msgid "~Display" msgstr "~Vis" -#: src/protocol/bittorrent/dialogs.c:800 src/session/download.c:1116 +#: src/protocol/bittorrent/dialogs.c:796 src/session/download.c:1116 msgid "Show ~header" msgstr "Vis ~protokolhoved" -#: src/protocol/file/file.c:38 +#: src/protocol/file/file.c:39 msgid "Local files" msgstr "Lokale filer" -#: src/protocol/file/file.c:40 +#: src/protocol/file/file.c:41 msgid "Options specific to local browsing." msgstr "Indstillinger for visning af lokale filer." -#: src/protocol/file/file.c:43 +#: src/protocol/file/file.c:44 msgid "Local CGI" msgstr "Lokale CGI-scripts" -#: src/protocol/file/file.c:45 +#: src/protocol/file/file.c:46 msgid "Local CGI specific options." msgstr "Indstillinger for lokale CGI-scripts." -#: src/protocol/file/file.c:49 +#: src/protocol/file/file.c:50 msgid "Colon separated list of directories, where CGI scripts are stored." msgstr "Kolonsepareret liste over kataloger med CGI-scripts." -#: src/protocol/file/file.c:51 +#: src/protocol/file/file.c:52 msgid "Allow local CGI" msgstr "Tillad lokal CGI" -#: src/protocol/file/file.c:53 +#: src/protocol/file/file.c:54 msgid "Whether to execute local CGI scripts." msgstr "Om udførelse af lokale CGI-scripts er tilladt." -#: src/protocol/file/file.c:56 +#: src/protocol/file/file.c:57 msgid "Allow reading special files" msgstr "Tillad læsning af specielle filer" -#: src/protocol/file/file.c:58 +#: src/protocol/file/file.c:59 msgid "" "Whether to allow reading from non-regular files.\n" "Note this can be dangerous; reading /dev/urandom or\n" @@ -7064,11 +7098,11 @@ msgstr "" "Tillad læsning af ikke-regulære filer? Dette kan være RISIKABELT -\n" "læsning fra /dev/urandom eller /dev/zero kan spolere dit humør!" -#: src/protocol/file/file.c:62 +#: src/protocol/file/file.c:63 msgid "Show hidden files in directory listing" msgstr "Vis skjulte filer i katalogoversigter" -#: src/protocol/file/file.c:64 +#: src/protocol/file/file.c:65 msgid "" "When set to false, files with name starting with a dot will be\n" "hidden in local directories listing." @@ -7076,11 +7110,11 @@ msgstr "" "Hvis deaktiveret, vil filer med navne der starter\n" "med et punktum blive skjult i katalogoversigter." -#: src/protocol/file/file.c:67 +#: src/protocol/file/file.c:68 msgid "Try encoding extensions" msgstr "Forsøg kendte filendelser for indkodning" -#: src/protocol/file/file.c:69 +#: src/protocol/file/file.c:70 msgid "" "When set, if we can't open a file named 'filename', we'll try\n" "to open 'filename' with some encoding extension appended\n" @@ -7092,7 +7126,7 @@ msgstr "" "understøttes." #. name: -#: src/protocol/file/file.c:77 +#: src/protocol/file/file.c:78 msgid "File" msgstr "Fil" @@ -7457,24 +7491,24 @@ msgstr "" "som skal vises. Eksempelvis 'Subject' eller 'From'.\n" "Hele protokolhovedet kan læses i et separat dialogvindue." -#: src/protocol/protocol.c:226 +#: src/protocol/protocol.c:228 #, c-format msgid "This version of ELinks does not contain %s protocol support" msgstr "Denne version af ELinks understøtter ikke protokollen %s" -#: src/protocol/protocol.c:254 +#: src/protocol/protocol.c:259 msgid "Protocols" msgstr "Protokoller" -#: src/protocol/protocol.c:256 +#: src/protocol/protocol.c:261 msgid "Protocol specific options." msgstr "Protokolspecifikke indstillinger." -#: src/protocol/protocol.c:258 +#: src/protocol/protocol.c:263 msgid "No-proxy domains" msgstr "Ingen-proxy-domæner" -#: src/protocol/protocol.c:260 +#: src/protocol/protocol.c:265 msgid "" "Comma separated list of domains for which the proxy (HTTP/FTP)\n" "should be disabled. Optionally, a port can be specified for some\n" @@ -7487,7 +7521,7 @@ msgstr "" "blive konsulteret." #. name: -#: src/protocol/protocol.c:296 +#: src/protocol/protocol.c:301 msgid "Protocol" msgstr "Protokol" @@ -7797,11 +7831,11 @@ msgstr "Filen vil blive msgid "~Open" msgstr "~Åbn" -#: src/session/session.c:717 src/session/session.c:735 src/session/task.c:268 +#: src/session/session.c:749 src/session/session.c:767 src/session/task.c:270 msgid "Warning" msgstr "Advarsel" -#: src/session/session.c:718 +#: src/session/session.c:750 msgid "" "You have empty string in protocol.http.user_agent - this was a default value " "in the past, substituted by default ELinks User-Agent string. However, " @@ -7818,7 +7852,7 @@ msgstr "" "standardindstillingen bruges, så slet venligst denne linje fra din " "opsætningsfil. Sidstnævnte anbefales." -#: src/session/session.c:736 +#: src/session/session.c:768 msgid "" "You have option config.saving_style set to a de facto obsolete value. The " "configuration saving algorithms of ELinks were changed from the last time " @@ -7839,11 +7873,11 @@ msgstr "" "ændres. Derfor anbefales det at sætte værdien af config.saving_style til 3 " "for at det fungerer korrekt." -#: src/session/session.c:761 +#: src/session/session.c:793 msgid "Welcome" msgstr "Velkommen" -#: src/session/session.c:762 +#: src/session/session.c:794 msgid "" "Welcome to ELinks!\n" "\n" @@ -7853,7 +7887,7 @@ msgstr "" "\n" "Tryk ESC for menuen. Dokumentation findes i menuen Hjælp." -#: src/session/task.c:236 +#: src/session/task.c:238 #, c-format msgid "" "The URL you are about to follow might be maliciously crafted in order to " @@ -7868,12 +7902,12 @@ msgstr "" "\n" "Vil du følge adressen %s?" -#: src/session/task.c:246 +#: src/session/task.c:248 #, c-format msgid "Do you want to follow the redirect and post form data to URL %s?" msgstr "Vil du følge omdirigering og sende formulardata til adresse %s?" -#: src/session/task.c:250 +#: src/session/task.c:252 #, c-format msgid "" "The form data you are about to post might be incomplete.\n" @@ -7882,12 +7916,12 @@ msgstr "" "Det formulardata som du er ved at indsende er muligvis ufuldstændig.\n" "Vil du indsende til adressen %s?" -#: src/session/task.c:254 +#: src/session/task.c:256 #, c-format msgid "Do you want to post form data to URL %s?" msgstr "Vil du sende formulardata til adresse %s?" -#: src/session/task.c:257 +#: src/session/task.c:259 #, c-format msgid "Do you want to repost form data to URL %s?" msgstr "Vil du sende formulardata til adresse %s igen?" @@ -7915,15 +7949,15 @@ msgstr "Ugyldig h msgid "Could not read event: %d (%s)" msgstr "Kunne ikke læse hændelse: %d (%s)" -#: src/terminal/kbd.c:1068 +#: src/terminal/kbd.c:905 msgid "Too many bytes read from the itrm!" msgstr "Læste for mange bytes fra itrm!" -#: src/terminal/tab.c:189 +#: src/terminal/tab.c:188 msgid "Do you really want to close the current tab?" msgstr "Vil du virkelig lukke det aktuelle faneblad?" -#: src/terminal/tab.c:225 +#: src/terminal/tab.c:224 msgid "Do you really want to close all except the current tab?" msgstr "Vil du virkelig lukke alle faneblade undtagen det aktuelle?" @@ -7941,11 +7975,11 @@ msgstr "Kan ikke skrive til standarduddata." msgid "URL protocol not supported (%s)." msgstr "Adresseprotokol ikke understøttet (%s)." -#: src/viewer/text/draw.c:63 +#: src/viewer/text/draw.c:64 msgid "Missing fragment" msgstr "Manglende fragment" -#: src/viewer/text/draw.c:64 +#: src/viewer/text/draw.c:65 #, c-format msgid "The requested fragment \"#%s\" doesn't exist." msgstr "Den forespurgte fragment \"#%s\" findes ikke." @@ -8174,6 +8208,11 @@ msgstr "Ikke versalf msgid "Search backward" msgstr "Søg bagud" +#. name: +#: src/viewer/text/search.c:1655 +msgid "Search History" +msgstr "Søgningshistorik" + #: src/viewer/text/textarea.c:364 msgid "You cannot launch an external editor in the anonymous mode." msgstr "Man kan ikke åbne en ekstern editor i tilstanden anonymous." @@ -8182,18 +8221,23 @@ msgstr "Man kan ikke msgid "You can do this only on the master terminal" msgstr "Dette er kun muligt i masterterminalen" -#: src/viewer/text/view.c:731 +#: src/viewer/text/view.c:716 msgid "Go to link" msgstr "Gå til link" -#: src/viewer/text/view.c:731 +#: src/viewer/text/view.c:716 msgid "Enter link number" msgstr "Skriv nummer på link" -#: src/viewer/text/view.c:1303 +#: src/viewer/text/view.c:1288 msgid "Save error" msgstr "Fejl ved skrivning" -#: src/viewer/text/view.c:1304 +#: src/viewer/text/view.c:1289 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" + +#~ msgid "%d byte" +#~ msgid_plural "%d bytes" +#~ msgstr[0] "%d byte" +#~ msgstr[1] "%d bytes" From 4e467d6129bf6f340b999cca6fc32c00e6e2c634 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Thu, 15 Sep 2005 22:35:03 +0200 Subject: [PATCH 10/52] Add forgotten cache Makefile Didn't notice it's missing because we still have it in .gitignore. --- src/cache/Makefile | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/cache/Makefile diff --git a/src/cache/Makefile b/src/cache/Makefile new file mode 100644 index 00000000..2c272a47 --- /dev/null +++ b/src/cache/Makefile @@ -0,0 +1,11 @@ +-include ../../Makefile.config + +OBJS = cache.o dialogs.o + +all: libcache.a +libcache.a: $(OBJS) + +clean: + rm -f *.o *.a + +-include ../../Makefile.lib From 6aea3df7ac5a490a90403e3dba1c3e770a0c90ee Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Thu, 15 Sep 2005 23:26:40 +0200 Subject: [PATCH 11/52] Switch doc/man over to the new build system --- doc/man/Makefile | 5 +++++ doc/man/Makefile.am | 4 ---- doc/man/man1/Makefile | 6 ++++++ doc/man/man1/Makefile.am | 6 ------ doc/man/man5/Makefile | 7 +++++++ doc/man/man5/Makefile.am | 6 ------ 6 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 doc/man/Makefile delete mode 100644 doc/man/Makefile.am create mode 100644 doc/man/man1/Makefile delete mode 100644 doc/man/man1/Makefile.am create mode 100644 doc/man/man5/Makefile delete mode 100644 doc/man/man5/Makefile.am diff --git a/doc/man/Makefile b/doc/man/Makefile new file mode 100644 index 00000000..5db41d4f --- /dev/null +++ b/doc/man/Makefile @@ -0,0 +1,5 @@ +-include ../../Makefile.config + +SUBDIRS = man1 man5 + +-include ../../Makefile.lib diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am deleted file mode 100644 index affcc465..00000000 --- a/doc/man/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.1 2003/05/21 02:02:56 jonas Exp $ - -SUBDIRS = man1 man5 diff --git a/doc/man/man1/Makefile b/doc/man/man1/Makefile new file mode 100644 index 00000000..4fd2d13b --- /dev/null +++ b/doc/man/man1/Makefile @@ -0,0 +1,6 @@ +-include ../../../Makefile.config + +install: + $(INSTALL_DATA) elinks.1 $(DESTDIR)$(mandir)/man1 + +-include ../../../Makefile.lib diff --git a/doc/man/man1/Makefile.am b/doc/man/man1/Makefile.am deleted file mode 100644 index d0bb54c8..00000000 --- a/doc/man/man1/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.3 2005/05/18 02:40:54 jonas Exp $ - -man_MANS = elinks.1 - -EXTRA_DIST = elinks.1.in diff --git a/doc/man/man5/Makefile b/doc/man/man5/Makefile new file mode 100644 index 00000000..776d2163 --- /dev/null +++ b/doc/man/man5/Makefile @@ -0,0 +1,7 @@ +-include ../../../Makefile.config + +install: + $(INSTALL_DATA) elinks.conf.5 $(DESTDIR)$(mandir)/man5 + $(INSTALL_DATA) elinkskeys.5 $(DESTDIR)$(mandir)/man5 + +-include ../../../Makefile.lib diff --git a/doc/man/man5/Makefile.am b/doc/man/man5/Makefile.am deleted file mode 100644 index 6431fcee..00000000 --- a/doc/man/man5/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.2 2003/06/04 22:21:29 jonas Exp $ - -man_MANS = elinks.conf.5 elinkskeys.5 - -EXTRA_DIST = $(man_MANS) From 833770a5f79c193336d53627b93d1fa34e6fa225 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Thu, 15 Sep 2005 23:28:56 +0200 Subject: [PATCH 12/52] Implicit recursiveness and clean rule All objects defining $(OBJS) will get them and *.a deleted during make clean. The all, clean and install rules now implicitly imply their -recursive counterparts - those will just do nothing in case of $(SUBDIRS) not defined, so that's ok. --- Makefile | 6 +----- Makefile.config.in | 8 ++++++++ Makefile.lib | 9 +++++++++ src/cache/Makefile | 3 --- src/config/Makefile | 3 --- src/ecmascript/Makefile | 6 ++---- src/ecmascript/spidermonkey/Makefile | 3 --- src/formhist/Makefile | 3 --- src/globhist/Makefile | 3 --- src/session/Makefile | 3 --- 10 files changed, 20 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index 60de7457..164fbfd5 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,7 @@ path_to_top = .. SUBDIRS = doc po src -all: all-recursive - -clean: clean-recursive +clean: rm -rf features.log -install: install-recursive - -include Makefile.lib diff --git a/Makefile.config.in b/Makefile.config.in index dbfe8f1c..3c7ec31d 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -103,3 +103,11 @@ LIBS = @LIBS@ INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) + + +### This is here because Makefile.config is usually the first thing +### we get and sometimes the all rule can be implicit, yet we want +### it always as the default one. So this should make sure it always +### comes first. +all: + diff --git a/Makefile.lib b/Makefile.lib index 43ac340e..94a3d0af 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -58,6 +58,11 @@ endif %.a: $(call cmd,archive) +ifdef $(OBJS) +clean: + rm -f $(OBJS) *.a +endif + # Recursion: @@ -68,5 +73,9 @@ all-recursive install-recursive clean-recursive: $(call ncmd,recmake) || exit 1; \ done +all: all-recursive +install: install-recursive +clean: clean-recursive + # vim:syntax=make diff --git a/src/cache/Makefile b/src/cache/Makefile index 2c272a47..e70eebd0 100644 --- a/src/cache/Makefile +++ b/src/cache/Makefile @@ -5,7 +5,4 @@ OBJS = cache.o dialogs.o all: libcache.a libcache.a: $(OBJS) -clean: - rm -f *.o *.a - -include ../../Makefile.lib diff --git a/src/config/Makefile b/src/config/Makefile index 64aa297a..55c9d35b 100644 --- a/src/config/Makefile +++ b/src/config/Makefile @@ -5,7 +5,4 @@ OBJS = cmdline.o conf.o dialogs.o home.o kbdbind.o options.o opttypes.o timer.o all: libconfig.a libconfig.a: $(OBJS) -clean: - rm -f *.o *.a - -include ../../Makefile.lib diff --git a/src/ecmascript/Makefile b/src/ecmascript/Makefile index 378d7ab5..9e8e7600 100644 --- a/src/ecmascript/Makefile +++ b/src/ecmascript/Makefile @@ -2,13 +2,11 @@ INCLUDES += $(SPIDERMONKEY_CFLAGS) SUBDIRS = spidermonkey + SM_OBJS = document.o form.o location.o navigator.o unibar.o window.o OBJS = ecmascript.o spidermonkey.o $(foreach obj,$(SM_OBJS),spidermonkey/$(obj)) -all: all-recursive libecmascript.a +all: libecmascript.a libecmascript.a: $(OBJS) -clean: - rm -f *.o *.a - -include ../../Makefile.lib diff --git a/src/ecmascript/spidermonkey/Makefile b/src/ecmascript/spidermonkey/Makefile index eb16efdd..d337a7de 100644 --- a/src/ecmascript/spidermonkey/Makefile +++ b/src/ecmascript/spidermonkey/Makefile @@ -6,7 +6,4 @@ OBJS = document.o form.o location.o navigator.o unibar.o window.o all: $(OBJS) -clean: - rm -f *.o *.a - -include ../../../Makefile.lib diff --git a/src/formhist/Makefile b/src/formhist/Makefile index ec9b3069..280ab317 100644 --- a/src/formhist/Makefile +++ b/src/formhist/Makefile @@ -5,7 +5,4 @@ OBJS = formhist.o dialogs.o all: libformhist.a libformhist.a: $(OBJS) -clean: - rm -f *.o *.a - -include ../../Makefile.lib diff --git a/src/globhist/Makefile b/src/globhist/Makefile index baad9fae..1b208406 100644 --- a/src/globhist/Makefile +++ b/src/globhist/Makefile @@ -5,7 +5,4 @@ OBJS = globhist.o dialogs.o all: libglobhist.a libglobhist.a: $(OBJS) -clean: - rm -f *.o *.a - -include ../../Makefile.lib diff --git a/src/session/Makefile b/src/session/Makefile index 2893ce0f..3d06faf3 100644 --- a/src/session/Makefile +++ b/src/session/Makefile @@ -5,7 +5,4 @@ OBJS = download.o history.o location.o session.o task.o all: libsession.a libsession.a: $(OBJS) -clean: - rm -f *.o *.a - -include ../../Makefile.lib From 4396927798666d51a8a0faba8ab9cd9baeecf7a5 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 00:02:18 +0200 Subject: [PATCH 13/52] Make ./configure not care about doc/man/ subdirs, now in the new build system. --- configure.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure.in b/configure.in index 79f71eff..22683806 100644 --- a/configure.in +++ b/configure.in @@ -1267,10 +1267,6 @@ AC_OUTPUT([ \ contrib/lua/hooks.lua \ contrib/conv/w3m2links.awk \ doc/Makefile \ - doc/man/Makefile \ - doc/man/man1/Makefile \ - doc/man/man1/elinks.1 \ - doc/man/man5/Makefile \ po/Makefile \ src/Makefile \ src/bfu/Makefile \ From 953c7728636915e97b1594d32f062055b4f94f15 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 00:26:00 +0200 Subject: [PATCH 14/52] Don't autogenerate src/session/Makefile --- configure.in | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.in b/configure.in index 22683806..b90c7847 100644 --- a/configure.in +++ b/configure.in @@ -1315,7 +1315,6 @@ AC_OUTPUT([ \ src/scripting/perl/Makefile \ src/scripting/python/Makefile \ src/scripting/ruby/Makefile \ - src/session/Makefile \ src/terminal/Makefile \ src/util/Makefile \ src/viewer/Makefile \ From fffc57376958f8c68cf2ed7ebb156ec5bbc592f2 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 00:52:54 +0200 Subject: [PATCH 15/52] Use all-l,install-l,clean-l targets in individual makefiles and let Makefile.lib multiplex the real ones. That's so that the -recursive ones always come first. --- Makefile | 2 +- Makefile.lib | 12 ++++++++---- doc/man/man1/Makefile | 2 +- doc/man/man5/Makefile | 2 +- src/cache/Makefile | 2 +- src/config/Makefile | 2 +- src/ecmascript/Makefile | 2 +- src/ecmascript/spidermonkey/Makefile | 2 +- src/formhist/Makefile | 2 +- src/globhist/Makefile | 2 +- src/session/Makefile | 2 +- 11 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 164fbfd5..4ab954ec 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ path_to_top = .. SUBDIRS = doc po src -clean: +clean-l: rm -rf features.log -include Makefile.lib diff --git a/Makefile.lib b/Makefile.lib index 94a3d0af..aec1def4 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -59,7 +59,7 @@ endif $(call cmd,archive) ifdef $(OBJS) -clean: +clean-l: rm -f $(OBJS) *.a endif @@ -73,9 +73,13 @@ all-recursive install-recursive clean-recursive: $(call ncmd,recmake) || exit 1; \ done -all: all-recursive -install: install-recursive -clean: clean-recursive +all: all-recursive all-l +install: install-recursive install-l +clean: clean-recursive clean-l + +all-l: +install-l: +clean-l: # vim:syntax=make diff --git a/doc/man/man1/Makefile b/doc/man/man1/Makefile index 4fd2d13b..0e4c9911 100644 --- a/doc/man/man1/Makefile +++ b/doc/man/man1/Makefile @@ -1,6 +1,6 @@ -include ../../../Makefile.config -install: +install-l: $(INSTALL_DATA) elinks.1 $(DESTDIR)$(mandir)/man1 -include ../../../Makefile.lib diff --git a/doc/man/man5/Makefile b/doc/man/man5/Makefile index 776d2163..9cdc61e0 100644 --- a/doc/man/man5/Makefile +++ b/doc/man/man5/Makefile @@ -1,6 +1,6 @@ -include ../../../Makefile.config -install: +install-l: $(INSTALL_DATA) elinks.conf.5 $(DESTDIR)$(mandir)/man5 $(INSTALL_DATA) elinkskeys.5 $(DESTDIR)$(mandir)/man5 diff --git a/src/cache/Makefile b/src/cache/Makefile index e70eebd0..56a44756 100644 --- a/src/cache/Makefile +++ b/src/cache/Makefile @@ -2,7 +2,7 @@ OBJS = cache.o dialogs.o -all: libcache.a +all-l: libcache.a libcache.a: $(OBJS) -include ../../Makefile.lib diff --git a/src/config/Makefile b/src/config/Makefile index 55c9d35b..d17e857a 100644 --- a/src/config/Makefile +++ b/src/config/Makefile @@ -2,7 +2,7 @@ OBJS = cmdline.o conf.o dialogs.o home.o kbdbind.o options.o opttypes.o timer.o urlhist.o -all: libconfig.a +all-l: libconfig.a libconfig.a: $(OBJS) -include ../../Makefile.lib diff --git a/src/ecmascript/Makefile b/src/ecmascript/Makefile index 9e8e7600..85d2ced6 100644 --- a/src/ecmascript/Makefile +++ b/src/ecmascript/Makefile @@ -6,7 +6,7 @@ SUBDIRS = spidermonkey SM_OBJS = document.o form.o location.o navigator.o unibar.o window.o OBJS = ecmascript.o spidermonkey.o $(foreach obj,$(SM_OBJS),spidermonkey/$(obj)) -all: libecmascript.a +all-l: libecmascript.a libecmascript.a: $(OBJS) -include ../../Makefile.lib diff --git a/src/ecmascript/spidermonkey/Makefile b/src/ecmascript/spidermonkey/Makefile index d337a7de..9f97b98a 100644 --- a/src/ecmascript/spidermonkey/Makefile +++ b/src/ecmascript/spidermonkey/Makefile @@ -4,6 +4,6 @@ INCLUDES += $(SPIDERMONKEY_CFLAGS) # Do not forget to also add the .o to ../Makefile. Yes, it sucks. OBJS = document.o form.o location.o navigator.o unibar.o window.o -all: $(OBJS) +all-l: $(OBJS) -include ../../../Makefile.lib diff --git a/src/formhist/Makefile b/src/formhist/Makefile index 280ab317..bbbe29a9 100644 --- a/src/formhist/Makefile +++ b/src/formhist/Makefile @@ -2,7 +2,7 @@ OBJS = formhist.o dialogs.o -all: libformhist.a +all-l: libformhist.a libformhist.a: $(OBJS) -include ../../Makefile.lib diff --git a/src/globhist/Makefile b/src/globhist/Makefile index 1b208406..cfdf1804 100644 --- a/src/globhist/Makefile +++ b/src/globhist/Makefile @@ -2,7 +2,7 @@ OBJS = globhist.o dialogs.o -all: libglobhist.a +all-l: libglobhist.a libglobhist.a: $(OBJS) -include ../../Makefile.lib diff --git a/src/session/Makefile b/src/session/Makefile index 3d06faf3..9d747508 100644 --- a/src/session/Makefile +++ b/src/session/Makefile @@ -2,7 +2,7 @@ OBJS = download.o history.o location.o session.o task.o -all: libsession.a +all-l: libsession.a libsession.a: $(OBJS) -include ../../Makefile.lib From 201c7956cce23da8439cd50a2e1527d63c5e8854 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 01:07:31 +0200 Subject: [PATCH 16/52] ELBuildize po/Makefile. --- Makefile.config.in | 2 ++ po/{Makefile.am => Makefile} | 37 ++++++++++++------------------------ 2 files changed, 14 insertions(+), 25 deletions(-) rename po/{Makefile.am => Makefile} (81%) diff --git a/Makefile.config.in b/Makefile.config.in index 3c7ec31d..de17972b 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -48,6 +48,7 @@ CONFIG_NLS = @CONFIG_NLS@ CONFIG_POD2HTML = @CONFIG_POD2HTML@ CONFIG_RUBY = @CONFIG_RUBY@ CONFIG_XMLTO = @CONFIG_XMLTO@ +CONFIG_NLS = @CONFIG_NLS@ DATADIRNAME = @DATADIRNAME@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ @@ -92,6 +93,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ VERSION = @VERSION@ XMLTO = @XMLTO@ X_CFLAGS = @X_CFLAGS@ +XGETTEXT = @XGETTEXT@ DEFS = @DEFS@ CFLAGS = @CFLAGS@ diff --git a/po/Makefile.am b/po/Makefile similarity index 81% rename from po/Makefile.am rename to po/Makefile index a6641580..11595404 100644 --- a/po/Makefile.am +++ b/po/Makefile @@ -1,18 +1,10 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.9 2005/05/16 22:34:41 jonas Exp $ - -EXTRA_DIST = README $(PACKAGE).pot $(POFILES) $(GMOFILES) - -MOSTLYCLEANFILES = $(PACKAGE).po *.new.po -DISTCLEANFILES = *.mo -MAINTAINERCLEANFILES = $(GMOFILES) +-include ../Makefile.config # Where to install the catalog files. localedir = $(datadir)/locale # These are for some reason not added magically to the Makefile. MSGMERGE = msgmerge -XGETTEXT = @XGETTEXT@ POTFILES_REL = $(shell find $(top_srcdir)/src/ -name '*.[ch]' -o -name options.inc -o -name 'actions-*.inc' | sort) POTFILES_ABS = $(shell cd $(top_srcdir); find src/ -name '*.[ch]' -o -name options.inc -o -name 'actions-*.inc' | sort) @@ -43,7 +35,7 @@ SUFFIXES = .po .gmo .mo # # $(CATALOGS) is empty if --disable-nls. Beats using *-(yes|no) targets. -all-local: $(CATALOGS) +all-l: $(CATALOGS) ### Creating the template po template file @@ -108,13 +100,13 @@ check-po: $(GMSGFMT) --check --check-accelerators=~ --verbose --statistics -o /dev/null $$lang.po; \ done -### (Un)installation and distribution +### Installation and distribution # -# Use *-local targets to place and remove .gmo files. +# Use *-l targets to place and remove .gmo files. -install-data-local: install-data-local-@CONFIG_NLS@ -install-data-local-no: -install-data-local-yes: +install-l: install-l-$(CONFIG_NLS) +install-l-no: +install-l-yes: $(mkinstalldirs) $(DESTDIR)$(localedir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ @@ -130,16 +122,11 @@ install-data-local-yes: fi; \ done -# There is no `uninstall-data-local' target. The automake info document says to -# just use `uninstall-local'. -uninstall-local: - catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ - done - # Steal the `dist' target so that .po and .gmo files will be properly updated # then the dependence on `distdir' will take care of copying. dist: update-po distdir + +clean: + rm -f $(PACKAGE).po *.new.po + +-include ../Makefile.lib From 32fe41fae74b24ce2aed75472be1a9f3726d121c Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 01:09:42 +0200 Subject: [PATCH 17/52] ELBuild: Use 'include' instead of '-include' We _do_ want to error on when including .config and .lib failed. --- Makefile | 4 ++-- doc/man/Makefile | 4 ++-- doc/man/man1/Makefile | 4 ++-- doc/man/man5/Makefile | 4 ++-- po/Makefile | 4 ++-- src/cache/Makefile | 4 ++-- src/config/Makefile | 4 ++-- src/ecmascript/Makefile | 4 ++-- src/ecmascript/spidermonkey/Makefile | 4 ++-- src/formhist/Makefile | 4 ++-- src/globhist/Makefile | 4 ++-- src/session/Makefile | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 4ab954ec..00b08179 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ --include Makefile.config +include Makefile.config # This should be _really_ ., but only after we have src/Makefile. # Otherwise, it wouldn't be set right in the submakefiles. path_to_top = .. @@ -11,4 +11,4 @@ SUBDIRS = doc po src clean-l: rm -rf features.log --include Makefile.lib +include Makefile.lib diff --git a/doc/man/Makefile b/doc/man/Makefile index 5db41d4f..eb43df3a 100644 --- a/doc/man/Makefile +++ b/doc/man/Makefile @@ -1,5 +1,5 @@ --include ../../Makefile.config +include ../../Makefile.config SUBDIRS = man1 man5 --include ../../Makefile.lib +include ../../Makefile.lib diff --git a/doc/man/man1/Makefile b/doc/man/man1/Makefile index 0e4c9911..50a80c6a 100644 --- a/doc/man/man1/Makefile +++ b/doc/man/man1/Makefile @@ -1,6 +1,6 @@ --include ../../../Makefile.config +include ../../../Makefile.config install-l: $(INSTALL_DATA) elinks.1 $(DESTDIR)$(mandir)/man1 --include ../../../Makefile.lib +include ../../../Makefile.lib diff --git a/doc/man/man5/Makefile b/doc/man/man5/Makefile index 9cdc61e0..04acf0ff 100644 --- a/doc/man/man5/Makefile +++ b/doc/man/man5/Makefile @@ -1,7 +1,7 @@ --include ../../../Makefile.config +include ../../../Makefile.config install-l: $(INSTALL_DATA) elinks.conf.5 $(DESTDIR)$(mandir)/man5 $(INSTALL_DATA) elinkskeys.5 $(DESTDIR)$(mandir)/man5 --include ../../../Makefile.lib +include ../../../Makefile.lib diff --git a/po/Makefile b/po/Makefile index 11595404..6ad1b792 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,4 +1,4 @@ --include ../Makefile.config +include ../Makefile.config # Where to install the catalog files. localedir = $(datadir)/locale @@ -129,4 +129,4 @@ dist: update-po distdir clean: rm -f $(PACKAGE).po *.new.po --include ../Makefile.lib +include ../Makefile.lib diff --git a/src/cache/Makefile b/src/cache/Makefile index 56a44756..3f5c40dc 100644 --- a/src/cache/Makefile +++ b/src/cache/Makefile @@ -1,8 +1,8 @@ --include ../../Makefile.config +include ../../Makefile.config OBJS = cache.o dialogs.o all-l: libcache.a libcache.a: $(OBJS) --include ../../Makefile.lib +include ../../Makefile.lib diff --git a/src/config/Makefile b/src/config/Makefile index d17e857a..3eac8ae8 100644 --- a/src/config/Makefile +++ b/src/config/Makefile @@ -1,8 +1,8 @@ --include ../../Makefile.config +include ../../Makefile.config OBJS = cmdline.o conf.o dialogs.o home.o kbdbind.o options.o opttypes.o timer.o urlhist.o all-l: libconfig.a libconfig.a: $(OBJS) --include ../../Makefile.lib +include ../../Makefile.lib diff --git a/src/ecmascript/Makefile b/src/ecmascript/Makefile index 85d2ced6..edf019d5 100644 --- a/src/ecmascript/Makefile +++ b/src/ecmascript/Makefile @@ -1,4 +1,4 @@ --include ../../Makefile.config +include ../../Makefile.config INCLUDES += $(SPIDERMONKEY_CFLAGS) SUBDIRS = spidermonkey @@ -9,4 +9,4 @@ OBJS = ecmascript.o spidermonkey.o $(foreach obj,$(SM_OBJS),spidermonkey/$(obj)) all-l: libecmascript.a libecmascript.a: $(OBJS) --include ../../Makefile.lib +include ../../Makefile.lib diff --git a/src/ecmascript/spidermonkey/Makefile b/src/ecmascript/spidermonkey/Makefile index 9f97b98a..9fd3a704 100644 --- a/src/ecmascript/spidermonkey/Makefile +++ b/src/ecmascript/spidermonkey/Makefile @@ -1,4 +1,4 @@ --include ../../../Makefile.config +include ../../../Makefile.config INCLUDES += $(SPIDERMONKEY_CFLAGS) # Do not forget to also add the .o to ../Makefile. Yes, it sucks. @@ -6,4 +6,4 @@ OBJS = document.o form.o location.o navigator.o unibar.o window.o all-l: $(OBJS) --include ../../../Makefile.lib +include ../../../Makefile.lib diff --git a/src/formhist/Makefile b/src/formhist/Makefile index bbbe29a9..fd990718 100644 --- a/src/formhist/Makefile +++ b/src/formhist/Makefile @@ -1,8 +1,8 @@ --include ../../Makefile.config +include ../../Makefile.config OBJS = formhist.o dialogs.o all-l: libformhist.a libformhist.a: $(OBJS) --include ../../Makefile.lib +include ../../Makefile.lib diff --git a/src/globhist/Makefile b/src/globhist/Makefile index cfdf1804..1c221492 100644 --- a/src/globhist/Makefile +++ b/src/globhist/Makefile @@ -1,8 +1,8 @@ --include ../../Makefile.config +include ../../Makefile.config OBJS = globhist.o dialogs.o all-l: libglobhist.a libglobhist.a: $(OBJS) --include ../../Makefile.lib +include ../../Makefile.lib diff --git a/src/session/Makefile b/src/session/Makefile index 9d747508..ca21b32e 100644 --- a/src/session/Makefile +++ b/src/session/Makefile @@ -1,8 +1,8 @@ --include ../../Makefile.config +include ../../Makefile.config OBJS = download.o history.o location.o session.o task.o all-l: libsession.a libsession.a: $(OBJS) --include ../../Makefile.lib +include ../../Makefile.lib From 22b6d3f6230e0c23101332aa0ee13d4f9ee28252 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 01:47:57 +0200 Subject: [PATCH 18/52] Uhm, don't autogenerate po/Makefile. --- configure.in | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.in b/configure.in index b90c7847..5b03a1f3 100644 --- a/configure.in +++ b/configure.in @@ -1267,7 +1267,6 @@ AC_OUTPUT([ \ contrib/lua/hooks.lua \ contrib/conv/w3m2links.awk \ doc/Makefile \ - po/Makefile \ src/Makefile \ src/bfu/Makefile \ src/bookmarks/Makefile \ From a153695c08881cd1f8aced750c468e5cfd3c7d8b Mon Sep 17 00:00:00 2001 From: "Frobozz the Neuromancer,668,302-521-2606,609-645-8080" Date: Thu, 15 Sep 2005 20:03:22 -0400 Subject: [PATCH 19/52] No more $ld$s. --- contrib/perl/config.pl | 1 - contrib/perl/hooks.pl | 1 - 2 files changed, 2 deletions(-) diff --git a/contrib/perl/config.pl b/contrib/perl/config.pl index 7eda64d2..dd12bdb3 100644 --- a/contrib/perl/config.pl +++ b/contrib/perl/config.pl @@ -1,5 +1,4 @@ # Configuration file for hooks.pl - salt to taste and place in ~/.elinks -# $Id: config.pl,v 1.5 2005/08/07 21:14:04 rrowan Exp $ bork: nah # BORKify Google? collapse: nope # Collapse all XBEL bookmark folders on exit? diff --git a/contrib/perl/hooks.pl b/contrib/perl/hooks.pl index 87b24697..763795df 100644 --- a/contrib/perl/hooks.pl +++ b/contrib/perl/hooks.pl @@ -1,5 +1,4 @@ # Example ~/.elinks/hooks.pl -# $Id: hooks.pl,v 1.135 2005/09/03 20:56:58 rrowan Exp $ # # Copyleft by Russ Rowan (See the file "COPYING" for details.) # From 204bbe5d2c7f48511de7a5c820e8fffa581f0b7a Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 02:07:36 +0200 Subject: [PATCH 20/52] Fix starting a build from a subdirectory ELBuild-wise Now all the submakefiles contain informationa buot where in the directory hierarchy they stay. --- Makefile | 8 +++----- Makefile.lib | 2 +- doc/man/Makefile | 5 +++-- doc/man/man1/Makefile | 5 +++-- doc/man/man5/Makefile | 5 +++-- po/Makefile | 5 +++-- src/cache/Makefile | 5 +++-- src/config/Makefile | 5 +++-- src/ecmascript/Makefile | 5 +++-- src/ecmascript/spidermonkey/Makefile | 5 +++-- src/formhist/Makefile | 5 +++-- src/globhist/Makefile | 5 +++-- src/session/Makefile | 5 +++-- 13 files changed, 37 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 00b08179..52da867a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,5 @@ -include Makefile.config -# This should be _really_ ., but only after we have src/Makefile. -# Otherwise, it wouldn't be set right in the submakefiles. -path_to_top = .. +path_to_top = . +include $(path_to_top)/Makefile.config # TODO: Automagically rerun autoconf. @@ -11,4 +9,4 @@ SUBDIRS = doc po src clean-l: rm -rf features.log -include Makefile.lib +include $(path_to_top)/Makefile.lib diff --git a/Makefile.lib b/Makefile.lib index aec1def4..281959cf 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -32,7 +32,7 @@ quiet_cmd_archive = '[AR] $@' # Recursive make quiet_cmd_recmake = "[MAKE $$target] $$subdir" - cmd_recmake = $(MAKE) -C $$subdir $$target path_to_top="$(path_to_top)/.." + cmd_recmake = $(MAKE) -C $$subdir $$target diff --git a/doc/man/Makefile b/doc/man/Makefile index eb43df3a..4244e78a 100644 --- a/doc/man/Makefile +++ b/doc/man/Makefile @@ -1,5 +1,6 @@ -include ../../Makefile.config +path_to_top=../.. +include $(path_to_top)/Makefile.config SUBDIRS = man1 man5 -include ../../Makefile.lib +include $(path_to_top)/Makefile.lib diff --git a/doc/man/man1/Makefile b/doc/man/man1/Makefile index 50a80c6a..24108a10 100644 --- a/doc/man/man1/Makefile +++ b/doc/man/man1/Makefile @@ -1,6 +1,7 @@ -include ../../../Makefile.config +path_to_top=../../.. +include $(path_to_top)/Makefile.config install-l: $(INSTALL_DATA) elinks.1 $(DESTDIR)$(mandir)/man1 -include ../../../Makefile.lib +include $(path_to_top)/Makefile.lib diff --git a/doc/man/man5/Makefile b/doc/man/man5/Makefile index 04acf0ff..7a68cfe4 100644 --- a/doc/man/man5/Makefile +++ b/doc/man/man5/Makefile @@ -1,7 +1,8 @@ -include ../../../Makefile.config +path_to_top=../../.. +include $(path_to_top)/Makefile.config install-l: $(INSTALL_DATA) elinks.conf.5 $(DESTDIR)$(mandir)/man5 $(INSTALL_DATA) elinkskeys.5 $(DESTDIR)$(mandir)/man5 -include ../../../Makefile.lib +include $(path_to_top)/Makefile.lib diff --git a/po/Makefile b/po/Makefile index 6ad1b792..5bc21df8 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,4 +1,5 @@ -include ../Makefile.config +path_to_top=.. +include $(path_to_top)/Makefile.config # Where to install the catalog files. localedir = $(datadir)/locale @@ -129,4 +130,4 @@ dist: update-po distdir clean: rm -f $(PACKAGE).po *.new.po -include ../Makefile.lib +include $(path_to_top)/Makefile.lib diff --git a/src/cache/Makefile b/src/cache/Makefile index 3f5c40dc..b0ebcf52 100644 --- a/src/cache/Makefile +++ b/src/cache/Makefile @@ -1,8 +1,9 @@ -include ../../Makefile.config +path_to_top=../.. +include $(path_to_top)/Makefile.config OBJS = cache.o dialogs.o all-l: libcache.a libcache.a: $(OBJS) -include ../../Makefile.lib +include $(path_to_top)/Makefile.lib diff --git a/src/config/Makefile b/src/config/Makefile index 3eac8ae8..3d4d6734 100644 --- a/src/config/Makefile +++ b/src/config/Makefile @@ -1,8 +1,9 @@ -include ../../Makefile.config +path_to_top=../.. +include $(path_to_top)/Makefile.config OBJS = cmdline.o conf.o dialogs.o home.o kbdbind.o options.o opttypes.o timer.o urlhist.o all-l: libconfig.a libconfig.a: $(OBJS) -include ../../Makefile.lib +include $(path_to_top)/Makefile.lib diff --git a/src/ecmascript/Makefile b/src/ecmascript/Makefile index edf019d5..1831a10c 100644 --- a/src/ecmascript/Makefile +++ b/src/ecmascript/Makefile @@ -1,4 +1,5 @@ -include ../../Makefile.config +path_to_top=../.. +include $(path_to_top)/Makefile.config INCLUDES += $(SPIDERMONKEY_CFLAGS) SUBDIRS = spidermonkey @@ -9,4 +10,4 @@ OBJS = ecmascript.o spidermonkey.o $(foreach obj,$(SM_OBJS),spidermonkey/$(obj)) all-l: libecmascript.a libecmascript.a: $(OBJS) -include ../../Makefile.lib +include $(path_to_top)/Makefile.lib diff --git a/src/ecmascript/spidermonkey/Makefile b/src/ecmascript/spidermonkey/Makefile index 9fd3a704..c052e052 100644 --- a/src/ecmascript/spidermonkey/Makefile +++ b/src/ecmascript/spidermonkey/Makefile @@ -1,4 +1,5 @@ -include ../../../Makefile.config +path_to_top=../../.. +include $(path_to_top)/Makefile.config INCLUDES += $(SPIDERMONKEY_CFLAGS) # Do not forget to also add the .o to ../Makefile. Yes, it sucks. @@ -6,4 +7,4 @@ OBJS = document.o form.o location.o navigator.o unibar.o window.o all-l: $(OBJS) -include ../../../Makefile.lib +include $(path_to_top)/Makefile.lib diff --git a/src/formhist/Makefile b/src/formhist/Makefile index fd990718..641bdeaf 100644 --- a/src/formhist/Makefile +++ b/src/formhist/Makefile @@ -1,8 +1,9 @@ -include ../../Makefile.config +path_to_top=../.. +include $(path_to_top)/Makefile.config OBJS = formhist.o dialogs.o all-l: libformhist.a libformhist.a: $(OBJS) -include ../../Makefile.lib +include $(path_to_top)/Makefile.lib diff --git a/src/globhist/Makefile b/src/globhist/Makefile index 1c221492..1327c69e 100644 --- a/src/globhist/Makefile +++ b/src/globhist/Makefile @@ -1,8 +1,9 @@ -include ../../Makefile.config +path_to_top=../.. +include $(path_to_top)/Makefile.config OBJS = globhist.o dialogs.o all-l: libglobhist.a libglobhist.a: $(OBJS) -include ../../Makefile.lib +include $(path_to_top)/Makefile.lib diff --git a/src/session/Makefile b/src/session/Makefile index ca21b32e..1495d623 100644 --- a/src/session/Makefile +++ b/src/session/Makefile @@ -1,8 +1,9 @@ -include ../../Makefile.config +path_to_top=../.. +include $(path_to_top)/Makefile.config OBJS = download.o history.o location.o session.o task.o all-l: libsession.a libsession.a: $(OBJS) -include ../../Makefile.lib +include $(path_to_top)/Makefile.lib From 261fdb5326842f0d69fb77db734b4c1888ed3832 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 02:54:38 +0200 Subject: [PATCH 21/52] Fix building of .gmo files --- po/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/po/Makefile b/po/Makefile index 5bc21df8..285bb90d 100644 --- a/po/Makefile +++ b/po/Makefile @@ -12,6 +12,7 @@ POTFILES_ABS = $(shell cd $(top_srcdir); find src/ -name '*.[ch]' -o -name optio SUFFIXES = .po .gmo .mo +.SUFFIXES: .gmo .mo .po .po.mo: $(MSGFMT) -o $@ $< From 39bddb75629983932ece3de57975048edc2bbcc7 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 02:55:13 +0200 Subject: [PATCH 22/52] Properly set $(srcdir) Should fix building outside of source tree and making po/. --- Makefile.config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.config.in b/Makefile.config.in index de17972b..22503200 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -6,6 +6,7 @@ SHELL = @SHELL@ top_srcdir = $(path_to_top)/@top_srcdir@ +srcdir = $(top_srcdir)/$(shell pwd | sed 's!.*/\($(shell echo $(path_to_top) | sed 's!\.\.![^/]*!')\)$$!\1!') top_builddir = $(path_to_top) prefix = @prefix@ exec_prefix = @exec_prefix@ From 1f0cd14e9100ad9c97ae0104408dcb772b6da391 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 04:07:37 +0200 Subject: [PATCH 23/52] Converted another bunch of submakefiles to ELBuild --- configure.in | 28 ------------------------- src/document/css/Makefile | 9 ++++++++ src/document/css/Makefile.am | 31 ---------------------------- src/document/dom/Makefile | 9 ++++++++ src/document/dom/Makefile.am | 20 ------------------ src/document/html/Makefile | 11 ++++++++++ src/document/html/Makefile.am | 28 ------------------------- src/document/html/parser/Makefile | 9 ++++++++ src/document/html/parser/Makefile.am | 27 ------------------------ src/document/plain/Makefile | 9 ++++++++ src/document/plain/Makefile.am | 10 --------- src/document/sgml/Makefile | 11 ++++++++++ src/document/sgml/Makefile.am | 24 --------------------- src/document/sgml/html/Makefile | 9 ++++++++ src/document/sgml/html/Makefile.am | 18 ---------------- src/network/ssl/Makefile | 11 ++++++++++ src/network/ssl/Makefile.am | 16 -------------- src/osdep/beos/Makefile | 9 ++++++++ src/osdep/beos/Makefile.am | 19 ----------------- src/osdep/os2/Makefile | 9 ++++++++ src/osdep/os2/Makefile.am | 17 --------------- src/osdep/riscos/Makefile | 9 ++++++++ src/osdep/riscos/Makefile.am | 17 --------------- src/osdep/unix/Makefile | 9 ++++++++ src/osdep/unix/Makefile.am | 18 ---------------- src/osdep/win32/Makefile | 9 ++++++++ src/osdep/win32/Makefile.am | 19 ----------------- src/protocol/auth/Makefile | 12 +++++++++++ src/protocol/auth/Makefile.am | 16 -------------- src/protocol/bittorrent/Makefile | 11 ++++++++++ src/protocol/bittorrent/Makefile.am | 28 ------------------------- src/protocol/finger/Makefile | 9 ++++++++ src/protocol/finger/Makefile.am | 10 --------- src/protocol/ftp/Makefile | 9 ++++++++ src/protocol/ftp/Makefile.am | 12 ----------- src/protocol/gopher/Makefile | 9 ++++++++ src/protocol/gopher/Makefile.am | 10 --------- src/protocol/http/Makefile | 9 ++++++++ src/protocol/http/Makefile.am | 16 -------------- src/protocol/nntp/Makefile | 9 ++++++++ src/protocol/nntp/Makefile.am | 15 -------------- src/protocol/rewrite/Makefile | 9 ++++++++ src/protocol/rewrite/Makefile.am | 10 --------- src/protocol/smb/Makefile | 9 ++++++++ src/protocol/smb/Makefile.am | 10 --------- src/scripting/guile/Makefile | 11 ++++++++++ src/scripting/guile/Makefile.am | 17 --------------- src/scripting/lua/Makefile | 11 ++++++++++ src/scripting/lua/Makefile.am | 18 ---------------- src/scripting/perl/Makefile | 11 ++++++++++ src/scripting/perl/Makefile.am | 15 -------------- src/scripting/python/Makefile | 11 ++++++++++ src/scripting/python/Makefile.am | 15 -------------- src/scripting/ruby/Makefile | 11 ++++++++++ src/scripting/ruby/Makefile.am | 16 -------------- src/viewer/dump/Makefile | 9 ++++++++ src/viewer/dump/Makefile.am | 10 --------- 57 files changed, 273 insertions(+), 510 deletions(-) create mode 100644 src/document/css/Makefile delete mode 100644 src/document/css/Makefile.am create mode 100644 src/document/dom/Makefile delete mode 100644 src/document/dom/Makefile.am create mode 100644 src/document/html/Makefile delete mode 100644 src/document/html/Makefile.am create mode 100644 src/document/html/parser/Makefile delete mode 100644 src/document/html/parser/Makefile.am create mode 100644 src/document/plain/Makefile delete mode 100644 src/document/plain/Makefile.am create mode 100644 src/document/sgml/Makefile delete mode 100644 src/document/sgml/Makefile.am create mode 100644 src/document/sgml/html/Makefile delete mode 100644 src/document/sgml/html/Makefile.am create mode 100644 src/network/ssl/Makefile delete mode 100644 src/network/ssl/Makefile.am create mode 100644 src/osdep/beos/Makefile delete mode 100644 src/osdep/beos/Makefile.am create mode 100644 src/osdep/os2/Makefile delete mode 100644 src/osdep/os2/Makefile.am create mode 100644 src/osdep/riscos/Makefile delete mode 100644 src/osdep/riscos/Makefile.am create mode 100644 src/osdep/unix/Makefile delete mode 100644 src/osdep/unix/Makefile.am create mode 100644 src/osdep/win32/Makefile delete mode 100644 src/osdep/win32/Makefile.am create mode 100644 src/protocol/auth/Makefile delete mode 100644 src/protocol/auth/Makefile.am create mode 100644 src/protocol/bittorrent/Makefile delete mode 100644 src/protocol/bittorrent/Makefile.am create mode 100644 src/protocol/finger/Makefile delete mode 100644 src/protocol/finger/Makefile.am create mode 100644 src/protocol/ftp/Makefile delete mode 100644 src/protocol/ftp/Makefile.am create mode 100644 src/protocol/gopher/Makefile delete mode 100644 src/protocol/gopher/Makefile.am create mode 100644 src/protocol/http/Makefile delete mode 100644 src/protocol/http/Makefile.am create mode 100644 src/protocol/nntp/Makefile delete mode 100644 src/protocol/nntp/Makefile.am create mode 100644 src/protocol/rewrite/Makefile delete mode 100644 src/protocol/rewrite/Makefile.am create mode 100644 src/protocol/smb/Makefile delete mode 100644 src/protocol/smb/Makefile.am create mode 100644 src/scripting/guile/Makefile delete mode 100644 src/scripting/guile/Makefile.am create mode 100644 src/scripting/lua/Makefile delete mode 100644 src/scripting/lua/Makefile.am create mode 100644 src/scripting/perl/Makefile delete mode 100644 src/scripting/perl/Makefile.am create mode 100644 src/scripting/python/Makefile delete mode 100644 src/scripting/python/Makefile.am create mode 100644 src/scripting/ruby/Makefile delete mode 100644 src/scripting/ruby/Makefile.am create mode 100644 src/viewer/dump/Makefile delete mode 100644 src/viewer/dump/Makefile.am diff --git a/configure.in b/configure.in index 5b03a1f3..5d8adf16 100644 --- a/configure.in +++ b/configure.in @@ -1274,13 +1274,6 @@ AC_OUTPUT([ \ src/cookies/Makefile \ src/dialogs/Makefile \ src/document/Makefile \ - src/document/css/Makefile \ - src/document/dom/Makefile \ - src/document/html/Makefile \ - src/document/html/parser/Makefile \ - src/document/plain/Makefile \ - src/document/sgml/Makefile \ - src/document/sgml/html/Makefile \ src/encoding/Makefile \ src/intl/Makefile \ src/intl/gettext/Makefile \ @@ -1290,34 +1283,13 @@ AC_OUTPUT([ \ src/mime/Makefile \ src/mime/backend/Makefile \ src/network/Makefile \ - src/network/ssl/Makefile \ src/osdep/Makefile \ - src/osdep/beos/Makefile \ - src/osdep/os2/Makefile \ - src/osdep/riscos/Makefile \ - src/osdep/unix/Makefile \ - src/osdep/win32/Makefile \ src/protocol/Makefile \ - src/protocol/auth/Makefile \ - src/protocol/bittorrent/Makefile \ src/protocol/file/Makefile \ - src/protocol/finger/Makefile \ - src/protocol/ftp/Makefile \ - src/protocol/gopher/Makefile \ - src/protocol/http/Makefile \ - src/protocol/nntp/Makefile \ - src/protocol/rewrite/Makefile \ - src/protocol/smb/Makefile \ src/scripting/Makefile \ - src/scripting/guile/Makefile \ - src/scripting/lua/Makefile \ - src/scripting/perl/Makefile \ - src/scripting/python/Makefile \ - src/scripting/ruby/Makefile \ src/terminal/Makefile \ src/util/Makefile \ src/viewer/Makefile \ - src/viewer/dump/Makefile \ src/viewer/text/Makefile ]) diff --git a/src/document/css/Makefile b/src/document/css/Makefile new file mode 100644 index 00000000..7d4991c2 --- /dev/null +++ b/src/document/css/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +OBJS = apply.o css.o parser.o property.o scanner.o stylesheet.o value.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/document/css/Makefile.am b/src/document/css/Makefile.am deleted file mode 100644 index a09d4dad..00000000 --- a/src/document/css/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.11 2004/08/14 21:12:37 miciah Exp $ - -include $(top_srcdir)/Makefile.base - -# We don't want to expose this outside of /src/document/ at all, and we can't -# merge the whole library of these with libdocument.a. So we only compile -# objects here and link them directly to libdocument.a in ../Makefile.am. - -# However, we apparently need to create the library in order to convince -# automake to compile the objects :/. We DON'T use libcss.a ANYWHERE. - -EXTRA_DIST = README - -noinst_LIBRARIES = libcss.a -libcss_a_SOURCES = \ - apply.c \ - apply.h \ - css.c \ - css.h \ - parser.c \ - parser.h \ - property.c \ - property.h \ - scanner.c \ - scanner.h \ - stylesheet.c \ - stylesheet.h \ - value.c \ - value.h - diff --git a/src/document/dom/Makefile b/src/document/dom/Makefile new file mode 100644 index 00000000..9c17167e --- /dev/null +++ b/src/document/dom/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +OBJS = navigator.o node.o renderer.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/document/dom/Makefile.am b/src/document/dom/Makefile.am deleted file mode 100644 index ce6f91bf..00000000 --- a/src/document/dom/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.3 2004/09/29 22:38:51 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -# We don't want to expose this outside of /src/document/ at all, and we can't -# merge the whole library of these with libdocument.a. So we only compile -# objects here and link them directly to libdocument.a in ../Makefile.am. - -# However, we apparently need to create the library in order to convience -# automake to compile the objects :/. We DON'T use libcss.a ANYWHERE. - -noinst_LIBRARIES = libdom.a -libdom_a_SOURCES = \ - navigator.c \ - navigator.h \ - node.c \ - node.h \ - renderer.c \ - renderer.h diff --git a/src/document/html/Makefile b/src/document/html/Makefile new file mode 100644 index 00000000..234232f9 --- /dev/null +++ b/src/document/html/Makefile @@ -0,0 +1,11 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +SUBDIRS = parser + +OBJS = frames.o parser.o renderer.o tables.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/document/html/Makefile.am b/src/document/html/Makefile.am deleted file mode 100644 index 72562e29..00000000 --- a/src/document/html/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.18 2004/08/14 21:12:38 miciah Exp $ - -include $(top_srcdir)/Makefile.base - -# We don't want to expose this outside of /src/document/ at all, and we can't -# merge the whole library of these with libdocument.a. So we only compile -# objects here and link them directly to libdocument.a in ../Makefile.am. - -# However, we apparently need to create the library in order to convince -# automake to compile the objects :/. We DON'T use libhtml.a ANYWHERE. - -EXTRA_DIST = TODO - -SUBDIRS = parser - -noinst_LIBRARIES = libhtml.a -libhtml_a_SOURCES = \ - frames.c \ - frames.h \ - internal.h \ - parser.c \ - parser.h \ - renderer.c \ - renderer.h \ - tables.c \ - tables.h - diff --git a/src/document/html/parser/Makefile b/src/document/html/parser/Makefile new file mode 100644 index 00000000..8d434cae --- /dev/null +++ b/src/document/html/parser/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../../.. +include $(path_to_top)/Makefile.config + +OBJS = forms.o general.o link.o parse.o stack.o table.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/document/html/parser/Makefile.am b/src/document/html/parser/Makefile.am deleted file mode 100644 index fb3d7803..00000000 --- a/src/document/html/parser/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.7 2005/07/15 04:37:55 miciah Exp $ - -include $(top_srcdir)/Makefile.base - -# We don't want to expose this outside of /src/document/ at all, and we can't -# merge the whole library of these with libdocument.a. So we only compile -# objects here and link them directly to libdocument.a in ../Makefile.am. - -# However, we apparently need to create the library in order to convince -# automake to compile the objects :/. We DON'T use libhtmlp.a ANYWHERE. - -noinst_LIBRARIES = libhtmlp.a -libhtmlp_a_SOURCES = \ - forms.c \ - forms.h \ - general.c \ - general.h \ - link.c \ - link.h \ - parse.c \ - parse.h \ - stack.c \ - stack.h \ - table.c \ - table.h - diff --git a/src/document/plain/Makefile b/src/document/plain/Makefile new file mode 100644 index 00000000..d6af70cb --- /dev/null +++ b/src/document/plain/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +OBJS = renderer.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/document/plain/Makefile.am b/src/document/plain/Makefile.am deleted file mode 100644 index 5a030ef4..00000000 --- a/src/document/plain/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.1 2003/11/10 21:29:30 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -noinst_LIBRARIES = libplain_document.a -libplain_document_a_SOURCES = \ - renderer.c \ - renderer.h - diff --git a/src/document/sgml/Makefile b/src/document/sgml/Makefile new file mode 100644 index 00000000..98196e54 --- /dev/null +++ b/src/document/sgml/Makefile @@ -0,0 +1,11 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +SUBDIRS = html + +OBJS = sgml.o parser.o scanner.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/document/sgml/Makefile.am b/src/document/sgml/Makefile.am deleted file mode 100644 index ee3192b8..00000000 --- a/src/document/sgml/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.3 2004/09/29 22:38:52 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -# We don't want to expose this outside of /src/document/ at all, and we can't -# merge the whole library of these with libdocument.a. So we only compile -# objects here and link them directly to libdocument.a in ../Makefile.am. - -# However, we apparently need to create the library in order to convience -# automake to compile the objects :/. We DON'T use libcss.a ANYWHERE. - -SUBDIRS = html - -EXTRA_DIST = README - -noinst_LIBRARIES = libsgml.a -libsgml_a_SOURCES = \ - parser.c \ - parser.h \ - scanner.c \ - scanner.h \ - sgml.c \ - sgml.h diff --git a/src/document/sgml/html/Makefile b/src/document/sgml/html/Makefile new file mode 100644 index 00000000..e23e5fa6 --- /dev/null +++ b/src/document/sgml/html/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../../.. +include $(path_to_top)/Makefile.config + +OBJS = html.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/document/sgml/html/Makefile.am b/src/document/sgml/html/Makefile.am deleted file mode 100644 index e459c50f..00000000 --- a/src/document/sgml/html/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.2 2004/09/24 00:44:59 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -# We don't want to expose this outside of /src/document/ at all, and we can't -# merge the whole library of these with libdocument.a. So we only compile -# objects here and link them directly to libdocument.a in ../Makefile.am. - -# However, we apparently need to create the library in order to convience -# automake to compile the objects :/. We DON'T use libcss.a ANYWHERE. - -noinst_LIBRARIES = libhtml.a -libhtml_a_SOURCES = \ - attribute.inc \ - element.inc \ - html.c \ - html.h diff --git a/src/network/ssl/Makefile b/src/network/ssl/Makefile new file mode 100644 index 00000000..59b7851e --- /dev/null +++ b/src/network/ssl/Makefile @@ -0,0 +1,11 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS) + +OBJS = ssl.o socket.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/network/ssl/Makefile.am b/src/network/ssl/Makefile.am deleted file mode 100644 index 2f5a0125..00000000 --- a/src/network/ssl/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.7 2005/06/12 02:26:49 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -EXTRA_DIST = TODO - -INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS) - -noinst_LIBRARIES = libssl.a -libssl_a_SOURCES = \ - socket.c \ - socket.h \ - ssl.c \ - ssl.h - diff --git a/src/osdep/beos/Makefile b/src/osdep/beos/Makefile new file mode 100644 index 00000000..8cf8a150 --- /dev/null +++ b/src/osdep/beos/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +OBJS = beos.o overrides.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/osdep/beos/Makefile.am b/src/osdep/beos/Makefile.am deleted file mode 100644 index 17ab0d0a..00000000 --- a/src/osdep/beos/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.3 2004/08/14 21:12:40 miciah Exp $ - -include $(top_srcdir)/Makefile.base - -# We don't want to expose this outside of /src/osdep/ at all, and we can't -# merge the whole library of these with libosdep.a. So we only compile -# objects here and link them directly to libosdep.a in ../Makefile.am. - -# However, we apparently need to create the library in order to convince -# automake to compile the objects :/. We DON'T use libsystem.a ANYWHERE. - -noinst_LIBRARIES = libsystem.a -libsystem_a_SOURCES = \ - beos.c \ - beos.h \ - overrides.c \ - overrides.h \ - sysinfo.h diff --git a/src/osdep/os2/Makefile b/src/osdep/os2/Makefile new file mode 100644 index 00000000..41de0e7b --- /dev/null +++ b/src/osdep/os2/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +OBJS = os2.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/osdep/os2/Makefile.am b/src/osdep/os2/Makefile.am deleted file mode 100644 index dd784f29..00000000 --- a/src/osdep/os2/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.3 2004/08/14 21:12:41 miciah Exp $ - -include $(top_srcdir)/Makefile.base - -# We don't want to expose this outside of /src/osdep/ at all, and we can't -# merge the whole library of these with libosdep.a. So we only compile -# objects here and link them directly to libosdep.a in ../Makefile.am. - -# However, we apparently need to create the library in order to convince -# automake to compile the objects :/. We DON'T use libsystem.a ANYWHERE. - -noinst_LIBRARIES = libsystem.a -libsystem_a_SOURCES = \ - os2.c \ - os2.h \ - sysinfo.h diff --git a/src/osdep/riscos/Makefile b/src/osdep/riscos/Makefile new file mode 100644 index 00000000..c1406627 --- /dev/null +++ b/src/osdep/riscos/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +OBJS = riscos.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/osdep/riscos/Makefile.am b/src/osdep/riscos/Makefile.am deleted file mode 100644 index cd2e68f4..00000000 --- a/src/osdep/riscos/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.3 2004/08/14 21:12:43 miciah Exp $ - -include $(top_srcdir)/Makefile.base - -# We don't want to expose this outside of /src/osdep/ at all, and we can't -# merge the whole library of these with libosdep.a. So we only compile -# objects here and link them directly to libosdep.a in ../Makefile.am. - -# However, we apparently need to create the library in order to convince -# automake to compile the objects :/. We DON'T use libsystem.a ANYWHERE. - -noinst_LIBRARIES = libsystem.a -libsystem_a_SOURCES = \ - riscos.c \ - riscos.h \ - sysinfo.h diff --git a/src/osdep/unix/Makefile b/src/osdep/unix/Makefile new file mode 100644 index 00000000..133d1b5f --- /dev/null +++ b/src/osdep/unix/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +OBJS = unix.o bsd.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/osdep/unix/Makefile.am b/src/osdep/unix/Makefile.am deleted file mode 100644 index 3d69b452..00000000 --- a/src/osdep/unix/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.6 2005/07/20 15:41:33 witekfl Exp $ - -include $(top_srcdir)/Makefile.base - -# We don't want to expose this outside of /src/osdep/ at all, and we can't -# merge the whole library of these with libosdep.a. So we only compile -# objects here and link them directly to libosdep.a in ../Makefile.am. - -# However, we apparently need to create the library in order to convince -# automake to compile the objects :/. We DON'T use libsystem.a ANYWHERE. - -noinst_LIBRARIES = libsystem.a -libsystem_a_SOURCES = \ - bsd.c \ - sysinfo.h \ - unix.c \ - unix.h diff --git a/src/osdep/win32/Makefile b/src/osdep/win32/Makefile new file mode 100644 index 00000000..e2a8ea82 --- /dev/null +++ b/src/osdep/win32/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +OBJS = win32.o overrides.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/osdep/win32/Makefile.am b/src/osdep/win32/Makefile.am deleted file mode 100644 index 9f14524c..00000000 --- a/src/osdep/win32/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.5 2005/02/05 05:26:40 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -# We don't want to expose this outside of /src/osdep/ at all, and we can't -# merge the whole library of these with libosdep.a. So we only compile -# objects here and link them directly to libosdep.a in ../Makefile.am. - -# However, we apparently need to create the library in order to convince -# automake to compile the objects :/. We DON'T use libsystem.a ANYWHERE. - -noinst_LIBRARIES = libsystem.a -libsystem_a_SOURCES = \ - overrides.c \ - overrides.h \ - sysinfo.h \ - win32.c \ - win32.h diff --git a/src/protocol/auth/Makefile b/src/protocol/auth/Makefile new file mode 100644 index 00000000..8b495cb6 --- /dev/null +++ b/src/protocol/auth/Makefile @@ -0,0 +1,12 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +# Needed for the digest MD5 sum calculation. +INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS) + +OBJS = auth.o dialogs.o digest.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/protocol/auth/Makefile.am b/src/protocol/auth/Makefile.am deleted file mode 100644 index cda50827..00000000 --- a/src/protocol/auth/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.7 2005/01/13 15:55:57 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -# Needed for the digest MD5 sum calculation. -INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS) - -noinst_LIBRARIES = libauth.a -libauth_a_SOURCES = \ - auth.h \ - auth.c \ - dialogs.h \ - dialogs.c \ - digest.c \ - digest.h diff --git a/src/protocol/bittorrent/Makefile b/src/protocol/bittorrent/Makefile new file mode 100644 index 00000000..24153bed --- /dev/null +++ b/src/protocol/bittorrent/Makefile @@ -0,0 +1,11 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS) + +OBJS = bencoding.o bittorrent.o common.o connection.o dialogs.o peerconnect.o peerwire.o piececache.o tracker.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/protocol/bittorrent/Makefile.am b/src/protocol/bittorrent/Makefile.am deleted file mode 100644 index 48c2e746..00000000 --- a/src/protocol/bittorrent/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.3 2005/07/21 08:23:07 zas Exp $ - -include $(top_srcdir)/Makefile.base - -INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS) - -noinst_LIBRARIES = libbittorrent.a - -libbittorrent_a_SOURCES = \ - bencoding.c \ - bencoding.h \ - bittorrent.c \ - bittorrent.h \ - common.c \ - common.h \ - connection.c \ - connection.h \ - dialogs.c \ - dialogs.h \ - peerconnect.c \ - peerconnect.h \ - peerwire.c \ - peerwire.h \ - piececache.c \ - piececache.h \ - tracker.c \ - tracker.h diff --git a/src/protocol/finger/Makefile b/src/protocol/finger/Makefile new file mode 100644 index 00000000..3fdf33b1 --- /dev/null +++ b/src/protocol/finger/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +OBJS = finger.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/protocol/finger/Makefile.am b/src/protocol/finger/Makefile.am deleted file mode 100644 index e8655398..00000000 --- a/src/protocol/finger/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.1 2004/10/12 15:28:12 zas Exp $ - -include $(top_srcdir)/Makefile.base - -noinst_LIBRARIES = libfinger.a - -libfinger_a_SOURCES = \ - finger.c \ - finger.h diff --git a/src/protocol/ftp/Makefile b/src/protocol/ftp/Makefile new file mode 100644 index 00000000..a0ef4bd7 --- /dev/null +++ b/src/protocol/ftp/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +OBJS = ftp.o parse.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/protocol/ftp/Makefile.am b/src/protocol/ftp/Makefile.am deleted file mode 100644 index b649277e..00000000 --- a/src/protocol/ftp/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.3 2005/03/27 14:58:58 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -noinst_LIBRARIES = libftp.a -libftp_a_SOURCES = \ - ftp.c \ - ftp.h \ - parse.c \ - parse.h - diff --git a/src/protocol/gopher/Makefile b/src/protocol/gopher/Makefile new file mode 100644 index 00000000..74993cc8 --- /dev/null +++ b/src/protocol/gopher/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +OBJS = gopher.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/protocol/gopher/Makefile.am b/src/protocol/gopher/Makefile.am deleted file mode 100644 index 1547609d..00000000 --- a/src/protocol/gopher/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.1 2004/08/18 17:24:18 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -noinst_LIBRARIES = libgopher.a - -libgopher_a_SOURCES = \ - gopher.c \ - gopher.h diff --git a/src/protocol/http/Makefile b/src/protocol/http/Makefile new file mode 100644 index 00000000..c2a9d667 --- /dev/null +++ b/src/protocol/http/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +OBJS = blacklist.o codes.o http.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/protocol/http/Makefile.am b/src/protocol/http/Makefile.am deleted file mode 100644 index 49c12ef6..00000000 --- a/src/protocol/http/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.17 2004/07/12 11:31:17 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -EXTRA_DIST = README.timegm - -noinst_LIBRARIES = libhttp.a - -libhttp_a_SOURCES = \ - blacklist.c \ - blacklist.h \ - codes.c \ - codes.h \ - http.c \ - http.h diff --git a/src/protocol/nntp/Makefile b/src/protocol/nntp/Makefile new file mode 100644 index 00000000..7dbc37db --- /dev/null +++ b/src/protocol/nntp/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +OBJS = nntp.o connection.o response.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/protocol/nntp/Makefile.am b/src/protocol/nntp/Makefile.am deleted file mode 100644 index 5aaece2d..00000000 --- a/src/protocol/nntp/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.2 2005/04/21 02:36:41 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -noinst_LIBRARIES = libnntp.a - -libnntp_a_SOURCES = \ - codes.h \ - nntp.c \ - nntp.h \ - connection.c \ - connection.h \ - response.c \ - response.h diff --git a/src/protocol/rewrite/Makefile b/src/protocol/rewrite/Makefile new file mode 100644 index 00000000..4b984161 --- /dev/null +++ b/src/protocol/rewrite/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +OBJS = rewrite.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/protocol/rewrite/Makefile.am b/src/protocol/rewrite/Makefile.am deleted file mode 100644 index 1758bb16..00000000 --- a/src/protocol/rewrite/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.2 2003/12/08 23:00:10 pasky Exp $ - -include $(top_srcdir)/Makefile.base - -noinst_LIBRARIES = liburirewrite.a -liburirewrite_a_SOURCES = \ - rewrite.c \ - rewrite.h - diff --git a/src/protocol/smb/Makefile b/src/protocol/smb/Makefile new file mode 100644 index 00000000..12ce1ef5 --- /dev/null +++ b/src/protocol/smb/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +OBJS = smb.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/protocol/smb/Makefile.am b/src/protocol/smb/Makefile.am deleted file mode 100644 index 9fc4b7c2..00000000 --- a/src/protocol/smb/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.1 2003/12/07 16:45:17 pasky Exp $ - -include $(top_srcdir)/Makefile.base - -noinst_LIBRARIES = libsmb.a -libsmb_a_SOURCES = \ - smb.c \ - smb.h - diff --git a/src/scripting/guile/Makefile b/src/scripting/guile/Makefile new file mode 100644 index 00000000..a5f5cc67 --- /dev/null +++ b/src/scripting/guile/Makefile @@ -0,0 +1,11 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +INCLUDES += $(GUILE_CFLAGS) + +OBJS = guile.o hooks.o core.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/scripting/guile/Makefile.am b/src/scripting/guile/Makefile.am deleted file mode 100644 index f0aafda5..00000000 --- a/src/scripting/guile/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.5 2005/04/01 17:36:46 zas Exp $ - -include $(top_srcdir)/Makefile.base - -EXTRA_DIST = README - -INCLUDES += $(GUILE_CFLAGS) - -noinst_LIBRARIES = libscriptingguile.a -libscriptingguile_a_SOURCES = \ - core.c \ - core.h \ - hooks.c \ - hooks.h \ - guile.c \ - guile.h diff --git a/src/scripting/lua/Makefile b/src/scripting/lua/Makefile new file mode 100644 index 00000000..aae8b23d --- /dev/null +++ b/src/scripting/lua/Makefile @@ -0,0 +1,11 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +INCLUDES += $(LUA_CFLAGS) + +OBJS = lua.o hooks.o core.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/scripting/lua/Makefile.am b/src/scripting/lua/Makefile.am deleted file mode 100644 index daa2dbc4..00000000 --- a/src/scripting/lua/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.15 2005/04/01 09:41:37 zas Exp $ - -include $(top_srcdir)/Makefile.base - -EXTRA_DIST = TODO - -INCLUDES += $(LUA_CFLAGS) - -noinst_LIBRARIES = libscriptinglua.a -libscriptinglua_a_SOURCES = \ - core.c \ - core.h \ - hooks.c \ - hooks.h \ - lua.c \ - lua.h - diff --git a/src/scripting/perl/Makefile b/src/scripting/perl/Makefile new file mode 100644 index 00000000..d2549cde --- /dev/null +++ b/src/scripting/perl/Makefile @@ -0,0 +1,11 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +INCLUDES += $(PERL_CFLAGS) + +OBJS = perl.o hooks.o core.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/scripting/perl/Makefile.am b/src/scripting/perl/Makefile.am deleted file mode 100644 index 6099fe04..00000000 --- a/src/scripting/perl/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.4 2005/04/01 09:47:28 zas Exp $ - -include $(top_srcdir)/Makefile.base - -INCLUDES += $(PERL_CFLAGS) - -noinst_LIBRARIES = libscriptingperl.a -libscriptingperl_a_SOURCES = \ - core.c \ - core.h \ - hooks.c \ - hooks.h \ - perl.c \ - perl.h diff --git a/src/scripting/python/Makefile b/src/scripting/python/Makefile new file mode 100644 index 00000000..457b05ea --- /dev/null +++ b/src/scripting/python/Makefile @@ -0,0 +1,11 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +INCLUDES += $(PYTHON_CFLAGS) + +OBJS = python.o hooks.o core.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/scripting/python/Makefile.am b/src/scripting/python/Makefile.am deleted file mode 100644 index 372dd6a9..00000000 --- a/src/scripting/python/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.1 2005/06/02 18:01:34 witekfl Exp $ - -include $(top_srcdir)/Makefile.base - -INCLUDES += $(PYTHON_CFLAGS) - -noinst_LIBRARIES = libscriptingpython.a -libscriptingpython_a_SOURCES = \ - core.c \ - core.h \ - hooks.c \ - hooks.h \ - python.c \ - python.h diff --git a/src/scripting/ruby/Makefile b/src/scripting/ruby/Makefile new file mode 100644 index 00000000..a651deca --- /dev/null +++ b/src/scripting/ruby/Makefile @@ -0,0 +1,11 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +INCLUDES += $(RUBY_CFLAGS) + +OBJS = ruby.o hooks.o core.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/scripting/ruby/Makefile.am b/src/scripting/ruby/Makefile.am deleted file mode 100644 index e4abda6c..00000000 --- a/src/scripting/ruby/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.3 2005/04/01 17:20:59 zas Exp $ - -include $(top_srcdir)/Makefile.base - -INCLUDES += $(RUBY_CFLAGS) - -noinst_LIBRARIES = libscriptingruby.a -libscriptingruby_a_SOURCES = \ - core.c \ - core.h \ - hooks.c \ - hooks.h \ - ruby.c \ - ruby.h - diff --git a/src/viewer/dump/Makefile b/src/viewer/dump/Makefile new file mode 100644 index 00000000..b064418f --- /dev/null +++ b/src/viewer/dump/Makefile @@ -0,0 +1,9 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +OBJS = dump.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/viewer/dump/Makefile.am b/src/viewer/dump/Makefile.am deleted file mode 100644 index 6b62f5c7..00000000 --- a/src/viewer/dump/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.2 2003/01/01 17:48:46 pasky Exp $ - -include $(top_srcdir)/Makefile.base - -noinst_LIBRARIES = libviewer_dump.a -libviewer_dump_a_SOURCES = \ - dump.c \ - dump.h - From b395b92543a62a44d4b26cc4d0bdef625dadee8a Mon Sep 17 00:00:00 2001 From: Miciah Dashiel Butler Masters Date: Fri, 16 Sep 2005 02:17:33 +0000 Subject: [PATCH 24/52] Change 0.11.CVS to 0.11.GIT. --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 5b03a1f3..b2595ecf 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ AC_PREREQ(2.13) AC_INIT(src/main/main.c) AC_CONFIG_AUX_DIR(config) -AM_INIT_AUTOMAKE(elinks, 0.11.CVS) +AM_INIT_AUTOMAKE(elinks, 0.11.GIT) AM_CONFIG_HEADER(config.h) AC_PROG_MAKE_SET From 1fd3bff6f36c979e7f421663dc76cdad3354e3f5 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 04:20:14 +0200 Subject: [PATCH 25/52] Converted src/intl/gettext/Makefile to ELBuild --- configure.in | 1 - src/intl/gettext/Makefile | 76 ++++++++++++++++++++++++ src/intl/gettext/Makefile.am | 110 ----------------------------------- 3 files changed, 76 insertions(+), 111 deletions(-) create mode 100644 src/intl/gettext/Makefile delete mode 100644 src/intl/gettext/Makefile.am diff --git a/configure.in b/configure.in index 5d8adf16..49be5d90 100644 --- a/configure.in +++ b/configure.in @@ -1276,7 +1276,6 @@ AC_OUTPUT([ \ src/document/Makefile \ src/encoding/Makefile \ src/intl/Makefile \ - src/intl/gettext/Makefile \ src/intl/gettext/ref-add.sed \ src/intl/gettext/ref-del.sed \ src/main/Makefile \ diff --git a/src/intl/gettext/Makefile b/src/intl/gettext/Makefile new file mode 100644 index 00000000..3b4cff40 --- /dev/null +++ b/src/intl/gettext/Makefile @@ -0,0 +1,76 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +localedir = $(datadir)/locale +builddir = $(top_builddir)/src/intl/gettext + +OBJS = \ + bindtextdom.o \ + dcgettext.o \ + dcigettext.o \ + dcngettext.o \ + dgettext.o \ + dngettext.o \ + explodename.o \ + finddomain.o \ + gettext.o \ + intl-compat.o \ + l10nflist.o \ + libintl.o \ + loadmsgcat.o \ + localcharset.o \ + localealias.o \ + ngettext.o \ + plural.o \ + textdomain.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + + +$(builddir)/charset.alias: $(srcdir)/config.charset + $(SHELL) $(srcdir)/config.charset '@host@' > $@.new + +# FIXME: Building plural.c from plural.y on the fly doesn't work + +YACC = $(INTLBISON) -y -d +YFLAGS = --name-prefix=gettext__ +plural.c: plural.y +.SUFFIXES: .y .c +.y.c: + $(YACC) $(YFLAGS) --output $@ $< + rm -f $*.h + +install-l: $(builddir)/charset.alias all + @if test '@USE_INCLUDED_LIBINTL@' = yes; then \ + temp=$(DESTDIR)$(libdir)/t-charset.alias; \ + dest=$(DESTDIR)$(libdir)/charset.alias; \ + if test -f $(DESTDIR)$(libdir)/charset.alias; then \ + orig=$(DESTDIR)$(libdir)/charset.alias; \ + sed -f ref-add.sed $$orig > $$temp; \ + $(INSTALL_DATA) $$temp $$dest; \ + rm -f $$temp; \ + else \ + if test @GLIBC21@ = no; then \ + $(mkinstalldirs) $(DESTDIR)$(libdir); \ + orig=charset.alias; \ + sed -f ref-add.sed $$orig > $$temp; \ + $(INSTALL_DATA) $$temp $$dest; \ + rm -f $$temp; \ + fi; \ + fi; \ + $(mkinstalldirs) $(DESTDIR)$(localedir); \ + test -f $(DESTDIR)$(localedir)/locale.alias \ + && orig=$(DESTDIR)$(localedir)/locale.alias \ + || orig=$(srcdir)/locale.alias; \ + temp=$(DESTDIR)$(localedir)/t-locale.alias; \ + dest=$(DESTDIR)$(localedir)/locale.alias; \ + sed -f ref-add.sed $$orig > $$temp; \ + $(INSTALL_DATA) $$temp $$dest; \ + rm -f $$temp; \ + else \ + : ; \ + fi + mv $@.new $@ + +include $(path_to_top)/Makefile.lib diff --git a/src/intl/gettext/Makefile.am b/src/intl/gettext/Makefile.am deleted file mode 100644 index 5128a036..00000000 --- a/src/intl/gettext/Makefile.am +++ /dev/null @@ -1,110 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v - -include $(top_srcdir)/Makefile.base - -EXTRA_DIST = TODO VERSION config.charset locale.alias plural.y -DISTCLEANFILES = charset.alias - -localedir = $(datadir)/locale -builddir = $(top_builddir)/src/intl/gettext - -noinst_LIBRARIES = libintl.a -libintl_a_SOURCES = \ - bindtextdom.c \ - dcgettext.c \ - dcigettext.c \ - dcngettext.c \ - dgettext.c \ - dngettext.c \ - explodename.c \ - finddomain.c \ - gettext.c \ - gettext.h \ - gettextP.h \ - hash-string.h \ - intl-compat.c \ - l10nflist.c \ - libgettext.h \ - libgnuintl.h \ - libintl.c \ - libintl.h \ - loadinfo.h \ - loadmsgcat.c \ - localcharset.c \ - localealias.c \ - ngettext.c \ - plural.c \ - textdomain.c - -$(builddir)/charset.alias: $(srcdir)/config.charset - $(SHELL) $(srcdir)/config.charset '@host@' > $@.new - mv $@.new $@ - -# FIXME: Building plural.c from plural.y on the fly doesn't work - -YACC = @INTLBISON@ -y -d -YFLAGS = --name-prefix=gettext__ -plural.c: plural.y -.y.c: - $(YACC) $(YFLAGS) --output $@ $< - rm -f $*.h - -install-data-local: $(builddir)/charset.alias all - @if test '@USE_INCLUDED_LIBINTL@' = yes; then \ - temp=$(DESTDIR)$(libdir)/t-charset.alias; \ - dest=$(DESTDIR)$(libdir)/charset.alias; \ - if test -f $(DESTDIR)$(libdir)/charset.alias; then \ - orig=$(DESTDIR)$(libdir)/charset.alias; \ - sed -f ref-add.sed $$orig > $$temp; \ - $(INSTALL_DATA) $$temp $$dest; \ - rm -f $$temp; \ - else \ - if test @GLIBC21@ = no; then \ - $(mkinstalldirs) $(DESTDIR)$(libdir); \ - orig=charset.alias; \ - sed -f ref-add.sed $$orig > $$temp; \ - $(INSTALL_DATA) $$temp $$dest; \ - rm -f $$temp; \ - fi; \ - fi; \ - $(mkinstalldirs) $(DESTDIR)$(localedir); \ - test -f $(DESTDIR)$(localedir)/locale.alias \ - && orig=$(DESTDIR)$(localedir)/locale.alias \ - || orig=$(srcdir)/locale.alias; \ - temp=$(DESTDIR)$(localedir)/t-locale.alias; \ - dest=$(DESTDIR)$(localedir)/locale.alias; \ - sed -f ref-add.sed $$orig > $$temp; \ - $(INSTALL_DATA) $$temp $$dest; \ - rm -f $$temp; \ - else \ - : ; \ - fi - -uninstall-local: - @if test '@USE_INCLUDED_LIBINTL@' = yes; then \ - if test -f $(DESTDIR)$(libdir)/charset.alias; then \ - temp=$(DESTDIR)$(libdir)/t-charset.alias; \ - dest=$(DESTDIR)$(libdir)/charset.alias; \ - sed -f ref-del.sed $$dest > $$temp; \ - if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ - rm -f $$dest; \ - else \ - $(INSTALL_DATA) $$temp $$dest; \ - fi; \ - rm -f $$temp; \ - fi; \ - if test -f $(DESTDIR)$(localedir)/locale.alias; then \ - temp=$(DESTDIR)$(localedir)/t-locale.alias; \ - dest=$(DESTDIR)$(localedir)/locale.alias; \ - sed -f ref-del.sed $$dest > $$temp; \ - if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ - rm -f $$dest; \ - else \ - $(INSTALL_DATA) $$temp $$dest; \ - fi; \ - rm -f $$temp; \ - fi; \ - else \ - : ; \ - fi From 0f15183aed043c1d82bb7a632732ade8ebcea96c Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 04:24:01 +0200 Subject: [PATCH 26/52] Added support for conditional rules in ELBuild (not used yet) --- Makefile.config.in | 67 +++++++++++++++++++++++++++++++++++++++++----- configure.in | 59 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 7 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index 22503200..85049bc8 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -43,13 +43,6 @@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CONFDIR = @CONFDIR@ -CONFIG_ASCIIDOC = @CONFIG_ASCIIDOC@ -CONFIG_JW = @CONFIG_JW@ -CONFIG_NLS = @CONFIG_NLS@ -CONFIG_POD2HTML = @CONFIG_POD2HTML@ -CONFIG_RUBY = @CONFIG_RUBY@ -CONFIG_XMLTO = @CONFIG_XMLTO@ -CONFIG_NLS = @CONFIG_NLS@ DATADIRNAME = @DATADIRNAME@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ @@ -96,6 +89,66 @@ XMLTO = @XMLTO@ X_CFLAGS = @X_CFLAGS@ XGETTEXT = @XGETTEXT@ +# :r !grep AC_SUBST\(CONFIG_ configure.in | sed 's/.*(\(.*\))$/\1 = @\1@/' | sort | uniq +CONFIG_256_COLORS = @CONFIG_256_COLORS@ +CONFIG_ASCIIDOC = @CONFIG_ASCIIDOC@ +CONFIG_BACKTRACE = @CONFIG_BACKTRACE@ +CONFIG_BEOS = @CONFIG_BEOS@ +CONFIG_BITTORRENT = @CONFIG_BITTORRENT@ +CONFIG_BOOKMARKS = @CONFIG_BOOKMARKS@ +CONFIG_BZIP2 = @CONFIG_BZIP2@ +CONFIG_CGI = @CONFIG_CGI@ +CONFIG_COOKIES = @CONFIG_COOKIES@ +CONFIG_CSS = @CONFIG_CSS@ +CONFIG_DATA = @CONFIG_DATA@ +CONFIG_DEBUG = @CONFIG_DEBUG@ +CONFIG_DOM = @CONFIG_DOM@ +CONFIG_ECMASCRIPT = @CONFIG_ECMASCRIPT@ +CONFIG_EXMODE = @CONFIG_EXMODE@ +CONFIG_FASTMEM = @CONFIG_FASTMEM@ +CONFIG_FINGER = @CONFIG_FINGER@ +CONFIG_FORMHIST = @CONFIG_FORMHIST@ +CONFIG_FTP = @CONFIG_FTP@ +CONFIG_GLOBHIST = @CONFIG_GLOBHIST@ +CONFIG_GNUTLS = @CONFIG_GNUTLS@ +CONFIG_GOPHER = @CONFIG_GOPHER@ +CONFIG_GUILE = @CONFIG_GUILE@ +CONFIG_GZIP = @CONFIG_GZIP@ +CONFIG_HTML_HIGHLIGHT = @CONFIG_HTML_HIGHLIGHT@ +CONFIG_INTERLINK = @CONFIG_INTERLINK@ +CONFIG_IPV6 = @CONFIG_IPV6@ +CONFIG_JW = @CONFIG_JW@ +CONFIG_LEDS = @CONFIG_LEDS@ +CONFIG_LUA = @CONFIG_LUA@ +CONFIG_MAILCAP = @CONFIG_MAILCAP@ +CONFIG_MARKS = @CONFIG_MARKS@ +CONFIG_MD5 = @CONFIG_MD5@ +CONFIG_MIMETYPES = @CONFIG_MIMETYPES@ +CONFIG_MOUSE = @CONFIG_MOUSE@ +CONFIG_NNTP = @CONFIG_NNTP@ +CONFIG_NO_ROOT_EXEC = @CONFIG_NO_ROOT_EXEC@ +CONFIG_OPENSSL = @CONFIG_OPENSSL@ +CONFIG_OS2 = @CONFIG_OS2@ +CONFIG_OWN_LIBC = @CONFIG_OWN_LIBC@ +CONFIG_PERL = @CONFIG_PERL@ +CONFIG_POD2HTML = @CONFIG_POD2HTML@ +CONFIG_PYTHON = @CONFIG_PYTHON@ +CONFIG_RISCOS = @CONFIG_RISCOS@ +CONFIG_RUBY = @CONFIG_RUBY@ +CONFIG_SCANNER = @CONFIG_SCANNER@ +CONFIG_SCRIPTING = @CONFIG_SCRIPTING@ +CONFIG_SHA1 = @CONFIG_SHA1@ +CONFIG_SMALL = @CONFIG_SMALL@ +CONFIG_SMB = @CONFIG_SMB@ +CONFIG_SPIDERMONKEY = @CONFIG_SPIDERMONKEY@ +CONFIG_SSL = @CONFIG_SSL@ +CONFIG_SYSMOUSE = @CONFIG_SYSMOUSE@ +CONFIG_UNIX = @CONFIG_UNIX@ +CONFIG_URI_REWRITE = @CONFIG_URI_REWRITE@ +CONFIG_WIN32 = @CONFIG_WIN32@ +CONFIG_XBEL_BOOKMARKS = @CONFIG_XBEL_BOOKMARKS@ +CONFIG_XMLTO = @CONFIG_XMLTO@ + DEFS = @DEFS@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ diff --git a/configure.in b/configure.in index 49be5d90..2b460ea7 100644 --- a/configure.in +++ b/configure.in @@ -79,9 +79,13 @@ if test "$CONFIG_ASCIIDOC" = yes && EL_CONFIG_DEPENDS(CONFIG_MANUAL, [MAN_ASCIIDOC MAN_XMLTO], [Man Page Formats]) fi +AC_SUBST(CONFIG_ASCIIDOC) AM_CONDITIONAL(CONFIG_ASCIIDOC, test "$CONFIG_ASCIIDOC" = yes) +AC_SUBST(CONFIG_POD2HTML) AM_CONDITIONAL(CONFIG_POD2HTML, test "$CONFIG_POD2HTML" = yes) +AC_SUBST(CONFIG_XMLTO) AM_CONDITIONAL(CONFIG_XMLTO, test "$CONFIG_XMLTO" = yes) +AC_SUBST(CONFIG_JW) AM_CONDITIONAL(CONFIG_JW, test "$CONFIG_JW" = yes) dnl gcc specific options (to be continued at the bottom of configure) @@ -115,15 +119,19 @@ kill me! ]) EL_CHECK_COMPILER_MACROS(CONFIG_BEOS, [BEOS], [__BEOS__]) +AC_SUBST(CONFIG_BEOS) AM_CONDITIONAL(CONFIG_BEOS, test "$CONFIG_BEOS" = yes) EL_CHECK_COMPILER_MACROS(CONFIG_RISCOS, [RISCOS], [__riscos__]) +AC_SUBST(CONFIG_RISCOS) AM_CONDITIONAL(CONFIG_RISCOS, test "$CONFIG_RISCOS" = yes) EL_CHECK_COMPILER_MACROS(CONFIG_WIN32, [WIN32], [_WIN32 __WIN32__]) +AC_SUBST(CONFIG_WIN32) AM_CONDITIONAL(CONFIG_WIN32, test "$CONFIG_WIN32" = yes) EL_CHECK_COMPILER_MACROS(CONFIG_OS2, [EMX], [__EMX__]) +AC_SUBST(CONFIG_OS2) AM_CONDITIONAL(CONFIG_OS2, test "$CONFIG_OS2" = yes) test "$CONFIG_OS2" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zexe//g"` @@ -138,6 +146,7 @@ else CONFIG_UNIX=no fi AC_MSG_RESULT($CONFIG_UNIX) +AC_SUBST(CONFIG_UNIX) AM_CONDITIONAL(CONFIG_UNIX, test "$CONFIG_UNIX" = yes) dnl =================================================================== @@ -173,6 +182,7 @@ AC_CHECK_HEADERS(sys/un.h, [CONFIG_INTERLINK=yes EL_CONFIG([CONFIG_INTERLINK], [interlinking])], [CONFIG_INTERLINK=no]) +AC_SUBST(CONFIG_INTERLINK) AM_CONDITIONAL(CONFIG_INTERLINK, test "$CONFIG_INTERLINK" = yes) dnl =================================================================== @@ -406,10 +416,12 @@ EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_GPM, gpm, gpm.h, gpm, Gpm_Open, EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_GZIP, zlib, zlib.h, z, gzdopen, [ --without-zlib disable zlib support]) +AC_SUBST(CONFIG_GZIP) AM_CONDITIONAL(CONFIG_GZIP, test "$CONFIG_GZIP" = yes) EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_BZIP2, bzlib, bzlib.h, bz2, BZ2_bzReadOpen, [ --without-bzlib disable bzlib support]) +AC_SUBST(CONFIG_BZIP2) AM_CONDITIONAL(CONFIG_BZIP2, test "$CONFIG_BZIP2" = yes) EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_IDN, idn, idna.h, idn, stringprep_check_version, @@ -423,6 +435,7 @@ EL_SAVE_FLAGS EL_ARG_ENABLE(CONFIG_BOOKMARKS, bookmarks, [Bookmarks], [ --disable-bookmarks disable bookmark support]) +AC_SUBST(CONFIG_BOOKMARKS) AM_CONDITIONAL(CONFIG_BOOKMARKS, test "$CONFIG_BOOKMARKS" = yes) # Check whether --enable-xbel or --disable-xbel was given. @@ -442,6 +455,7 @@ EL_ARG_DEPEND(CONFIG_XBEL_BOOKMARKS, xbel, [CONFIG_BOOKMARKS:yes HAVE_LIBEXPAT:y [XBEL bookmarks], [ --disable-xbel disable XBEL bookmark support (requires expat)]) +AC_SUBST(CONFIG_XBEL_BOOKMARKS) AM_CONDITIONAL(CONFIG_XBEL_BOOKMARKS, test "$CONFIG_XBEL_BOOKMARKS" = yes) if test "$CONFIG_XBEL_BOOKMARKS" != yes; then @@ -706,11 +720,17 @@ dnl Setup global scripting dnl =================================================================== EL_CONFIG_DEPENDS(CONFIG_SCRIPTING, [CONFIG_GUILE CONFIG_LUA CONFIG_PERL CONFIG_PYTHON CONFIG_RUBY], [Scripting]) +AC_SUBST(CONFIG_GUILE) AM_CONDITIONAL(CONFIG_GUILE, test "$CONFIG_GUILE" = yes) +AC_SUBST(CONFIG_LUA) AM_CONDITIONAL(CONFIG_LUA, test "$CONFIG_LUA" = yes) +AC_SUBST(CONFIG_PERL) AM_CONDITIONAL(CONFIG_PERL, test "$CONFIG_PERL" = yes) +AC_SUBST(CONFIG_PYTHON) AM_CONDITIONAL(CONFIG_PYTHON, test "$CONFIG_PYTHON" = yes) +AC_SUBST(CONFIG_RUBY) AM_CONDITIONAL(CONFIG_RUBY, test "$CONFIG_RUBY" = yes) +AC_SUBST(CONFIG_SCRIPTING) AM_CONDITIONAL(CONFIG_SCRIPTING, test "$CONFIG_SCRIPTING" = yes) @@ -766,9 +786,11 @@ else AC_SUBST(SPIDERMONKEY_CFLAGS) fi +AC_SUBST(CONFIG_SPIDERMONKEY) AM_CONDITIONAL(CONFIG_SPIDERMONKEY, test "$CONFIG_SPIDERMONKEY" = yes) EL_CONFIG_DEPENDS(CONFIG_ECMASCRIPT, [CONFIG_SPIDERMONKEY], [ECMAScript (JavaScript)]) +AC_SUBST(CONFIG_ECMASCRIPT) AM_CONDITIONAL(CONFIG_ECMASCRIPT, test "$CONFIG_ECMASCRIPT" = yes) @@ -922,8 +944,11 @@ AC_MSG_RESULT($cf_result) dnl Final SSL setup EL_CONFIG_DEPENDS(CONFIG_SSL, [CONFIG_OPENSSL CONFIG_GNUTLS], [SSL]) +AC_SUBST(CONFIG_OPENSSL) AM_CONDITIONAL(CONFIG_OPENSSL, test "$CONFIG_OPENSSL" = yes) +AC_SUBST(CONFIG_GNUTLS) AM_CONDITIONAL(CONFIG_GNUTLS, test "$CONFIG_GNUTLS" = yes) +AC_SUBST(CONFIG_SSL) AM_CONDITIONAL(CONFIG_SSL, test "$CONFIG_SSL" = yes) #endif @@ -1002,23 +1027,28 @@ dnl =================================================================== EL_ARG_ENABLE(CONFIG_COOKIES, cookies, [Cookies], [ --disable-cookies disable cookie support]) +AC_SUBST(CONFIG_COOKIES) AM_CONDITIONAL(CONFIG_COOKIES, test "$CONFIG_COOKIES" = yes) EL_ARG_ENABLE(CONFIG_FORMHIST, formhist, [Form history], [ --disable-formhist disable form history support]) +AC_SUBST(CONFIG_FORMHIST) AM_CONDITIONAL(CONFIG_FORMHIST, test "$CONFIG_FORMHIST" = yes) EL_ARG_ENABLE(CONFIG_GLOBHIST, globhist, [Global history], [ --disable-globhist disable global history support]) +AC_SUBST(CONFIG_GLOBHIST) AM_CONDITIONAL(CONFIG_GLOBHIST, test "$CONFIG_GLOBHIST" = yes) EL_ARG_ENABLE(CONFIG_MAILCAP, mailcap, [Mailcap], [ --disable-mailcap disable mailcap support]) +AC_SUBST(CONFIG_MAILCAP) AM_CONDITIONAL(CONFIG_MAILCAP, test "$CONFIG_MAILCAP" = yes) EL_ARG_ENABLE(CONFIG_MIMETYPES, mimetypes, [Mimetypes files], [ --disable-mimetypes disable mimetypes files support]) +AC_SUBST(CONFIG_MIMETYPES) AM_CONDITIONAL(CONFIG_MIMETYPES, test "$CONFIG_MIMETYPES" = yes) @@ -1026,47 +1056,58 @@ EL_ARG_DEPEND(CONFIG_IPV6, ipv6, [HAVE_SA_STORAGE:yes HAVE_SA_IN6:yes HAVE_ADDRINFO:yes HAVE_GETADDRINFO:yes], [IPv6], [ --disable-ipv6 disable IPv6 support]) +AC_SUBST(CONFIG_IPV6) AM_CONDITIONAL(CONFIG_IPV6, test "$CONFIG_IPV6" = yes) EL_ARG_ENABLE(CONFIG_BITTORRENT, bittorrent, [BitTorrent protocol], [ --enable-bittorrent enable BitTorrent protocol support]) +AC_SUBST(CONFIG_BITTORRENT) AM_CONDITIONAL(CONFIG_BITTORRENT, test "$CONFIG_BITTORRENT" = yes) EL_ARG_ENABLE(CONFIG_DATA, data, [Data protocol], [ --disable-data disable data protocol support]) +AC_SUBST(CONFIG_DATA) AM_CONDITIONAL(CONFIG_DATA, test "$CONFIG_DATA" = yes) EL_ARG_ENABLE(CONFIG_URI_REWRITE, uri-rewrite, [URI rewriting], [ --disable-uri-rewrite disable URI rewrite support]) +AC_SUBST(CONFIG_URI_REWRITE) AM_CONDITIONAL(CONFIG_URI_REWRITE, test "$CONFIG_URI_REWRITE" = yes) EL_ARG_DEPEND(CONFIG_CGI, cgi, [HAVE_SETENV_OR_PUTENV:yes], [Local CGI], [ --enable-cgi enable local CGI support]) +AC_SUBST(CONFIG_CGI) AM_CONDITIONAL(CONFIG_CGI, test "$CONFIG_CGI" = yes) EL_ARG_ENABLE(CONFIG_FINGER, finger, [Finger protocol], [ --enable-finger enable finger protocol support]) +AC_SUBST(CONFIG_FINGER) AM_CONDITIONAL(CONFIG_FINGER, test "$CONFIG_FINGER" = yes) EL_ARG_ENABLE(CONFIG_FTP, ftp, [FTP protocol], [ --disable-ftp disable ftp protocol support]) +AC_SUBST(CONFIG_FTP) AM_CONDITIONAL(CONFIG_FTP, test "$CONFIG_FTP" = yes) EL_ARG_ENABLE(CONFIG_GOPHER, gopher, [Gopher protocol], [ --enable-gopher enable gopher protocol support]) +AC_SUBST(CONFIG_GOPHER) AM_CONDITIONAL(CONFIG_GOPHER, test "$CONFIG_GOPHER" = yes) EL_ARG_ENABLE(CONFIG_NNTP, nntp, [NNTP protocol], [ --enable-nntp enable nntp protocol support]) +AC_SUBST(CONFIG_NNTP) AM_CONDITIONAL(CONFIG_NNTP, test "$CONFIG_NNTP" = yes) EL_ARG_DEPEND(CONFIG_SMB, smb, [HAVE_SMBCLIENT:yes], [SMB protocol], [ --disable-smb disable SMB protocol support (requires smbclient)]) +AC_SUBST(CONFIG_SMB) AM_CONDITIONAL(CONFIG_SMB, test "$CONFIG_SMB" = yes) EL_ARG_ENABLE(CONFIG_MOUSE, mouse, [Mouse handling], [ --disable-mouse disable mouse support]) +AC_SUBST(CONFIG_MOUSE) AM_CONDITIONAL(CONFIG_MOUSE, test "$CONFIG_MOUSE" = yes) # GPM mouse is Linux specific, so ... @@ -1075,66 +1116,81 @@ EL_ARG_DEPEND(CONFIG_SYSMOUSE, sysmouse, [CONFIG_MOUSE:yes CONFIG_GPM:no HAVE_SYSMOUSE_HEADER:yes], [BSD sysmouse], [ --disable-sysmouse disable BSD sysmouse support]) +AC_SUBST(CONFIG_SYSMOUSE) AM_CONDITIONAL(CONFIG_SYSMOUSE, test "$CONFIG_SYSMOUSE" = yes) EL_ARG_ENABLE(CONFIG_88_COLORS, 88-colors, [88 colors], [ --enable-88-colors enable 88 color support]) +AC_SUBST(CONFIG_256_COLORS) AM_CONDITIONAL(CONFIG_256_COLORS, test "$CONFIG_256_COLORS" = yes) EL_ARG_ENABLE(CONFIG_256_COLORS, 256-colors, [256 colors], [ --enable-256-colors enable 256 color support]) +AC_SUBST(CONFIG_256_COLORS) AM_CONDITIONAL(CONFIG_256_COLORS, test "$CONFIG_256_COLORS" = yes) EL_ARG_ENABLE(CONFIG_EXMODE, exmode, [Exmode interface], [ --enable-exmode enable exmode (CLI) interface]) +AC_SUBST(CONFIG_EXMODE) AM_CONDITIONAL(CONFIG_EXMODE, test "$CONFIG_EXMODE" = yes) EL_ARG_ENABLE(CONFIG_LEDS, leds, [LEDs], [ --disable-leds disable LEDs support]) +AC_SUBST(CONFIG_LEDS) AM_CONDITIONAL(CONFIG_LEDS, test "$CONFIG_LEDS" = yes) EL_ARG_ENABLE(CONFIG_MARKS, marks, [Marks], [ --disable-marks disable document marks support]) +AC_SUBST(CONFIG_MARKS) AM_CONDITIONAL(CONFIG_MARKS, test "$CONFIG_MARKS" = yes) EL_ARG_ENABLE(CONFIG_CSS, css, [Cascading Style Sheets], [ --disable-css disable Cascading Style Sheet support]) +AC_SUBST(CONFIG_CSS) AM_CONDITIONAL(CONFIG_CSS, test "$CONFIG_CSS" = yes) EL_ARG_DEPEND(CONFIG_HTML_HIGHLIGHT, html-highlight, [CONFIG_CSS:yes], [HTML highlighting], [ --enable-html-highlight HTML highlighting using DOM engine]) +AC_SUBST(CONFIG_HTML_HIGHLIGHT) AM_CONDITIONAL(CONFIG_HTML_HIGHLIGHT, test "$CONFIG_HTML_HIGHLIGHT" = yes) dnl Everything in the tree already uses CONFIG_DOM dnl so resolve CONFIG_HTML_HIGHLIGHT to CONFIG_DOM EL_CONFIG_DEPENDS(CONFIG_DOM, [CONFIG_HTML_HIGHLIGHT], [DOM engine]) +AC_SUBST(CONFIG_DOM) AM_CONDITIONAL(CONFIG_DOM, test "$CONFIG_DOM" = yes) EL_ARG_DEPEND(CONFIG_BACKTRACE, backtrace, [HAVE_EXECINFO:yes], [Backtrace], [ --disable-backtrace disable backtrace support]) +AC_SUBST(CONFIG_BACKTRACE) AM_CONDITIONAL(CONFIG_BACKTRACE, test "$CONFIG_BACKTRACE" = yes) EL_ARG_DEPEND(CONFIG_NO_ROOT_EXEC, no-root, [HAVE_GETUID:yes HAVE_GETEUID:yes], [No root exec], [ --enable-no-root enable prevention of usage by root]) +AC_SUBST(CONFIG_NO_ROOT_EXEC) AM_CONDITIONAL(CONFIG_NO_ROOT_EXEC, test "$CONFIG_NO_ROOT_EXEC" = yes) EL_ARG_ENABLE(CONFIG_DEBUG, debug, [Debug mode], [ --enable-debug enable leak debug and internal error checking]) +AC_SUBST(CONFIG_DEBUG) AM_CONDITIONAL(CONFIG_DEBUG, test "$CONFIG_DEBUG" = yes) EL_ARG_DEPEND(CONFIG_FASTMEM, fastmem, [CONFIG_DEBUG:no], [Fast mode], [ --enable-fastmem enable direct use of system allocation functions, not usable with --enable-debug]) +AC_SUBST(CONFIG_FASTMEM) AM_CONDITIONAL(CONFIG_FASTMEM, test "$CONFIG_FASTMEM" = yes) EL_ARG_ENABLE(CONFIG_OWN_LIBC, own-libc, [Own libc stubs], [ --enable-own-libc force use of internal functions instead of those of system libc]) +AC_SUBST(CONFIG_OWN_LIBC) AM_CONDITIONAL(CONFIG_OWN_LIBC, test "$CONFIG_OWN_LIBC" = yes) EL_ARG_ENABLE(CONFIG_SMALL, small, [Small binary], [ --enable-small reduce binary size as far as possible (but see the bottom of doc/small.txt!)]) +AC_SUBST(CONFIG_SMALL) AM_CONDITIONAL(CONFIG_SMALL, test "$CONFIG_SMALL" = yes) if test "$CONFIG_OPENSSL" != yes && @@ -1146,6 +1202,7 @@ then EL_CONFIG(CONFIG_MD5, [Built-in MD5]) fi +AC_SUBST(CONFIG_MD5) AM_CONDITIONAL(CONFIG_MD5, test "$CONFIG_MD5" = yes) if test "$CONFIG_BITTORRENT" = yes; then @@ -1158,12 +1215,14 @@ if test "$CONFIG_BITTORRENT" = yes; then fi fi +AC_SUBST(CONFIG_SHA1) AM_CONDITIONAL(CONFIG_SHA1, test "$CONFIG_SHA1" = yes) if test "$CONFIG_CSS" = yes || test "$CONFIG_DOM" = yes; then EL_CONFIG(CONFIG_SCANNER, [Built-in scanner]) fi +AC_SUBST(CONFIG_SCANNER) AM_CONDITIONAL(CONFIG_SCANNER, test "$CONFIG_SCANNER" = yes) AC_ARG_ENABLE(weehoofooboomookerchoo, From 13ce7f6f81598e0e9e5b461388997e39c26f2647 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 04:38:48 +0200 Subject: [PATCH 27/52] Converted doc/ to ELBuild --- doc/{Makefile.am => Makefile} | 37 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 25 deletions(-) rename doc/{Makefile.am => Makefile} (87%) diff --git a/doc/Makefile.am b/doc/Makefile similarity index 87% rename from doc/Makefile.am rename to doc/Makefile index 554819bb..bf360b40 100644 --- a/doc/Makefile.am +++ b/doc/Makefile @@ -1,5 +1,5 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.75 2005/08/09 17:44:23 jonas Exp $ +path_to_top=.. +include $(path_to_top)/Makefile.config SUBDIRS = man @@ -41,21 +41,6 @@ MANUAL_FILES = \ terminals.txt \ urlshortcuts.txt -EXTRA_DIST = \ - README \ - $(MANUAL_FILES) \ - color-model.txt \ - events.txt \ - feedback.txt \ - get-cvs-docs \ - hacking.txt \ - dev-intro.txt \ - index.txt \ - perl.pod \ - tools/help2doc \ - tools/make-elinks-manpage \ - tools/make-elinkskeys-manpage - ### Script Dependencies # @@ -71,7 +56,7 @@ IMPORT_FEATURES_CONF = $(top_srcdir)/doc/tools/import-features.conf MAKE_ELINKS_MANPAGE = $(top_srcdir)/doc/tools/make-elinks-manpage MAKE_ELINKSKEYS_MANPAGE = $(top_srcdir)/doc/tools/make-elinkskeys-manpage -if CONFIG_ASCIIDOC +ifeq ($(CONFIG_ASCIIDOC),yes) HTML_DOCS_WITH_ASCIIDOC = \ $(HTML_DIR)/elinks.1.html \ $(HTML_DIR)/elinkskeys.5.html \ @@ -81,22 +66,22 @@ endif # Only jw is used for generating PDF. -if CONFIG_XMLTO +ifeq ($(CONFIG_XMLTO),yes) HTML_DOCS_WITH_XMLTO = \ $(HTML_DIR)/manual.html-chunked MAN_DOCS_WITH_XMLTO = \ $(MAN_DIR)/man1/elinks.1.in \ $(MAN_DIR)/man5/elinkskeys.5 - endif + # Only jw is used for generating PDF. -if CONFIG_JW +ifeq ($(CONFIG_JW),yes) PDF_DOCS_WITH_JW = \ $(PDF_DIR)/manual.pdf endif -if CONFIG_POD2HTML +ifeq ($(CONFIG_POD2HTML),yes) HTML_DOCS_WITH_POD2HTML = \ $(HTML_DIR)/perl.html \ $(HTML_DIR)/perl-hooks.html @@ -131,9 +116,9 @@ man-xmlto-no: pdf-jw-yes: doc-dirs $(PDF_DOCS_WITH_JW) pdf-jw-no: -man-docs: man-xmlto-@CONFIG_XMLTO@ $(MAN_DOCS_WITH_SHELL) -html-docs: html-asciidoc-@CONFIG_ASCIIDOC@ html-xmlto-@CONFIG_XMLTO@ html-pod2html-@CONFIG_POD2HTML@ -pdf-docs: pdf-jw-@CONFIG_JW@ +man-docs: man-xmlto-$(CONFIG_XMLTO) $(MAN_DOCS_WITH_SHELL) +html-docs: html-asciidoc-$(CONFIG_ASCIIDOC) html-xmlto-$(CONFIG_XMLTO) html-pod2html-$(CONFIG_POD2HTML) +pdf-docs: pdf-jw-$(CONFIG_JW) all-docs: man-docs html-docs pdf-docs @@ -212,3 +197,5 @@ $(HTML_DIR)/perl.html: $(top_srcdir)/doc/perl.pod doc-dirs $(HTML_DIR)/perl-hooks.html: $(top_srcdir)/contrib/perl/hooks.pl doc-dirs $(POD2HTML) --outfile=$@ < $< + +include $(path_to_top)/Makefile.lib From aec63f5c884811c2cce4836f91d6c4644c1123c1 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 04:53:54 +0200 Subject: [PATCH 28/52] Converted cookies building to ELBuilds --- src/cookies/Makefile | 12 ++++++++++++ src/cookies/Makefile.am | 24 ------------------------ 2 files changed, 12 insertions(+), 24 deletions(-) create mode 100644 src/cookies/Makefile delete mode 100644 src/cookies/Makefile.am diff --git a/src/cookies/Makefile b/src/cookies/Makefile new file mode 100644 index 00000000..63e04810 --- /dev/null +++ b/src/cookies/Makefile @@ -0,0 +1,12 @@ +path_to_top=../.. +include $(path_to_top)/Makefile.config + +OBJS = cookies.o dialogs.o parser.o + +all-l: libcookies.a +libcookies.a: $(OBJS) + +parsetst: parser.o parsetst.o + $(call cmd,link) -L../util/libutil.a + +include $(path_to_top)/Makefile.lib diff --git a/src/cookies/Makefile.am b/src/cookies/Makefile.am deleted file mode 100644 index b3ed53e8..00000000 --- a/src/cookies/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.13 2004/01/03 01:11:57 pasky Exp $ - -include $(top_srcdir)/Makefile.base - -noinst_LIBRARIES = libcookies.a -libcookies_a_SOURCES = \ - cookies.c \ - cookies.h \ - dialogs.c \ - dialogs.h \ - parser.c \ - parser.h - -TESTS = parsetst - -EXTRA_PROGRAMS = parsetst - -parsetst_SOURCES = \ - parser.h \ - parser.c \ - parsetst.c -parsetst_DEPENDENCIES = testutils -parsetst_LDADD = $(top_builddir)/src/util/libutil.a From 76f1eb70df74dcd2746130e5079bf0a880a0dcea Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 05:01:31 +0200 Subject: [PATCH 29/52] ELBuildized protocol/ - no more 2M Makefiles! --- src/protocol/{Makefile.am => Makefile} | 49 +++++++++----------------- src/protocol/file/Makefile | 13 +++++++ src/protocol/file/Makefile.am | 18 ---------- 3 files changed, 30 insertions(+), 50 deletions(-) rename src/protocol/{Makefile.am => Makefile} (67%) create mode 100644 src/protocol/file/Makefile delete mode 100644 src/protocol/file/Makefile.am diff --git a/src/protocol/Makefile.am b/src/protocol/Makefile similarity index 67% rename from src/protocol/Makefile.am rename to src/protocol/Makefile index cf1c499b..40402120 100644 --- a/src/protocol/Makefile.am +++ b/src/protocol/Makefile @@ -1,15 +1,13 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.48 2005/07/11 10:59:04 jonas Exp $ - -include $(top_srcdir)/Makefile.base +path_to_top=../.. +include $(path_to_top)/Makefile.config authobj = auth/auth.o auth/dialogs.o auth/digest.o -if CONFIG_CGI +ifeq ($(CONFIG_CGI),yes) cgiobj = file/cgi.o endif -if CONFIG_BITTORRENT +ifeq ($(CONFIG_BITTORRENT),yes) bittorrentdir = bittorrent bittorrentobj = \ $(bittorrentdir)/bencoding.o \ @@ -23,40 +21,40 @@ bittorrentobj = \ $(bittorrentdir)/tracker.o endif -if CONFIG_DATA +ifeq ($(CONFIG_DATA),yes) dataobj = data.o endif fileobj = file/file.o -if CONFIG_FINGER +ifeq ($(CONFIG_FINGER),yes) fingerdir = finger fingerobj = $(fingerdir)/finger.o endif -if CONFIG_FTP +ifeq ($(CONFIG_FTP),yes) ftpdir = ftp ftpobj = $(ftpdir)/ftp.o $(ftpdir)/parse.o endif -if CONFIG_GOPHER +ifeq ($(CONFIG_GOPHER),yes) gopherdir = gopher gopherobj = $(gopherdir)/gopher.o endif httpobj = http/blacklist.o http/codes.o http/http.o -if CONFIG_NNTP +ifeq ($(CONFIG_NNTP),yes) nntpdir = nntp nntpobj = $(nntpdir)/connection.o $(nntpdir)/nntp.o $(nntpdir)/response.o endif -if CONFIG_SMB +ifeq ($(CONFIG_SMB),yes) smbdir = smb smbobj = $(smbdir)/smb.o endif -if CONFIG_URI_REWRITE +ifeq ($(CONFIG_URI_REWRITE),yes) rewritedir = rewrite rewriteobj = $(rewritedir)/rewrite.o endif @@ -73,10 +71,7 @@ SUBDIRS = \ $(rewritedir) \ $(smbdir) -noinst_LIBRARIES = libprotocol.a - -EXTRA_libprotocol_a_SOURCES = data.c data.h -libprotocol_a_LIBADD = \ +SUB_OBJS = \ $(authobj) \ $(bittorrentobj) \ $(dataobj) \ @@ -89,19 +84,9 @@ libprotocol_a_LIBADD = \ $(nntpobj) \ $(rewriteobj) \ $(smbobj) +OBJS = about.o date.o header.o protocol.o proxy.o uri.o user.o $(SUB_OBJS) -libprotocol_a_SOURCES = \ - about.c \ - about.h \ - date.c \ - date.h \ - header.c \ - header.h \ - protocol.c \ - protocol.h \ - proxy.c \ - proxy.h \ - uri.c \ - uri.h \ - user.c \ - user.h +all-l: libprotocol.a +libprotocol.a: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/protocol/file/Makefile b/src/protocol/file/Makefile new file mode 100644 index 00000000..49be1506 --- /dev/null +++ b/src/protocol/file/Makefile @@ -0,0 +1,13 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +ifeq ($(CONFIG_CGI),yes) +cgiobj = cgi.o +endif + +OBJS = file.o $(cgiobj) + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/protocol/file/Makefile.am b/src/protocol/file/Makefile.am deleted file mode 100644 index dc5d748e..00000000 --- a/src/protocol/file/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.3 2004/05/21 12:03:52 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -if CONFIG_CGI -cgiobj = cgi.o -endif - -noinst_LIBRARIES = libfile.a - -EXTRA_libfile_a_SOURCES = cgi.c cgi.h -libfile_a_LIBADD = $(cgiobj) - -libfile_a_SOURCES = \ - file.c \ - file.h - From 4e2d48cc932e3d5796e1aa9115852a957170278a Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 05:09:08 +0200 Subject: [PATCH 30/52] ELBuildize some more stuff. All for tonight, turn for the Americans. --- src/bfu/Makefile | 29 ++++++++++++++++ src/bfu/Makefile.am | 47 -------------------------- src/bookmarks/Makefile | 16 +++++++++ src/bookmarks/Makefile.am | 23 ------------- src/bookmarks/backend/Makefile | 13 +++++++ src/bookmarks/backend/Makefile.am | 26 -------------- src/dialogs/Makefile | 13 +++++++ src/dialogs/Makefile.am | 31 ----------------- src/document/{Makefile.am => Makefile} | 33 ++++++------------ 9 files changed, 81 insertions(+), 150 deletions(-) create mode 100644 src/bfu/Makefile delete mode 100644 src/bfu/Makefile.am create mode 100644 src/bookmarks/Makefile delete mode 100644 src/bookmarks/Makefile.am create mode 100644 src/bookmarks/backend/Makefile delete mode 100644 src/bookmarks/backend/Makefile.am create mode 100644 src/dialogs/Makefile delete mode 100644 src/dialogs/Makefile.am rename src/document/{Makefile.am => Makefile} (61%) diff --git a/src/bfu/Makefile b/src/bfu/Makefile new file mode 100644 index 00000000..f7569e4b --- /dev/null +++ b/src/bfu/Makefile @@ -0,0 +1,29 @@ +path_to_top=../.. +include $(path_to_top)/Makefile.config + +ifeq ($(CONFIG_LEDS),yes) +ledsobj = leds.o +endif + +OBJS = \ + button.o \ + checkbox.o \ + dialog.o \ + group.o \ + hierbox.o \ + hotkey.o \ + inpfield.o \ + inphist.o \ + $(ledsobj) \ + listbox.o \ + listmenu.o \ + menu.o \ + msgbox.o \ + style.o \ + text.o \ + widget.o + +all-l: libbfu.a +libbfu.a: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/bfu/Makefile.am b/src/bfu/Makefile.am deleted file mode 100644 index 13d801b6..00000000 --- a/src/bfu/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.27 2004/11/19 15:33:07 zas Exp $ - -include $(top_srcdir)/Makefile.base - -if CONFIG_LEDS -ledsobj = leds.o -endif - -noinst_LIBRARIES = libbfu.a - -EXTRA_libbfu_a_SOURCES = leds.c leds.h -libbfu_a_LIBADD = $(ledsobj) - -libbfu_a_SOURCES = \ - button.c \ - button.h \ - checkbox.c \ - checkbox.h \ - common.h \ - dialog.c \ - dialog.h \ - group.c \ - group.h \ - hierbox.c \ - hierbox.h \ - hotkey.c \ - hotkey.h \ - inpfield.c \ - inpfield.h \ - inphist.c \ - inphist.h \ - listbox.c \ - listbox.h \ - listmenu.c \ - listmenu.h \ - menu.c \ - menu.h \ - msgbox.c \ - msgbox.h \ - style.c \ - style.h \ - text.c \ - text.h \ - widget.c \ - widget.h - diff --git a/src/bookmarks/Makefile b/src/bookmarks/Makefile new file mode 100644 index 00000000..e82723ee --- /dev/null +++ b/src/bookmarks/Makefile @@ -0,0 +1,16 @@ +path_to_top=../.. +include $(path_to_top)/Makefile.config + +SUBDIRS = backend + +ifeq ($(CONFIG_XBEL_BOOKMARKS),yes) +xbelobj = xbel.o +endif + +BACK_OBJS = common.o default.o $(xbelobj) +OBJS = bookmarks.o dialogs.o $(foreach obj,$(BACK_OBJS),backend/$(obj)) + +all-l: libbookmarks.a +libbookmarks.a: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am deleted file mode 100644 index 19f91137..00000000 --- a/src/bookmarks/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.12 2004/05/02 12:59:42 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -if CONFIG_XBEL_BOOKMARKS -xbelobj = backend/xbel.o -endif - -SUBDIRS = backend - -noinst_LIBRARIES = libbookmarks.a - -libbookmarks_a_LIBADD = \ - backend/common.o \ - backend/default.o \ - $(xbelobj) - -libbookmarks_a_SOURCES = \ - bookmarks.c \ - bookmarks.h \ - dialogs.c \ - dialogs.h diff --git a/src/bookmarks/backend/Makefile b/src/bookmarks/backend/Makefile new file mode 100644 index 00000000..9556734c --- /dev/null +++ b/src/bookmarks/backend/Makefile @@ -0,0 +1,13 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +ifeq ($(CONFIG_XBEL_BOOKMARKS),yes) +xbelobj = xbel.o +endif + +OBJS = common.o default.o $(xbelobj) + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/bookmarks/backend/Makefile.am b/src/bookmarks/backend/Makefile.am deleted file mode 100644 index 20e25ea9..00000000 --- a/src/bookmarks/backend/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.4 2004/08/14 21:12:36 miciah Exp $ - -include $(top_srcdir)/Makefile.base - -# We don't want to expose this outside of /src/bookmarks/ at all, and we can't -# merge the whole library of these with libbookmarks.a. So we only compile -# objects here and link them directly to libbookmarks.a in ../Makefile.am. - -# However, we apparently need to create the library in order to convince -# automake to compile the objects :/. We DON'T use libbackend.a ANYWHERE. - -if CONFIG_XBEL_BOOKMARKS -xbelobj = xbel.o -endif - -noinst_LIBRARIES = libbackend.a - -EXTRA_libbackend_a_SOURCES = xbel.c xbel.h -libbackend_a_LIBADD = $(xbelobj) - -libbackend_a_SOURCES = \ - common.c \ - common.h \ - default.c \ - default.h diff --git a/src/dialogs/Makefile b/src/dialogs/Makefile new file mode 100644 index 00000000..05110a32 --- /dev/null +++ b/src/dialogs/Makefile @@ -0,0 +1,13 @@ +path_to_top=../.. +include $(path_to_top)/Makefile.config + +ifeq ($(CONFIG_EXMODE),yes) +exmodeobj = exmode.o +endif + +OBJS = document.o download.o edit.o $(exmodeobj) info.o menu.o options.o progress.o status.o + +all-l: libdialogs.a +libdialogs.a: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/dialogs/Makefile.am b/src/dialogs/Makefile.am deleted file mode 100644 index eeb85704..00000000 --- a/src/dialogs/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.26 2005/04/18 17:00:25 zas Exp $ - -include $(top_srcdir)/Makefile.base - -if CONFIG_EXMODE -exmodeobj = exmode.o -endif - -noinst_LIBRARIES = libdialogs.a - -EXTRA_libdialogs_a_SOURCES = exmode.c exmode.h -libdialogs_a_LIBADD = $(exmodeobj) - -libdialogs_a_SOURCES = \ - document.c \ - document.h \ - download.c \ - download.h \ - edit.c \ - edit.h \ - info.c \ - info.h \ - menu.c \ - menu.h \ - options.c \ - options.h \ - progress.c \ - progress.h \ - status.c \ - status.h diff --git a/src/document/Makefile.am b/src/document/Makefile similarity index 61% rename from src/document/Makefile.am rename to src/document/Makefile index c2661d0f..0cd58f1d 100644 --- a/src/document/Makefile.am +++ b/src/document/Makefile @@ -1,9 +1,7 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.49 2005/07/15 04:37:55 miciah Exp $ +path_to_top=../.. +include $(path_to_top)/Makefile.config -include $(top_srcdir)/Makefile.base - -if CONFIG_CSS +ifeq ($(CONFIG_CSS),yes) cssdir = css cssobj = \ css/apply.o \ @@ -15,7 +13,7 @@ cssobj = \ css/value.o endif -if CONFIG_DOM +ifeq ($(CONFIG_DOM),yes) domdir = dom domobj = \ $(domdir)/navigator.o \ @@ -32,9 +30,7 @@ endif SUBDIRS = $(cssdir) $(domdir) html plain $(sgmldir) -noinst_LIBRARIES = libdocument.a - -libdocument_a_LIBADD = \ +SUB_OBJS = \ $(cssobj) \ $(domobj) \ html/parser/forms.o \ @@ -50,18 +46,9 @@ libdocument_a_LIBADD = \ plain/renderer.o \ $(sgmlobj) -libdocument_a_SOURCES = \ - docdata.c \ - docdata.h \ - document.c \ - document.h \ - forms.c \ - forms.h \ - options.c \ - options.h \ - refresh.c \ - refresh.h \ - renderer.c \ - renderer.h \ - view.h +OBJS = docdata.o document.o forms.o options.o refresh.o renderer.o $(SUB_OBJS) +all-l: libdocument.a +libdocument.a: $(OBJS) + +include $(path_to_top)/Makefile.lib From 402a15c94e075da29b37a2a19aedfbf10e009f5f Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 05:12:49 +0200 Subject: [PATCH 31/52] Update the autogeneration list. --- configure.in | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/configure.in b/configure.in index 18d7f958..db602af5 100644 --- a/configure.in +++ b/configure.in @@ -1325,15 +1325,7 @@ AC_OUTPUT([ \ contrib/elinks.spec \ contrib/lua/hooks.lua \ contrib/conv/w3m2links.awk \ - doc/Makefile \ src/Makefile \ - src/bfu/Makefile \ - src/bookmarks/Makefile \ - src/bookmarks/backend/Makefile \ - src/cookies/Makefile \ - src/dialogs/Makefile \ - src/document/Makefile \ - src/encoding/Makefile \ src/intl/Makefile \ src/intl/gettext/ref-add.sed \ src/intl/gettext/ref-del.sed \ @@ -1342,8 +1334,6 @@ AC_OUTPUT([ \ src/mime/backend/Makefile \ src/network/Makefile \ src/osdep/Makefile \ - src/protocol/Makefile \ - src/protocol/file/Makefile \ src/scripting/Makefile \ src/terminal/Makefile \ src/util/Makefile \ From 72e2d55c1a4c14cf4bf011c80edcd1608f6a9be0 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 12:05:51 +0200 Subject: [PATCH 32/52] Convert src/encoding to ELbuild. --- src/encoding/Makefile | 17 +++++++++++++++++ src/encoding/Makefile.am | 27 --------------------------- 2 files changed, 17 insertions(+), 27 deletions(-) create mode 100644 src/encoding/Makefile delete mode 100644 src/encoding/Makefile.am diff --git a/src/encoding/Makefile b/src/encoding/Makefile new file mode 100644 index 00000000..ad43882c --- /dev/null +++ b/src/encoding/Makefile @@ -0,0 +1,17 @@ +path_to_top=../.. +include $(path_to_top)/Makefile.config + +ifeq ($(CONFIG_BZIP2),yes) +bzip2obj = bzip2.o +endif + +ifeq ($(CONFIG_GZIP),yes) +gzipobj = gzip.o +endif + +OBJS = encoding.o bzip2.o gzip.o + +all-l: libencoding.o +libencoding.a: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/encoding/Makefile.am b/src/encoding/Makefile.am deleted file mode 100644 index 91a5c371..00000000 --- a/src/encoding/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.2 2004/05/28 11:55:26 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -if CONFIG_BZIP2 -bzip2obj = bzip2.o -endif - -if CONFIG_GZIP -gzipobj = gzip.o -endif - -noinst_LIBRARIES = libencoding.a - -EXTRA_libencoding_a_SOURCES = \ - bzip2.c \ - bzip2.h \ - gzip.c \ - gzip.h - -libencoding_a_LIBADD = $(bzip2obj) $(gzipobj) - -libencoding_a_SOURCES = \ - encoding.c \ - encoding.h - From 4130c42bc96d2ba5dc8dde49ba86cd20334b04f0 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 12:12:07 +0200 Subject: [PATCH 33/52] Typo fix --- src/encoding/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/encoding/Makefile b/src/encoding/Makefile index ad43882c..8ce50014 100644 --- a/src/encoding/Makefile +++ b/src/encoding/Makefile @@ -11,7 +11,7 @@ endif OBJS = encoding.o bzip2.o gzip.o -all-l: libencoding.o +all-l: libencoding.a libencoding.a: $(OBJS) include $(path_to_top)/Makefile.lib From cf0c9fce4ede5d58be31026aea4d8a1f3bb8d961 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:13:22 +0200 Subject: [PATCH 34/52] Switch the root Makefile to ELBuild. Woohoo! --- src/{Makefile.am => Makefile} | 45 +++++++++++++++-------------------- 1 file changed, 19 insertions(+), 26 deletions(-) rename src/{Makefile.am => Makefile} (75%) diff --git a/src/Makefile.am b/src/Makefile similarity index 75% rename from src/Makefile.am rename to src/Makefile index 2bcad25a..131ab1b4 100644 --- a/src/Makefile.am +++ b/src/Makefile @@ -1,36 +1,32 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.87 2005/06/14 12:25:19 jonas Exp $ +path_to_top=.. +include $(path_to_top)/Makefile.config -include $(top_srcdir)/Makefile.base - -EXTRA_DIST = README - -if CONFIG_BOOKMARKS +ifeq ($(CONFIG_BOOKMARKS),yes) bookmarksdir = bookmarks bookmarkslib = $(bookmarksdir)/libbookmarks.a endif -if CONFIG_COOKIES +ifeq ($(CONFIG_COOKIES),yes) cookiesdir = cookies cookieslib = $(cookiesdir)/libcookies.a endif -if CONFIG_FORMHIST +ifeq ($(CONFIG_FORMHIST),yes) formhistdir = formhist formhistlib = $(formhistdir)/libformhist.a endif -if CONFIG_GLOBHIST +ifeq ($(CONFIG_GLOBHIST),yes) globhistdir = globhist globhistlib = $(globhistdir)/libglobhist.a endif -if CONFIG_ECMASCRIPT +ifeq ($(CONFIG_ECMASCRIPT),yes) ecmascriptdir = ecmascript ecmascriptlib = $(ecmascriptdir)/libecmascript.a endif -if CONFIG_SCRIPTING +ifeq ($(CONFIG_SCRIPTING),yes) scriptingdir = scripting scriptinglib = $(scriptingdir)/libscripting.a endif @@ -59,23 +55,12 @@ SUBDIRS = \ util \ viewer -bin_PROGRAMS = elinks -elinks_SOURCES = \ - elinks.h \ - setup.h \ - vernum.c \ - vernum.h - -vernum.o: FORCE - -FORCE: - # Order of this is purely magic and random, so that ld doesn't fail for some # strange reason. Try to swap randomly when ld will start to complain about # mysteriously unresolved symbols. -elinks_DEPENDENCIES = \ +ELINKSLIBS = \ main/libmain.a \ - @INTLLIBS@ \ + $(INTLLIBS) \ $(cookieslib) \ viewer/libviewer.a \ cache/libcache.a \ @@ -98,4 +83,12 @@ elinks_DEPENDENCIES = \ encoding/libencoding.a \ util/libutil.a -elinks_LDADD = $(elinks_DEPENDENCIES) +OBJS = vernum.o +vernum.o: FORCE +FORCE: + +all-l: elinks +elinks: $(OBJS) $(ELINKSLIBS) + $(call cmd,link) + +include $(path_to_top)/Makefile.lib From c404ead42c5e25d5d756cb150b4bdb5474609752 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:13:43 +0200 Subject: [PATCH 35/52] Pass $LIBS to the linker --- Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.lib b/Makefile.lib index 281959cf..ce6f9da5 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -28,7 +28,7 @@ quiet_cmd_archive = '[AR] $@' cmd_archive = $(AR) r $@ $^ quiet_cmd_link = '[LINK] $@' - cmd_link = $(CC) $(LDFLAGS) -o $@ $^ + cmd_link = $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) # Recursive make quiet_cmd_recmake = "[MAKE $$target] $$subdir" From 568fe503f9b0b0116749b751046044c3e072125d Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:15:09 +0200 Subject: [PATCH 36/52] Don't autogenerate src/Makefile. --- configure.in | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.in b/configure.in index db602af5..32e97207 100644 --- a/configure.in +++ b/configure.in @@ -1325,7 +1325,6 @@ AC_OUTPUT([ \ contrib/elinks.spec \ contrib/lua/hooks.lua \ contrib/conv/w3m2links.awk \ - src/Makefile \ src/intl/Makefile \ src/intl/gettext/ref-add.sed \ src/intl/gettext/ref-del.sed \ From 98dd1a4fef565ac145eb973cf79add689d2b1b84 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:23:05 +0200 Subject: [PATCH 37/52] Converted main, network and terminal to ELBuild. --- configure.in | 4 ---- src/main/Makefile | 13 +++++++++++++ src/main/Makefile.am | 32 ------------------------------- src/network/Makefile | 16 ++++++++++++++++ src/network/Makefile.am | 28 --------------------------- src/terminal/Makefile | 23 ++++++++++++++++++++++ src/terminal/Makefile.am | 41 ---------------------------------------- 7 files changed, 52 insertions(+), 105 deletions(-) create mode 100644 src/main/Makefile delete mode 100644 src/main/Makefile.am create mode 100644 src/network/Makefile delete mode 100644 src/network/Makefile.am create mode 100644 src/terminal/Makefile delete mode 100644 src/terminal/Makefile.am diff --git a/configure.in b/configure.in index 32e97207..ae1182f0 100644 --- a/configure.in +++ b/configure.in @@ -1328,13 +1328,9 @@ AC_OUTPUT([ \ src/intl/Makefile \ src/intl/gettext/ref-add.sed \ src/intl/gettext/ref-del.sed \ - src/main/Makefile \ src/mime/Makefile \ src/mime/backend/Makefile \ - src/network/Makefile \ - src/osdep/Makefile \ src/scripting/Makefile \ - src/terminal/Makefile \ src/util/Makefile \ src/viewer/Makefile \ src/viewer/text/Makefile diff --git a/src/main/Makefile b/src/main/Makefile new file mode 100644 index 00000000..d62a8279 --- /dev/null +++ b/src/main/Makefile @@ -0,0 +1,13 @@ +path_to_top=../.. +include $(path_to_top)/Makefile.config + +ifeq ($(CONFIG_INTERLINK),yes) +interlinkobj = interlink.o +endif + +OBJS = event.o $(interlinkobj) main.o module.o select.o timer.o version.o + +all-l: libmain.a +libmain.a: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/main/Makefile.am b/src/main/Makefile.am deleted file mode 100644 index 11f35af1..00000000 --- a/src/main/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.27 2005/08/17 15:26:22 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -if CONFIG_INTERLINK -interlinkobj = interlink.o -endif - -EXTRA_libmain_a_SOURCES = \ - interlink.c \ - interlink.h - -libmain_a_LIBADD = \ - $(interlinkobj) - -noinst_LIBRARIES = libmain.a -libmain_a_SOURCES = \ - event.c \ - event.h \ - main.c \ - main.h \ - module.c \ - module.h \ - object.h \ - select.c \ - select.h \ - timer.c \ - timer.h \ - version.c \ - version.h - diff --git a/src/network/Makefile b/src/network/Makefile new file mode 100644 index 00000000..ceb21704 --- /dev/null +++ b/src/network/Makefile @@ -0,0 +1,16 @@ +path_to_top=../.. +include $(path_to_top)/Makefile.config + +ifeq ($(CONFIG_SSL),yes) +ssldir = ssl +sslobj = $(ssldir)/ssl.o $(ssldir)/socket.o +endif + +SUBDIRS = $(ssldir) + +OBJS = connection.o dns.o progress.o socket.o state.o $(sslobj) + +all-l: libnetwork.a +libnetwork.a: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/network/Makefile.am b/src/network/Makefile.am deleted file mode 100644 index 23c5fdbe..00000000 --- a/src/network/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.10 2005/06/13 00:52:14 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -if CONFIG_SSL -ssldir = ssl -sslobj = $(ssldir)/ssl.o $(ssldir)/socket.o -endif - -SUBDIRS = $(ssldir) - -libnetwork_a_LIBADD = \ - $(sslobj) - -noinst_LIBRARIES = libnetwork.a -libnetwork_a_SOURCES = \ - connection.c \ - connection.h \ - dns.c \ - dns.h \ - progress.c \ - progress.h \ - socket.c \ - socket.h \ - state.c \ - state.h - diff --git a/src/terminal/Makefile b/src/terminal/Makefile new file mode 100644 index 00000000..7b4a3193 --- /dev/null +++ b/src/terminal/Makefile @@ -0,0 +1,23 @@ +path_to_top=../.. +include $(path_to_top)/Makefile.config + +ifeq ($(CONFIG_MOUSE),yes) +mouseobj = mouse.o +endif + +OBJS = \ + color.o \ + draw.o \ + event.o \ + hardio.o \ + kbd.o \ + $(mouseobj) \ + screen.o \ + tab.o \ + terminal.o \ + window.o + +all-l: libterminal.a +libterminal.a: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/terminal/Makefile.am b/src/terminal/Makefile.am deleted file mode 100644 index 6d78dafd..00000000 --- a/src/terminal/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.16 2005/09/14 12:50:15 zas Exp $ - -include $(top_srcdir)/Makefile.base - -if CONFIG_MOUSE -mouseobj = mouse.o -endif - -EXTRA_DIST = TODO - -noinst_LIBRARIES = libterminal.a - -EXTRA_libterminal_a_SOURCES = \ - mouse.c -libterminal_a_LIBADD = \ - $(mouseobj) - -libterminal_a_SOURCES = \ - color.c \ - color.h \ - draw.c \ - draw.h \ - event.c \ - event.h \ - hardio.c \ - hardio.h \ - itrm.h \ - kbd.c \ - kbd.h \ - key.inc \ - mouse.h \ - palette.inc \ - screen.c \ - screen.h \ - tab.c \ - tab.h \ - terminal.c \ - terminal.h \ - window.c \ - window.h From 83212cee45d0d795423f81a5c1325b9ffb40d691 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:25:24 +0200 Subject: [PATCH 38/52] ELBuildized osdep. --- src/osdep/Makefile | 48 +++++++++++++++++++++++++++++++++ src/osdep/Makefile.am | 62 ------------------------------------------- 2 files changed, 48 insertions(+), 62 deletions(-) create mode 100644 src/osdep/Makefile delete mode 100644 src/osdep/Makefile.am diff --git a/src/osdep/Makefile b/src/osdep/Makefile new file mode 100644 index 00000000..f9464681 --- /dev/null +++ b/src/osdep/Makefile @@ -0,0 +1,48 @@ +path_to_top=../.. +include $(path_to_top)/Makefile.config +INCLUDES += $(X_CFLAGS) + +ifeq ($(CONFIG_BEOS),yes) +beosdir = beos +beosobj = $(beosdir)/beos.o $(beosdir)/overrides.o +endif + +ifeq ($(CONFIG_OS2),yes) +os2dir = os2 +os2obj = $(os2dir)/os2.o +endif + +ifeq ($(CONFIG_RISCOS),yes) +riscosdir = riscos +riscosobj = $(riscosdir)/riscos.o +endif + +ifeq ($(CONFIG_UNIX),yes) +unixdir = unix +unixobj = $(unixdir)/bsd.o $(unixdir)/unix.o +endif + +ifeq ($(CONFIG_WIN32),yes) +win32dir = win32 +win32obj = $(win32dir)/win32.o $(win32dir)/overrides.o +endif + +SUBDIRS = $(beosdir) $(os2dir) $(riscosdir) $(unixdir) $(win32dir) + +OBJS = \ + getifaddrs.o \ + newwin.o \ + osdep.o \ + signals.o \ + stub.o \ + sysname.o \ + $(beosobj) \ + $(os2obj) \ + $(riscosobj) \ + $(unixobj) \ + $(win32obj) + +all-l: libosdep.a +libosdep.a: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/osdep/Makefile.am b/src/osdep/Makefile.am deleted file mode 100644 index f0342ebc..00000000 --- a/src/osdep/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.35 2005/07/20 15:41:33 witekfl Exp $ - -include $(top_srcdir)/Makefile.base - -if CONFIG_BEOS -beosdir = beos -beosobj = $(beosdir)/beos.o $(beosdir)/overrides.o -endif - -if CONFIG_OS2 -os2dir = os2 -os2obj = $(os2dir)/os2.o -endif - -if CONFIG_RISCOS -riscosdir = riscos -riscosobj = $(riscosdir)/riscos.o -endif - -if CONFIG_UNIX -unixdir = unix -unixobj = $(unixdir)/bsd.o $(unixdir)/unix.o -endif - -if CONFIG_WIN32 -win32dir = win32 -win32obj = $(win32dir)/win32.o $(win32dir)/overrides.o -endif - -INCLUDES += $(X_CFLAGS) - -SUBDIRS = $(beosdir) $(os2dir) $(riscosdir) $(unixdir) $(win32dir) - -noinst_LIBRARIES = libosdep.a - -libosdep_a_LIBADD = \ - $(beosobj) \ - $(os2obj) \ - $(riscosobj) \ - $(unixobj) \ - $(win32obj) - -libosdep_a_SOURCES = \ - ascii.h \ - generic.h \ - getifaddrs.c \ - getifaddrs.h \ - newwin.c \ - newwin.h \ - osdep.c \ - osdep.h \ - signals.h \ - signals.c \ - stat.h \ - stub.c \ - stub.h \ - sysname.c \ - sysname.h \ - system.h \ - types.h - From 18f85bec1488842d3b18ce4918da84afdd380cf0 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:27:27 +0200 Subject: [PATCH 39/52] ELBuildized util/. --- configure.in | 1 - src/util/Makefile | 52 ++++++++++++++++++++++++++++ src/util/Makefile.am | 82 -------------------------------------------- 3 files changed, 52 insertions(+), 83 deletions(-) create mode 100644 src/util/Makefile delete mode 100644 src/util/Makefile.am diff --git a/configure.in b/configure.in index ae1182f0..224abe15 100644 --- a/configure.in +++ b/configure.in @@ -1331,7 +1331,6 @@ AC_OUTPUT([ \ src/mime/Makefile \ src/mime/backend/Makefile \ src/scripting/Makefile \ - src/util/Makefile \ src/viewer/Makefile \ src/viewer/text/Makefile ]) diff --git a/src/util/Makefile b/src/util/Makefile new file mode 100644 index 00000000..fe6c3b67 --- /dev/null +++ b/src/util/Makefile @@ -0,0 +1,52 @@ +path_to_top=../.. +include $(path_to_top)/Makefile.config + +ifeq ($(CONFIG_DEBUG),yes) +debugobj = memdebug.o +endif + +ifeq ($(CONFIG_MD5),yes) +md5obj = md5.o +endif + +ifeq ($(CONFIG_SCANNER),yes) +scannerobj = scanner.o +endif + +ifeq ($(CONFIG_SHA1),yes) +sha1obj = sha1.o +endif + +ifeq ($(CONFIG_SMALL),yes) +else +fastfindobj = fastfind.o +endif + +ifeq ($(CONFIG_MOUSE),yes) +mouseobj = mouse.o +endif + +OBJS = \ + base64.o \ + color.o \ + conv.o \ + env.o \ + error.o \ + file.o \ + hash.o \ + memlist.o \ + memory.o \ + secsave.o \ + snprintf.o \ + string.o \ + time.o \ + $(debugobj) \ + $(fastfindobj) \ + $(md5obj) \ + $(scannerobj) \ + $(sha1obj) + +all-l: libutil.a +libutil.a: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/util/Makefile.am b/src/util/Makefile.am deleted file mode 100644 index 94e28ded..00000000 --- a/src/util/Makefile.am +++ /dev/null @@ -1,82 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.53 2005/08/17 15:26:22 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -if CONFIG_DEBUG -debugobj = memdebug.o -endif - -if CONFIG_MD5 -md5obj = md5.o -endif - -if CONFIG_SCANNER -scannerobj = scanner.o -endif - -if CONFIG_SHA1 -sha1obj = sha1.o -endif - -if CONFIG_SMALL -else -fastfindobj = fastfind.o -endif - -noinst_LIBRARIES = libutil.a - -EXTRA_libutil_a_SOURCES = \ - fastfind.c \ - fastfind.h \ - md5.c \ - md5.h \ - memdebug.c \ - memdebug.h \ - scanner.c \ - scanner.h \ - sha1.c \ - sha1.h - -libutil_a_LIBADD = \ - $(debugobj) \ - $(fastfindobj) \ - $(md5obj) \ - $(scannerobj) \ - $(sha1obj) - -libutil_a_SOURCES = \ - align.h \ - base64.c \ - base64.h \ - bitfield.h \ - box.h \ - color.c \ - color.h \ - color.inc \ - color_s.inc \ - conv.c \ - conv.h \ - env.c \ - env.h \ - error.c \ - error.h \ - file.c \ - file.h \ - hash.c \ - hash.h \ - lists.h \ - math.h \ - memlist.c \ - memlist.h \ - memory.c \ - memory.h \ - profile.h \ - secsave.c \ - secsave.h \ - snprintf.c \ - snprintf.h \ - string.c \ - string.h \ - time.c \ - time.h From c89190e0bfe27ea1929a64ffddc9239d9db0fe47 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:29:06 +0200 Subject: [PATCH 40/52] ELBuildized scripting/. --- configure.in | 1 - src/scripting/{Makefile.am => Makefile} | 33 +++++++++---------------- 2 files changed, 11 insertions(+), 23 deletions(-) rename src/scripting/{Makefile.am => Makefile} (55%) diff --git a/configure.in b/configure.in index 224abe15..ad9e0e95 100644 --- a/configure.in +++ b/configure.in @@ -1330,7 +1330,6 @@ AC_OUTPUT([ \ src/intl/gettext/ref-del.sed \ src/mime/Makefile \ src/mime/backend/Makefile \ - src/scripting/Makefile \ src/viewer/Makefile \ src/viewer/text/Makefile ]) diff --git a/src/scripting/Makefile.am b/src/scripting/Makefile similarity index 55% rename from src/scripting/Makefile.am rename to src/scripting/Makefile index 1974bb1f..5f8589a4 100644 --- a/src/scripting/Makefile.am +++ b/src/scripting/Makefile @@ -1,47 +1,36 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.12 2005/06/02 18:01:34 witekfl Exp $ +path_to_top=../.. +include $(path_to_top)/Makefile.config -include $(top_srcdir)/Makefile.base - -if CONFIG_GUILE +ifeq ($(CONFIG_GUILE),yes) guiledir = guile guileobj = $(guiledir)/core.o $(guiledir)/guile.o $(guiledir)/hooks.o endif -if CONFIG_LUA +ifeq ($(CONFIG_LUA),yes) luadir = lua luaobj = $(luadir)/core.o $(luadir)/hooks.o $(luadir)/lua.o endif -if CONFIG_PERL +ifeq ($(CONFIG_PERL),yes) perldir = perl perlobj = $(perldir)/core.o $(perldir)/hooks.o $(perldir)/perl.o endif -if CONFIG_PYTHON +ifeq ($(CONFIG_PYTHON),yes) pythondir = python pythonobj = $(pythondir)/core.o $(pythondir)/hooks.o $(pythondir)/python.o endif -if CONFIG_RUBY +ifeq ($(CONFIG_RUBY),yes) rubydir = ruby rubyobj = $(rubydir)/core.o $(rubydir)/hooks.o $(rubydir)/ruby.o endif SUBDIRS = $(guiledir) $(luadir) $(perldir) $(pythondir) $(rubydir) -EXTRA_DIST = TODO +OBJS = scripting.o $(guileobj) $(luaobj) $(perlobj) $(pythonobj) $(rubyobj) -noinst_LIBRARIES = libscripting.a - -libscripting_a_LIBADD = \ - $(guileobj) \ - $(luaobj) \ - $(perlobj) \ - $(pythonobj) \ - $(rubyobj) - -libscripting_a_SOURCES = \ - scripting.c \ - scripting.h +all-l: libscripting.a +libscripting.a: $(OBJS) +include $(path_to_top)/Makefile.lib From 3e394f3367ffa14e37d0b3693a29f44f35acba28 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:33:43 +0200 Subject: [PATCH 41/52] ELBuildized viewer/. --- configure.in | 4 +--- src/viewer/Makefile | 26 ++++++++++++++++++++++++++ src/viewer/Makefile.am | 29 ----------------------------- src/viewer/text/Makefile | 13 +++++++++++++ src/viewer/text/Makefile.am | 30 ------------------------------ 5 files changed, 40 insertions(+), 62 deletions(-) create mode 100644 src/viewer/Makefile delete mode 100644 src/viewer/Makefile.am create mode 100644 src/viewer/text/Makefile delete mode 100644 src/viewer/text/Makefile.am diff --git a/configure.in b/configure.in index ad9e0e95..2bcf895a 100644 --- a/configure.in +++ b/configure.in @@ -1329,9 +1329,7 @@ AC_OUTPUT([ \ src/intl/gettext/ref-add.sed \ src/intl/gettext/ref-del.sed \ src/mime/Makefile \ - src/mime/backend/Makefile \ - src/viewer/Makefile \ - src/viewer/text/Makefile + src/mime/backend/Makefile ]) diff --git a/src/viewer/Makefile b/src/viewer/Makefile new file mode 100644 index 00000000..00c12919 --- /dev/null +++ b/src/viewer/Makefile @@ -0,0 +1,26 @@ +path_to_top=../.. +include $(path_to_top)/Makefile.config + +SUBDIRS = dump text + +ifeq ($(CONFIG_MARKS),yes) +marksobj = text/marks.o +endif + +OBJS = \ + action.o \ + timer.o \ + dump/dump.o \ + text/draw.o \ + text/form.o \ + text/link.o \ + $(marksobj) \ + text/search.o \ + text/textarea.o \ + text/view.o \ + text/vs.o + +all-l: libviewer.a +libviewer.a: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/viewer/Makefile.am b/src/viewer/Makefile.am deleted file mode 100644 index fa31f0ac..00000000 --- a/src/viewer/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.3 2005/06/13 21:21:10 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -SUBDIRS = dump text - -if CONFIG_MARKS -marksobj = text/marks.o -endif - -noinst_LIBRARIES = libviewer.a -libviewer_a_LIBADD = \ - dump/dump.o \ - text/draw.o \ - text/form.o \ - text/link.o \ - $(marksobj) \ - text/search.o \ - text/textarea.o \ - text/view.o \ - text/vs.o - -libviewer_a_SOURCES = \ - action.c \ - action.h \ - timer.c \ - timer.h - diff --git a/src/viewer/text/Makefile b/src/viewer/text/Makefile new file mode 100644 index 00000000..9509438e --- /dev/null +++ b/src/viewer/text/Makefile @@ -0,0 +1,13 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +ifeq ($(CONFIG_MARKS),yes) +marksobj = marks.o +endif + +OBJS = draw.o form.o link.o $(marksobj) search.o textarea.o view.o vs.o + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/viewer/text/Makefile.am b/src/viewer/text/Makefile.am deleted file mode 100644 index 21dbd547..00000000 --- a/src/viewer/text/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.10 2004/06/23 08:16:23 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -if CONFIG_MARKS -marksobj = marks.o -endif - -noinst_LIBRARIES = libviewer_text.a - -EXTRA_libviewer_text_a_SOURCES = marks.c marks.h -libviewer_text_a_LIBADD = $(marksobj) - -libviewer_text_a_SOURCES = \ - draw.c \ - draw.h \ - form.c \ - form.h \ - link.c \ - link.h \ - search.c \ - search.h \ - textarea.c \ - textarea.h \ - view.c \ - view.h \ - vs.c \ - vs.h - From 68b55a8fcb03885865fde4fb6333b640623561e7 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:36:47 +0200 Subject: [PATCH 42/52] ELBuildized mime/. --- configure.in | 4 +--- src/mime/Makefile | 25 +++++++++++++++++++++++++ src/mime/Makefile.am | 28 ---------------------------- src/mime/backend/Makefile | 17 +++++++++++++++++ src/mime/backend/Makefile.am | 35 ----------------------------------- 5 files changed, 43 insertions(+), 66 deletions(-) create mode 100644 src/mime/Makefile delete mode 100644 src/mime/Makefile.am create mode 100644 src/mime/backend/Makefile delete mode 100644 src/mime/backend/Makefile.am diff --git a/configure.in b/configure.in index 2bcf895a..de978028 100644 --- a/configure.in +++ b/configure.in @@ -1327,9 +1327,7 @@ AC_OUTPUT([ \ contrib/conv/w3m2links.awk \ src/intl/Makefile \ src/intl/gettext/ref-add.sed \ - src/intl/gettext/ref-del.sed \ - src/mime/Makefile \ - src/mime/backend/Makefile + src/intl/gettext/ref-del.sed ]) diff --git a/src/mime/Makefile b/src/mime/Makefile new file mode 100644 index 00000000..1745478c --- /dev/null +++ b/src/mime/Makefile @@ -0,0 +1,25 @@ +path_to_top=../.. +include $(path_to_top)/Makefile.config + +SUBDIRS = backend + +ifeq ($(CONFIG_MAILCAP),yes) +mailcapobj = backend/mailcap.o +endif + +ifeq ($(CONFIG_MIMETYPES),yes) +mimetypesobj = backend/mimetypes.o +endif + +OBJS = \ + dialogs.o \ + mime.o \ + backend/common.o \ + backend/default.o \ + $(mailcapobj) \ + $(mimetypesobj) + +all-l: libmime.a +libmime.a: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/mime/Makefile.am b/src/mime/Makefile.am deleted file mode 100644 index 57591b97..00000000 --- a/src/mime/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.4 2004/05/02 13:08:17 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -if CONFIG_MAILCAP -mailcapobj = backend/mailcap.o -endif - -if CONFIG_MIMETYPES -mimetypesobj = backend/mimetypes.o -endif - -SUBDIRS = backend - -noinst_LIBRARIES = libmime.a - -libmime_a_LIBADD = \ - backend/common.o \ - backend/default.o \ - $(mailcapobj) \ - $(mimetypesobj) - -libmime_a_SOURCES = \ - dialogs.c \ - dialogs.h \ - mime.c \ - mime.h diff --git a/src/mime/backend/Makefile b/src/mime/backend/Makefile new file mode 100644 index 00000000..20e246e3 --- /dev/null +++ b/src/mime/backend/Makefile @@ -0,0 +1,17 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +ifeq ($(CONFIG_MAILCAP),yes) +mailcapobj = mailcap.o +endif + +ifeq ($(CONFIG_MIMETYPES),yes) +mimetypesobj = mimetypes.o +endif + +OBJS = common.o default.o $(mailcapobj) $(mimetypeobj) + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/mime/backend/Makefile.am b/src/mime/backend/Makefile.am deleted file mode 100644 index bedf57c0..00000000 --- a/src/mime/backend/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.5 2004/08/14 21:12:39 miciah Exp $ - -include $(top_srcdir)/Makefile.base - -# We don't want to expose this outside of src/mime/ at all, and we can't merge -# the whole library of these with libmime.a. So we only compile objects here -# and link them directly to libmime.a in ../Makefile.am. - -# However, we apparently need to create the library in order to convince -# automake to compile the objects :/. We DON'T use libmimebackend.a ANYWHERE. - -if CONFIG_MAILCAP -mailcapobj = mailcap.o -endif - -if CONFIG_MIMETYPES -mimetypesobj = mimetypes.o -endif - -noinst_LIBRARIES = libmimebackend.a - -EXTRA_libmimebackend_a_SOURCES = \ - mailcap.c \ - mailcap.h \ - mimetypes.c \ - mimetypes.h - -libmimebackend_a_LIBADD = $(mailcapobj) $(mimetypesobj) - -libmimebackend_a_SOURCES = \ - common.c \ - common.h \ - default.c \ - default.h From 03c2fb116d2f7a659f34c741b86f438481fb3bcd Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:38:05 +0200 Subject: [PATCH 43/52] ELBuildized intl/. Final nail in automake's coffin. --- configure.in | 1 - src/intl/Makefile | 15 +++++++++++++++ src/intl/Makefile.am | 18 ------------------ 3 files changed, 15 insertions(+), 19 deletions(-) create mode 100644 src/intl/Makefile delete mode 100644 src/intl/Makefile.am diff --git a/configure.in b/configure.in index de978028..45a6c8ec 100644 --- a/configure.in +++ b/configure.in @@ -1325,7 +1325,6 @@ AC_OUTPUT([ \ contrib/elinks.spec \ contrib/lua/hooks.lua \ contrib/conv/w3m2links.awk \ - src/intl/Makefile \ src/intl/gettext/ref-add.sed \ src/intl/gettext/ref-del.sed ]) diff --git a/src/intl/Makefile b/src/intl/Makefile new file mode 100644 index 00000000..af3cfe66 --- /dev/null +++ b/src/intl/Makefile @@ -0,0 +1,15 @@ +path_to_top=../.. +include $(path_to_top)/Makefile.config + +ifeq ($(CONFIG_NLS),yes) +gettextdir = gettext +endif + +SUBDIRS = $(gettextdir) + +OBJS = charsets.o + +all-l: libintl.a +libintl.a: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/intl/Makefile.am b/src/intl/Makefile.am deleted file mode 100644 index 98dd6648..00000000 --- a/src/intl/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.13 2005/01/05 14:37:44 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -if CONFIG_NLS -gettextdir = gettext -endif - -SUBDIRS = $(gettextdir) - -noinst_LIBRARIES = libintl.a -libintl_a_SOURCES = \ - charsets.c \ - charsets.h \ - codepage.inc \ - entity.inc \ - uni_7b.inc From 94ba122117c971c5537e9c27a7461d25f10e812c Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:42:25 +0200 Subject: [PATCH 44/52] Set PACKAGE and VERSION manually isntead of relying on AM_INIT_AUTOMAKE(). --- configure.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 45a6c8ec..5f1b1f53 100644 --- a/configure.in +++ b/configure.in @@ -4,8 +4,10 @@ AC_PREREQ(2.13) AC_INIT(src/main/main.c) AC_CONFIG_AUX_DIR(config) -AM_INIT_AUTOMAKE(elinks, 0.11.GIT) -AM_CONFIG_HEADER(config.h) +PACKAGE=elinks +VERSION=0.11.GIT +AC_SUBST(PACKAGE) +AC_SUBST(VERSION AC_PROG_MAKE_SET From a3787a29c11a50407dc66ed58d41dbf48b7f6ee6 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:44:33 +0200 Subject: [PATCH 45/52] Remove traces of nuts and automake. --- .gitignore | 2 -- autogen.sh | 3 --- configure.in | 59 ---------------------------------------------------- 3 files changed, 64 deletions(-) diff --git a/.gitignore b/.gitignore index 8a65be87..91840605 100644 --- a/.gitignore +++ b/.gitignore @@ -6,8 +6,6 @@ config.h.in config.log config.status configure -Makefile -Makefile.in Makefile.config stamp-h stamp-h.in diff --git a/autogen.sh b/autogen.sh index 5f5c6a67..f146c95d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,9 +10,6 @@ aclocal echo autoheader... autoheader -echo automake... -automake -a -c - echo autoconf... autoconf diff --git a/configure.in b/configure.in index 5f1b1f53..d4fa0f7e 100644 --- a/configure.in +++ b/configure.in @@ -82,13 +82,9 @@ if test "$CONFIG_ASCIIDOC" = yes && fi AC_SUBST(CONFIG_ASCIIDOC) -AM_CONDITIONAL(CONFIG_ASCIIDOC, test "$CONFIG_ASCIIDOC" = yes) AC_SUBST(CONFIG_POD2HTML) -AM_CONDITIONAL(CONFIG_POD2HTML, test "$CONFIG_POD2HTML" = yes) AC_SUBST(CONFIG_XMLTO) -AM_CONDITIONAL(CONFIG_XMLTO, test "$CONFIG_XMLTO" = yes) AC_SUBST(CONFIG_JW) -AM_CONDITIONAL(CONFIG_JW, test "$CONFIG_JW" = yes) dnl gcc specific options (to be continued at the bottom of configure) if test "x$ac_cv_prog_gcc" = "xyes"; then @@ -122,19 +118,15 @@ kill me! EL_CHECK_COMPILER_MACROS(CONFIG_BEOS, [BEOS], [__BEOS__]) AC_SUBST(CONFIG_BEOS) -AM_CONDITIONAL(CONFIG_BEOS, test "$CONFIG_BEOS" = yes) EL_CHECK_COMPILER_MACROS(CONFIG_RISCOS, [RISCOS], [__riscos__]) AC_SUBST(CONFIG_RISCOS) -AM_CONDITIONAL(CONFIG_RISCOS, test "$CONFIG_RISCOS" = yes) EL_CHECK_COMPILER_MACROS(CONFIG_WIN32, [WIN32], [_WIN32 __WIN32__]) AC_SUBST(CONFIG_WIN32) -AM_CONDITIONAL(CONFIG_WIN32, test "$CONFIG_WIN32" = yes) EL_CHECK_COMPILER_MACROS(CONFIG_OS2, [EMX], [__EMX__]) AC_SUBST(CONFIG_OS2) -AM_CONDITIONAL(CONFIG_OS2, test "$CONFIG_OS2" = yes) test "$CONFIG_OS2" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zexe//g"` AC_MSG_CHECKING([for UNIX]) @@ -149,7 +141,6 @@ else fi AC_MSG_RESULT($CONFIG_UNIX) AC_SUBST(CONFIG_UNIX) -AM_CONDITIONAL(CONFIG_UNIX, test "$CONFIG_UNIX" = yes) dnl =================================================================== dnl Checks for header files. @@ -185,7 +176,6 @@ AC_CHECK_HEADERS(sys/un.h, EL_CONFIG([CONFIG_INTERLINK], [interlinking])], [CONFIG_INTERLINK=no]) AC_SUBST(CONFIG_INTERLINK) -AM_CONDITIONAL(CONFIG_INTERLINK, test "$CONFIG_INTERLINK" = yes) dnl =================================================================== dnl Checks for typedefs, structures, and compiler characteristics. @@ -419,12 +409,10 @@ EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_GPM, gpm, gpm.h, gpm, Gpm_Open, EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_GZIP, zlib, zlib.h, z, gzdopen, [ --without-zlib disable zlib support]) AC_SUBST(CONFIG_GZIP) -AM_CONDITIONAL(CONFIG_GZIP, test "$CONFIG_GZIP" = yes) EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_BZIP2, bzlib, bzlib.h, bz2, BZ2_bzReadOpen, [ --without-bzlib disable bzlib support]) AC_SUBST(CONFIG_BZIP2) -AM_CONDITIONAL(CONFIG_BZIP2, test "$CONFIG_BZIP2" = yes) EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_IDN, idn, idna.h, idn, stringprep_check_version, [ --without-idn disable international domain names support]) @@ -438,7 +426,6 @@ EL_SAVE_FLAGS EL_ARG_ENABLE(CONFIG_BOOKMARKS, bookmarks, [Bookmarks], [ --disable-bookmarks disable bookmark support]) AC_SUBST(CONFIG_BOOKMARKS) -AM_CONDITIONAL(CONFIG_BOOKMARKS, test "$CONFIG_BOOKMARKS" = yes) # Check whether --enable-xbel or --disable-xbel was given. if test "x${enable_xbel}" != xno; then @@ -458,7 +445,6 @@ EL_ARG_DEPEND(CONFIG_XBEL_BOOKMARKS, xbel, [CONFIG_BOOKMARKS:yes HAVE_LIBEXPAT:y [ --disable-xbel disable XBEL bookmark support (requires expat)]) AC_SUBST(CONFIG_XBEL_BOOKMARKS) -AM_CONDITIONAL(CONFIG_XBEL_BOOKMARKS, test "$CONFIG_XBEL_BOOKMARKS" = yes) if test "$CONFIG_XBEL_BOOKMARKS" != yes; then EL_RESTORE_FLAGS @@ -723,17 +709,11 @@ dnl =================================================================== EL_CONFIG_DEPENDS(CONFIG_SCRIPTING, [CONFIG_GUILE CONFIG_LUA CONFIG_PERL CONFIG_PYTHON CONFIG_RUBY], [Scripting]) AC_SUBST(CONFIG_GUILE) -AM_CONDITIONAL(CONFIG_GUILE, test "$CONFIG_GUILE" = yes) AC_SUBST(CONFIG_LUA) -AM_CONDITIONAL(CONFIG_LUA, test "$CONFIG_LUA" = yes) AC_SUBST(CONFIG_PERL) -AM_CONDITIONAL(CONFIG_PERL, test "$CONFIG_PERL" = yes) AC_SUBST(CONFIG_PYTHON) -AM_CONDITIONAL(CONFIG_PYTHON, test "$CONFIG_PYTHON" = yes) AC_SUBST(CONFIG_RUBY) -AM_CONDITIONAL(CONFIG_RUBY, test "$CONFIG_RUBY" = yes) AC_SUBST(CONFIG_SCRIPTING) -AM_CONDITIONAL(CONFIG_SCRIPTING, test "$CONFIG_SCRIPTING" = yes) dnl =================================================================== @@ -789,11 +769,9 @@ else fi AC_SUBST(CONFIG_SPIDERMONKEY) -AM_CONDITIONAL(CONFIG_SPIDERMONKEY, test "$CONFIG_SPIDERMONKEY" = yes) EL_CONFIG_DEPENDS(CONFIG_ECMASCRIPT, [CONFIG_SPIDERMONKEY], [ECMAScript (JavaScript)]) AC_SUBST(CONFIG_ECMASCRIPT) -AM_CONDITIONAL(CONFIG_ECMASCRIPT, test "$CONFIG_ECMASCRIPT" = yes) dnl =================================================================== @@ -947,11 +925,8 @@ dnl Final SSL setup EL_CONFIG_DEPENDS(CONFIG_SSL, [CONFIG_OPENSSL CONFIG_GNUTLS], [SSL]) AC_SUBST(CONFIG_OPENSSL) -AM_CONDITIONAL(CONFIG_OPENSSL, test "$CONFIG_OPENSSL" = yes) AC_SUBST(CONFIG_GNUTLS) -AM_CONDITIONAL(CONFIG_GNUTLS, test "$CONFIG_GNUTLS" = yes) AC_SUBST(CONFIG_SSL) -AM_CONDITIONAL(CONFIG_SSL, test "$CONFIG_SSL" = yes) #endif @@ -1030,28 +1005,23 @@ dnl =================================================================== EL_ARG_ENABLE(CONFIG_COOKIES, cookies, [Cookies], [ --disable-cookies disable cookie support]) AC_SUBST(CONFIG_COOKIES) -AM_CONDITIONAL(CONFIG_COOKIES, test "$CONFIG_COOKIES" = yes) EL_ARG_ENABLE(CONFIG_FORMHIST, formhist, [Form history], [ --disable-formhist disable form history support]) AC_SUBST(CONFIG_FORMHIST) -AM_CONDITIONAL(CONFIG_FORMHIST, test "$CONFIG_FORMHIST" = yes) EL_ARG_ENABLE(CONFIG_GLOBHIST, globhist, [Global history], [ --disable-globhist disable global history support]) AC_SUBST(CONFIG_GLOBHIST) -AM_CONDITIONAL(CONFIG_GLOBHIST, test "$CONFIG_GLOBHIST" = yes) EL_ARG_ENABLE(CONFIG_MAILCAP, mailcap, [Mailcap], [ --disable-mailcap disable mailcap support]) AC_SUBST(CONFIG_MAILCAP) -AM_CONDITIONAL(CONFIG_MAILCAP, test "$CONFIG_MAILCAP" = yes) EL_ARG_ENABLE(CONFIG_MIMETYPES, mimetypes, [Mimetypes files], [ --disable-mimetypes disable mimetypes files support]) AC_SUBST(CONFIG_MIMETYPES) -AM_CONDITIONAL(CONFIG_MIMETYPES, test "$CONFIG_MIMETYPES" = yes) EL_ARG_DEPEND(CONFIG_IPV6, ipv6, @@ -1059,58 +1029,47 @@ EL_ARG_DEPEND(CONFIG_IPV6, ipv6, [IPv6], [ --disable-ipv6 disable IPv6 support]) AC_SUBST(CONFIG_IPV6) -AM_CONDITIONAL(CONFIG_IPV6, test "$CONFIG_IPV6" = yes) EL_ARG_ENABLE(CONFIG_BITTORRENT, bittorrent, [BitTorrent protocol], [ --enable-bittorrent enable BitTorrent protocol support]) AC_SUBST(CONFIG_BITTORRENT) -AM_CONDITIONAL(CONFIG_BITTORRENT, test "$CONFIG_BITTORRENT" = yes) EL_ARG_ENABLE(CONFIG_DATA, data, [Data protocol], [ --disable-data disable data protocol support]) AC_SUBST(CONFIG_DATA) -AM_CONDITIONAL(CONFIG_DATA, test "$CONFIG_DATA" = yes) EL_ARG_ENABLE(CONFIG_URI_REWRITE, uri-rewrite, [URI rewriting], [ --disable-uri-rewrite disable URI rewrite support]) AC_SUBST(CONFIG_URI_REWRITE) -AM_CONDITIONAL(CONFIG_URI_REWRITE, test "$CONFIG_URI_REWRITE" = yes) EL_ARG_DEPEND(CONFIG_CGI, cgi, [HAVE_SETENV_OR_PUTENV:yes], [Local CGI], [ --enable-cgi enable local CGI support]) AC_SUBST(CONFIG_CGI) -AM_CONDITIONAL(CONFIG_CGI, test "$CONFIG_CGI" = yes) EL_ARG_ENABLE(CONFIG_FINGER, finger, [Finger protocol], [ --enable-finger enable finger protocol support]) AC_SUBST(CONFIG_FINGER) -AM_CONDITIONAL(CONFIG_FINGER, test "$CONFIG_FINGER" = yes) EL_ARG_ENABLE(CONFIG_FTP, ftp, [FTP protocol], [ --disable-ftp disable ftp protocol support]) AC_SUBST(CONFIG_FTP) -AM_CONDITIONAL(CONFIG_FTP, test "$CONFIG_FTP" = yes) EL_ARG_ENABLE(CONFIG_GOPHER, gopher, [Gopher protocol], [ --enable-gopher enable gopher protocol support]) AC_SUBST(CONFIG_GOPHER) -AM_CONDITIONAL(CONFIG_GOPHER, test "$CONFIG_GOPHER" = yes) EL_ARG_ENABLE(CONFIG_NNTP, nntp, [NNTP protocol], [ --enable-nntp enable nntp protocol support]) AC_SUBST(CONFIG_NNTP) -AM_CONDITIONAL(CONFIG_NNTP, test "$CONFIG_NNTP" = yes) EL_ARG_DEPEND(CONFIG_SMB, smb, [HAVE_SMBCLIENT:yes], [SMB protocol], [ --disable-smb disable SMB protocol support (requires smbclient)]) AC_SUBST(CONFIG_SMB) -AM_CONDITIONAL(CONFIG_SMB, test "$CONFIG_SMB" = yes) EL_ARG_ENABLE(CONFIG_MOUSE, mouse, [Mouse handling], [ --disable-mouse disable mouse support]) AC_SUBST(CONFIG_MOUSE) -AM_CONDITIONAL(CONFIG_MOUSE, test "$CONFIG_MOUSE" = yes) # GPM mouse is Linux specific, so ... CONFIG_SYSMOUSE=yes @@ -1119,81 +1078,66 @@ EL_ARG_DEPEND(CONFIG_SYSMOUSE, sysmouse, [BSD sysmouse], [ --disable-sysmouse disable BSD sysmouse support]) AC_SUBST(CONFIG_SYSMOUSE) -AM_CONDITIONAL(CONFIG_SYSMOUSE, test "$CONFIG_SYSMOUSE" = yes) EL_ARG_ENABLE(CONFIG_88_COLORS, 88-colors, [88 colors], [ --enable-88-colors enable 88 color support]) AC_SUBST(CONFIG_256_COLORS) -AM_CONDITIONAL(CONFIG_256_COLORS, test "$CONFIG_256_COLORS" = yes) EL_ARG_ENABLE(CONFIG_256_COLORS, 256-colors, [256 colors], [ --enable-256-colors enable 256 color support]) AC_SUBST(CONFIG_256_COLORS) -AM_CONDITIONAL(CONFIG_256_COLORS, test "$CONFIG_256_COLORS" = yes) EL_ARG_ENABLE(CONFIG_EXMODE, exmode, [Exmode interface], [ --enable-exmode enable exmode (CLI) interface]) AC_SUBST(CONFIG_EXMODE) -AM_CONDITIONAL(CONFIG_EXMODE, test "$CONFIG_EXMODE" = yes) EL_ARG_ENABLE(CONFIG_LEDS, leds, [LEDs], [ --disable-leds disable LEDs support]) AC_SUBST(CONFIG_LEDS) -AM_CONDITIONAL(CONFIG_LEDS, test "$CONFIG_LEDS" = yes) EL_ARG_ENABLE(CONFIG_MARKS, marks, [Marks], [ --disable-marks disable document marks support]) AC_SUBST(CONFIG_MARKS) -AM_CONDITIONAL(CONFIG_MARKS, test "$CONFIG_MARKS" = yes) EL_ARG_ENABLE(CONFIG_CSS, css, [Cascading Style Sheets], [ --disable-css disable Cascading Style Sheet support]) AC_SUBST(CONFIG_CSS) -AM_CONDITIONAL(CONFIG_CSS, test "$CONFIG_CSS" = yes) EL_ARG_DEPEND(CONFIG_HTML_HIGHLIGHT, html-highlight, [CONFIG_CSS:yes], [HTML highlighting], [ --enable-html-highlight HTML highlighting using DOM engine]) AC_SUBST(CONFIG_HTML_HIGHLIGHT) -AM_CONDITIONAL(CONFIG_HTML_HIGHLIGHT, test "$CONFIG_HTML_HIGHLIGHT" = yes) dnl Everything in the tree already uses CONFIG_DOM dnl so resolve CONFIG_HTML_HIGHLIGHT to CONFIG_DOM EL_CONFIG_DEPENDS(CONFIG_DOM, [CONFIG_HTML_HIGHLIGHT], [DOM engine]) AC_SUBST(CONFIG_DOM) -AM_CONDITIONAL(CONFIG_DOM, test "$CONFIG_DOM" = yes) EL_ARG_DEPEND(CONFIG_BACKTRACE, backtrace, [HAVE_EXECINFO:yes], [Backtrace], [ --disable-backtrace disable backtrace support]) AC_SUBST(CONFIG_BACKTRACE) -AM_CONDITIONAL(CONFIG_BACKTRACE, test "$CONFIG_BACKTRACE" = yes) EL_ARG_DEPEND(CONFIG_NO_ROOT_EXEC, no-root, [HAVE_GETUID:yes HAVE_GETEUID:yes], [No root exec], [ --enable-no-root enable prevention of usage by root]) AC_SUBST(CONFIG_NO_ROOT_EXEC) -AM_CONDITIONAL(CONFIG_NO_ROOT_EXEC, test "$CONFIG_NO_ROOT_EXEC" = yes) EL_ARG_ENABLE(CONFIG_DEBUG, debug, [Debug mode], [ --enable-debug enable leak debug and internal error checking]) AC_SUBST(CONFIG_DEBUG) -AM_CONDITIONAL(CONFIG_DEBUG, test "$CONFIG_DEBUG" = yes) EL_ARG_DEPEND(CONFIG_FASTMEM, fastmem, [CONFIG_DEBUG:no], [Fast mode], [ --enable-fastmem enable direct use of system allocation functions, not usable with --enable-debug]) AC_SUBST(CONFIG_FASTMEM) -AM_CONDITIONAL(CONFIG_FASTMEM, test "$CONFIG_FASTMEM" = yes) EL_ARG_ENABLE(CONFIG_OWN_LIBC, own-libc, [Own libc stubs], [ --enable-own-libc force use of internal functions instead of those of system libc]) AC_SUBST(CONFIG_OWN_LIBC) -AM_CONDITIONAL(CONFIG_OWN_LIBC, test "$CONFIG_OWN_LIBC" = yes) EL_ARG_ENABLE(CONFIG_SMALL, small, [Small binary], [ --enable-small reduce binary size as far as possible (but see the bottom of doc/small.txt!)]) AC_SUBST(CONFIG_SMALL) -AM_CONDITIONAL(CONFIG_SMALL, test "$CONFIG_SMALL" = yes) if test "$CONFIG_OPENSSL" != yes && test "$CONFIG_GNUTLS_OPENSSL_COMPAT" != yes || @@ -1205,7 +1149,6 @@ then fi AC_SUBST(CONFIG_MD5) -AM_CONDITIONAL(CONFIG_MD5, test "$CONFIG_MD5" = yes) if test "$CONFIG_BITTORRENT" = yes; then if test "$CONFIG_OPENSSL" != yes || @@ -1218,14 +1161,12 @@ if test "$CONFIG_BITTORRENT" = yes; then fi AC_SUBST(CONFIG_SHA1) -AM_CONDITIONAL(CONFIG_SHA1, test "$CONFIG_SHA1" = yes) if test "$CONFIG_CSS" = yes || test "$CONFIG_DOM" = yes; then EL_CONFIG(CONFIG_SCANNER, [Built-in scanner]) fi AC_SUBST(CONFIG_SCANNER) -AM_CONDITIONAL(CONFIG_SCANNER, test "$CONFIG_SCANNER" = yes) AC_ARG_ENABLE(weehoofooboomookerchoo, [ From f513eefab90a20ef93058642e52fdaf872e9ac2b Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:45:59 +0200 Subject: [PATCH 46/52] Readd AC_CONFIG_HEADERS(). --- configure.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index d4fa0f7e..172c1ecd 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,8 @@ AC_CONFIG_AUX_DIR(config) PACKAGE=elinks VERSION=0.11.GIT AC_SUBST(PACKAGE) -AC_SUBST(VERSION +AC_SUBST(VERSION) +AC_CONFIG_HEADERS(config.h) AC_PROG_MAKE_SET From 3b6c3cc5b4999337285910801cf111a45a09616d Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:48:22 +0200 Subject: [PATCH 47/52] Fix dependencies tracking and default clean rule. --- Makefile.lib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index ce6f9da5..f1febf50 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -43,7 +43,7 @@ DEP_FILES = $(DEP_FILES_1:%.o=%.P) DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -ifdef $(OBJS) +ifdef OBJS -include $(DEP_FILES) endif @@ -58,7 +58,7 @@ endif %.a: $(call cmd,archive) -ifdef $(OBJS) +ifdef OBJS clean-l: rm -f $(OBJS) *.a endif From 96c100b01420c7977c3f58cd8e3b592479870b07 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:54:26 +0200 Subject: [PATCH 48/52] Define PACKAGE and VERSION macros in config.h. --- configure.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.in b/configure.in index 172c1ecd..954fae75 100644 --- a/configure.in +++ b/configure.in @@ -8,6 +8,8 @@ PACKAGE=elinks VERSION=0.11.GIT AC_SUBST(PACKAGE) AC_SUBST(VERSION) +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Package version]) +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Package version]) AC_CONFIG_HEADERS(config.h) AC_PROG_MAKE_SET From a45e48d86f7a91a03a1bf1bdd6dfd740f3d1a602 Mon Sep 17 00:00:00 2001 From: Laurent MONIN Date: Fri, 16 Sep 2005 13:55:40 +0200 Subject: [PATCH 49/52] unblock_itrm(): drop useless intermediate variable. --- src/terminal/kbd.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/terminal/kbd.c b/src/terminal/kbd.c index 2ad5a387..8642e670 100644 --- a/src/terminal/kbd.c +++ b/src/terminal/kbd.c @@ -320,18 +320,16 @@ unblock_itrm_x(void *h) int unblock_itrm(int fd) { - struct itrm *itrm = ditrm; + if (!ditrm) return -1; - if (!itrm) return -1; + if (ditrm->in.ctl >= 0 && setraw(ditrm->in.ctl, NULL)) return -1; + ditrm->blocked = 0; + send_init_sequence(ditrm->out.std, ditrm->altscreen); - if (itrm->in.ctl >= 0 && setraw(itrm->in.ctl, NULL)) return -1; - itrm->blocked = 0; - send_init_sequence(itrm->out.std, itrm->altscreen); + handle_itrm_stdin(ditrm); + resume_mouse(ditrm->mouse_h); - handle_itrm_stdin(itrm); - resume_mouse(itrm->mouse_h); - - handle_terminal_resize(itrm->in.ctl, resize_terminal); + handle_terminal_resize(ditrm->in.ctl, resize_terminal); unblock_stdin(); return 0; From 885bb75c66f29b3782a02cd5e96756d8b9d76e8f Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:58:56 +0200 Subject: [PATCH 50/52] Typo fix. --- src/mime/backend/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mime/backend/Makefile b/src/mime/backend/Makefile index 20e246e3..3cd5cde3 100644 --- a/src/mime/backend/Makefile +++ b/src/mime/backend/Makefile @@ -9,7 +9,7 @@ ifeq ($(CONFIG_MIMETYPES),yes) mimetypesobj = mimetypes.o endif -OBJS = common.o default.o $(mailcapobj) $(mimetypeobj) +OBJS = common.o default.o $(mailcapobj) $(mimetypesobj) # Do not forget to also add the .o to ../Makefile. Yes, it sucks. all-l: $(OBJS) From e000fffaa6c31d1e75635552d9a6343a40433628 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 14:29:41 +0200 Subject: [PATCH 51/52] Fix linking gettext - actually build libintl.a. ;-) --- src/Makefile | 2 +- src/intl/gettext/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index 131ab1b4..7b2c3a7e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -60,7 +60,6 @@ SUBDIRS = \ # mysteriously unresolved symbols. ELINKSLIBS = \ main/libmain.a \ - $(INTLLIBS) \ $(cookieslib) \ viewer/libviewer.a \ cache/libcache.a \ @@ -81,6 +80,7 @@ ELINKSLIBS = \ mime/libmime.a \ bfu/libbfu.a \ encoding/libencoding.a \ + $(INTLLIBS) \ util/libutil.a OBJS = vernum.o diff --git a/src/intl/gettext/Makefile b/src/intl/gettext/Makefile index 3b4cff40..ab9659e7 100644 --- a/src/intl/gettext/Makefile +++ b/src/intl/gettext/Makefile @@ -24,8 +24,8 @@ OBJS = \ plural.o \ textdomain.o -# Do not forget to also add the .o to ../Makefile. Yes, it sucks. -all-l: $(OBJS) +all-l: libintl.a +libintl.a: $(OBJS) $(builddir)/charset.alias: $(srcdir)/config.charset From 54e6bab8bbfe3dad116f6698f85db84995abfe0b Mon Sep 17 00:00:00 2001 From: Laurent MONIN Date: Fri, 16 Sep 2005 17:20:12 +0200 Subject: [PATCH 52/52] block_itrm(): drop useless intermediate variable. --- src/terminal/kbd.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/terminal/kbd.c b/src/terminal/kbd.c index 8642e670..3b5b022d 100644 --- a/src/terminal/kbd.c +++ b/src/terminal/kbd.c @@ -339,17 +339,15 @@ unblock_itrm(int fd) void block_itrm(int fd) { - struct itrm *itrm = ditrm; + if (!ditrm) return; - if (!itrm) return; - - itrm->blocked = 1; + ditrm->blocked = 1; block_stdin(); - unhandle_terminal_resize(itrm->in.ctl); - send_done_sequence(itrm->out.std, itrm->altscreen); - tcsetattr(itrm->in.ctl, TCSANOW, &itrm->t); - unhandle_itrm_stdin(itrm); - suspend_mouse(itrm->mouse_h); + unhandle_terminal_resize(ditrm->in.ctl); + send_done_sequence(ditrm->out.std, ditrm->altscreen); + tcsetattr(ditrm->in.ctl, TCSANOW, &ditrm->t); + unhandle_itrm_stdin(ditrm); + suspend_mouse(ditrm->mouse_h); }