aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-10-29 08:17:18 -04:00
Code
3,225 Commits 22 Branches 44 Tags 28 MiB
a685470da9
Commit Graph

88 Commits

Author SHA1 Message Date
Kalle Olavi Niemitalo
d26c8cf836 Merge branch 'elinks-0.12' into elinks-0.13 
Conflicts:

	NEWS (bug 939 was listed twice)
	doc/man/man5/elinks.conf.5 (regenerated)
	po/fr.po (only in comments and such)
	po/pl.po (only in comments and such)
	src/protocol/fsp/fsp.c (the relevant changes were already here)
 2008-04-28 22:08:19 +03:00
Kalle Olavi Niemitalo
0d7ff95d72 build: Quote redirections when echoing commands. 
Without this, "make --directory=doc V=1 keymap-defaults.txt"
would not display the command it runs, because the command is

LC_ALL=C LANGUAGE=en /home/Kalle/src/elinks-0.12/doc/tools/keys2doc /home/Kalle/src/elinks-0.12/src/config/kbdbind.c keymap-defaults.txt > keymap-defaults.txt

and the build system would run

echo LC_ALL=C LANGUAGE=en /home/Kalle/src/elinks-0.12/doc/tools/keys2doc /home/Kalle/src/elinks-0.12/src/config/kbdbind.c keymap-defaults.txt > keymap-defaults.txt && LC_ALL=C LANGUAGE=en /home/Kalle/src/elinks-0.12/doc/tools/keys2doc /home/Kalle/src/elinks-0.12/src/config/kbdbind.c keymap-defaults.txt > keymap-defaults.txt

so, the initial echo was redirected to keymap-defaults.txt too,
and then overwritten with the intended output.  Now, the build
system instead runs

echo 'LC_ALL=C LANGUAGE=en /home/Kalle/src/elinks-0.12/doc/tools/keys2doc /home/Kalle/src/elinks-0.12/src/config/kbdbind.c keymap-defaults.txt > keymap-defaults.txt' && LC_ALL=C LANGUAGE=en /home/Kalle/src/elinks-0.12/doc/tools/keys2doc /home/Kalle/src/elinks-0.12/src/config/kbdbind.c keymap-defaults.txt > keymap-defaults.txt

which echoes the redirection instead of executing it.  This change
also makes the output correctly preserve quotes in some other rules.
 2008-03-22 11:16:07 +02:00
Laurent MONIN
b389d1b20e Revert "Use the new OBJS-unless$(CONFIG_FOO) instead of $(call not,...)" 
This reverts commit e07354f5d5.
 2007-09-14 17:43:36 +02:00
Jonas Fonseca
e07354f5d5 Use the new OBJS-unless$(CONFIG_FOO) instead of $(call not,...) 2007-09-14 16:48:26 +02:00
Jonas Fonseca
af4b7bed84 Use the new OBJS-unless$(CONFIG_FOO) instead of $(call not,...) 2007-08-29 01:57:01 +02:00
Petr Baudis
d905fb803a Makefile.lib: Fix the $(OBJS) rule 2007-08-28 23:35:22 +02:00
Petr Baudis
14ae8ecc01 Makefile.lib: Add support for "unless" config-driven rules 
Normally, you can add some objects or subdirs to the build if some
config variable is set to yes, by doing:

	SUBDIRS-$(CONFIG_FOO)

Now you can do it the other way too, including stuff if some
variable is set to no:

	SUBDIRS-unless$(CONFIG_FOO)

This will be used for switching between two HTML parser implementations.
 2007-08-28 22:55:26 +02:00
Jonas Fonseca
ba66ff37db Simplify TESTDEPS maintainance by adding common objects in Makefile.lib 2007-05-26 14:04:29 +02:00
Kalle Olavi Niemitalo
50c085beb5 Bug 799: Ignore source directory name when uninstalling. 
This fixes the uninstallation of elinks.conf.5 and elinkskeys.5 when
$(srcdir) is not empty, i.e. the build directory is not the same as
the source directory.
 2007-02-24 12:15:22 +02:00
Witold Filipczyk
8688e623d4 Used the builtin macro RM in place of defined UNINSTALL. 2007-02-24 11:09:55 +02:00
Kalle Olavi Niemitalo
5331789603 Remove cmd_installsrcdata. 
cmd_installdata with $(srcdir) now does the same thing.
 2006-12-17 16:25:12 +02:00
Kalle Olavi Niemitalo
7c161bbbf2 Prettify installation of manual pages. 
Before:
     [INSTALL]   doc/man/man5//home/Kalle/src/elinks/doc/man/man5/elinks.conf.5 -> /home/Kalle/prefix/stow/elinks/share/man/man5
     [INSTALL]   doc/man/man5//home/Kalle/src/elinks/doc/man/man5/elinkskeys.5 -> /home/Kalle/prefix/stow/elinks/share/man/man5

After:
     [INSTALL]   doc/man/man5/elinks.conf.5 -> /home/Kalle/prefix/stow/elinks/share/man/man5
     [INSTALL]   doc/man/man5/elinkskeys.5 -> /home/Kalle/prefix/stow/elinks/share/man/man5
 2006-12-17 16:21:36 +02:00
Kalle Olavi Niemitalo
f52d23c224 make install-doc installs doc/python.txt too. 2006-12-01 22:31:16 +02:00
Witold Filipczyk
fcc00bcfd9 Added uninstall target to the Makefile. 2006-09-03 09:27:21 +02:00
Kalle Olavi Niemitalo
40e257bedd build: Don't use $(AM_CFLAGS) anymore. Use $(CPPFLAGS) instead. 
$(AM_CFLAGS) is one of the variables set by Automake, which ELinks no
longer uses.  $(CPPFLAGS) should be used whenever the C preprocessor
is run, according to the GNU Coding Standards.  (My build environment
does have an important -I option there.)
 2006-08-05 12:36:20 +02:00
Jonas Fonseca
4f2dd4f842 Clean PROGS so elinks binary is removed; make V=1 clean print commands 
This fixes a typo (s/PROG/PROGS/) and reintroduces the Q variable which
is conditionally set to empty or @, so that commands can be easily quieted.
We should probably use it for more stuff in Makefile.lib.
 2006-07-10 14:27:40 +02:00
Witold Filipczyk
eed1d25051 Clean lib.o files too 2006-07-09 16:56:57 +02:00
Kalle Olavi Niemitalo
d237f529bf If make -k was used and a sub-Make fails, build the rest before propagating. 2006-05-21 14:55:22 +03:00
Jonas Fonseca
367afb2ceb BUILD: Fix test building to support more than one test program pr directory 2006-01-31 19:25:37 +01:00
Jonas Fonseca
6a592b073c BUILD: Do not create .vimrc files 
They are considered insecure, use the newly added ftplugin instead. This
also removes the config/vimrc master file.
 2006-01-28 05:25:02 +01:00
Jonas Fonseca
d5f6f198b1 Abandon usage of $(eval) for test dependency 
They lead to problems with FreeBSD's gmake.
 2006-01-21 08:37:13 +01:00
Jonas Fonseca
16ff8a444f Move setting of TEST_LIB to Makefile.lib 2006-01-19 02:15:56 +01:00
Jonas Fonseca
dcff602f70 Fix the build order of OBJS; broken by my recent 'cleanups' 2006-01-19 01:23:54 +01:00
Jonas Fonseca
9e3ba8736f Fix test program dependency on it's own .o by using a template 2006-01-17 16:53:15 +01:00
Jonas Fonseca
0955086a6f Move close_all_non_term_fd() shared by SMB and FSP to protocol/common 
Stick a note near the OBJS sorting that it is there also to filter out
duplicates, which are now occuring with SMB and FSP compiled in.
 2006-01-16 23:32:27 +01:00
Jonas Fonseca
becf3b42ab Create .vimrc files both during all and init 
Then make init doesn't have to always be run by configure.
 2006-01-15 22:23:39 +01:00
Jonas Fonseca
2748d043f9 Autogenerate .vimrc files and put the master in config/vimrc 
This changes the init target to be idempotent: most importantly it will now
never overwrite a Makefile if it exists. Additionally 'make init' will
generate the .vimrc files. Yay, no more stupid 'added fairies' commits! ;)
 2006-01-15 18:38:58 +01:00
Jonas Fonseca
46669bd2e6 Be more careful when copying .deps/*.pp files 
Some systems won't have them and then there will be lots of error messages.
 2006-01-14 19:48:44 +01:00
Jonas Fonseca
97fcc99f4d Strip $(OBJS) for whitespace before comparing it 2006-01-14 14:46:23 +01:00
Jonas Fonseca
ef23ef93a2 Speed up the build time by not using templates + eval 
Seems to half the traversal of an already build time.
Reverts 70a0f339e8.
 2006-01-14 12:43:40 +01:00
Jonas Fonseca
267930070a Remove unused Q variable 2006-01-14 10:33:38 +01:00
Jonas Fonseca
38ea507740 Try to further simplify the logic 2006-01-14 10:28:08 +01:00
Jonas Fonseca
b9c1850785 Rearrange moving configurable things up front and add commentary headers 2006-01-14 09:27:30 +01:00
Jonas Fonseca
44dcf89071 Simplify default clean rules 2006-01-14 08:57:42 +01:00
Laurent MONIN
bdc59d5ac4 Store lib.o name in a variable named LIB_O_NAME. 2006-01-12 19:06:50 +01:00
Jonas Fonseca
70a0f339e8 Define a basic_dependency template to simplify setup of default rules 2006-01-12 03:28:23 +01:00
Jonas Fonseca
215d7ec158 Append memdebug to test dependencies in Makefile.lib 2006-01-06 22:11:45 +01:00
Jonas Fonseca
84f8973720 Make the compile macro use -o and append any 2nd argument 2006-01-06 22:08:49 +01:00
Jonas Fonseca
6cb282275e Refrain from using $$@, a SysV make feature added in gmake 3.80 
Instead do a little magic to compile test programs before they are linked.
Setup the default dependencies almost the old way, but using a call-macro.
 2006-01-04 14:46:29 +01:00
Jonas Fonseca
146ca09c43 Improve support for running 'make test' when srcdir != builddir 
Additionally, also make TESTDEPS conditionally contain memdebug object
binary only if CONFIG_DEBUG is yes.
 2006-01-03 19:04:17 +01:00
Jonas Fonseca
a20d3e4bfe Use addsuffix instead of patsubst 2006-01-03 18:54:51 +01:00
Jonas Fonseca
8c7a1dfecc Simplify the dependency and recursion setup so it's easier to add new rules 2006-01-03 18:50:26 +01:00
Jonas Fonseca
50183bf5d8 Add support for recursively running all tests 2006-01-03 02:07:51 +01:00
Jonas Fonseca
ba5bdfec00 Move the 'make test' handling to Makefile.lib 
The test rule is defined when TEST_PROGS is defined. Users should also set
TESTDEPS to get the correct object files linked in.
 2006-01-03 00:45:22 +01:00
Jonas Fonseca
b9c5bc5536 Make building of .gmo files use the new build system 
It now shows:
	[GMSGFMT]   po/da.gmo      1538 translated messages, ...
 2005-12-26 19:17:47 +01:00
Jonas Fonseca
a186c75bd6 Fix cleanall by including $(SUBDIRS-) and $(OBJS-) when INCLUDE_ALL is set 
This is necessary since some CONFIG_* variables can have no value set.
So this is really a workaround.
 2005-12-25 02:15:04 +01:00
Jonas Fonseca
f632b2dfa4 Remove --no-print-directory flag for the recursive make command 
... it doesn't do the right thing for me w.r.t. resolving compile errors
to file positions in vim.
 2005-12-20 23:21:08 +01:00
Miciah Dashiel Butler Masters
00e3af6412 Do not use the -e option to echo, which besides being non-portable is 
now unnecessary.
 2005-12-17 01:18:33 +00:00
Miciah Dashiel Butler Masters
75f21d276c Use tput instead of hardcoded escape sequences in the make system. 2005-12-17 01:17:26 +00:00
Russ Rowan
959bd2cd30 Don't be quite so silent during make. 2005-12-15 16:04:41 -05:00