Commit Graph

463 Commits

Author SHA1 Message Date
Mans Rullgard 371584c42b build: add -L flags before existing LDFLAGS
This ensures the linker picks the just built libraries even
if LDFLAGS for some reason contains -L flags pointing at
other directories containing libav libraries.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-21 12:50:31 +01:00
Mans Rullgard 1fef92fd73 build: remove unnecessary dependency on libs from 'all' target
The libs are added to the all target elsewhere, no need to do it
again here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-11 21:08:52 +01:00
Mans Rullgard ca9036155d build: remove unnecessary FFLDFLAGS variable
This variable is set to the same value for all directories.
Adding the -L flags directly to LDFLAGS is simpler and achieves
the same thing.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-11 11:39:04 +01:00
Mans Rullgard 28e1c97916 build: rework rules for things in the tools dir
Declaring tools associated with each library in their respective
makefiles allows these tools to easily depend on the correct
prerequisites and link against the libs they need.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-10 21:13:38 +01:00
Diego Biurrun db54be09c2 build: Remove deleted 'check' target from .PHONY list. 2011-07-04 13:14:31 +02:00
Diego Biurrun bd9a9a2f18 build: Eliminate obsolete test targets.
The targets are now part of FATE and can be run as individual FATE targets.
2011-06-30 13:06:27 +02:00
Mans Rullgard f68069868b build: fix creation of tools dir with make 3.81
GNU make 3.81 apparently does not support order-only prerequisites
with pattern rules, and thus fails to create the tools directory
if it is missing.  Naming the objects explicitly in the rule makes
it work properly.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-29 12:06:46 +01:00
Diego Biurrun e2542dcc6e build: Mark all-yes Makefile target as phony. 2011-06-29 12:15:52 +02:00
Mans Rullgard 5e27ec28f0 build: create output directories as needed
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-29 09:14:56 +01:00
Mans Rullgard 57b4a3dd2b build: include sub-makefiles using full path instead of symlinks
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-28 18:15:19 +01:00
Mans Rullgard bc877faf7f build: factor out the .c and .S compile commands as a macro
These commands have the same form, and using a common macro allows
it to be used elsewhere without further duplication.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-26 23:07:40 +01:00
Mans Rullgard f038cf3c74 build: remove SRC_PATH_BARE variable
Setting SRC_PATH to "." when building in-tree removes the need
for a quoted version of the source path since out-of-tree builds
are not possible if the pathname contains spaces.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-23 12:17:25 +01:00
Mans Rullgard bb5249244d build: move basic rules and variables to main Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-23 12:17:08 +01:00
Mans Rullgard 8d853efe53 build: move special targets to end of main Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-23 12:16:53 +01:00
Mans Rullgard f87b03b50d build: move documentation rules to doc/Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-22 22:59:46 +01:00
Mans Rullgard 698a183e30 build: move test rules to tests/Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-22 22:53:07 +01:00
Mans Rullgard d530e57944 build: move vpath directives to main Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-14 19:53:53 +01:00
Mans Rullgard cf53c48615 build: move ALLFFLIBS to a more logical place
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-14 10:59:56 +01:00
Mans Rullgard 151c584188 build: fix "make install" with documentation disabled
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-11 20:35:53 +01:00
Mans Rullgard 623ffe8c82 build: simplify some conditional targets
Use intermediate targets instead of variables for conditional
parts of "all" and "install" targets.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-11 19:35:47 +01:00
Mans Rullgard 6d170962bd build: make rule for linking ff* apply only to these targets
This ensures that the special link command using cmdutils.o
only applies to the targets it should.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-07 01:28:15 +01:00
Mans Rullgard d93d7349ce build: rearrange some lines in a more logical way
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-06 23:21:12 +01:00
Mans Rullgard 0018b7f043 build: clean up .PHONY lists
This removes nonexisting targets from phony lists and puts them
all in one place.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-06 16:56:53 +01:00
Mans Rullgard d7a72d250b build: move all (un)install* target aliases to toplevel Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-06 16:56:53 +01:00
Diego Biurrun a5514a8474 build: Simplify texi2html invocation through the --output option.
The --output option is available in texi2html since at least version 1.78.
2011-06-03 15:43:05 +02:00
Mans Rullgard 798b264678 build: remove BUILD_ROOT variable
This variable is unnecessary as absolute paths are not required.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-29 12:36:16 +01:00
Diego Biurrun 59748689f6 build: Remove generated .version file on distclean. 2011-05-26 16:26:18 +02:00
Mans Rullgard f907ad9b85 Remove unused make variable SEEK_REFFILE
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-18 20:21:27 +01:00
Mans Rullgard 164c24c858 fate: remove redundant aref and vref references
The ref targets are included in the FATE_[AV]CODEC lists created
by configure so they do not need to be listed separately in the
makefile.  Filter them out when setting dependencies to avoid make
warnings about circular deps.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-18 19:24:35 +01:00
Mans Rullgard 70378ea190 fate: run aref and vref as regular tests
These tests create reference files used for psnr calculation in
the other codec tests.  Treating them as (mostly) regular tests
simplifies the makefile and makes them visible in the fate reports.
The latter makes errors in these runs easier to identify.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-18 14:45:46 +01:00
Reinhard Tartler 8ce67bcabe Implement fate-rsync target 2011-05-03 19:21:30 +02:00
Ronald S. Bultje 3283f274fd FATE: allow forcing thread-type when doing threaded fate runs.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-04-21 19:36:45 -04:00
Martin Storsjö f83acb096c Makefile: Include dependencies for test tools, too
This makes seek_test to be rebuilt when its dependencies
has changed. The changes to the dependencies didn't usually matter
in practice, but the introduction of side data in AVPacket required
a recompilation.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-04-20 21:44:04 +03:00
Mans Rullgard e0be794a71 Remove support for stripping executables
Stripping is generally best left to package management tools, and
since unstripped copies are kept in the build tree, any arguments
about saving space (no matter how insignificant) are void.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-29 22:05:04 +01:00
Luca Barbato 7851eb68c6 fate: add support for multithread testing
Add a THREADS variable to fate calls.
2011-03-23 01:17:20 +01:00
Janne Grunau faa6f1c306 get rid of the last svn mentions 2011-03-18 21:57:38 +01:00
Janne Grunau 29ba091136 replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION
also update the multiple inclusion guards in config.h|mak
2011-03-16 21:54:39 +01:00
Mans Rullgard 08df7f8666 Makefile: include deps from tools directory
This ensures the tools are rebuilt when necessary.  Specifically,
lavfi-showfiltfmts was sometimes not rebuilt causing spurious test
failures.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-20 18:04:52 +00:00
Reinhard Tartler 737eb5976f Merge libavcore into libavutil
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-15 16:18:21 +01:00
Stefano Sabatini 40321376d8 Allow "make clean" to clean files in tools
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-12 12:58:10 +00:00
Stefano Sabatini cd6a5a57b8 Add lavfi-showfiltfmts and graph2dot to $(TOOLS)
Allow make clean to remove the corresponding binaries.

Fix issue 2162.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-12 12:55:31 +00:00
Mans Rullgard a7878c9f73 VP8: ARM optimised decode_block_coeffs_internal
Approximately 5% faster on Cortex-A8.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-11 15:48:11 +00:00
Mans Rullgard f3619680a7 Makefile: remove unused variable ALLHTMLPAGES
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-01 12:33:13 +00:00
Mans Rullgard 7f939f55bb Makefile: build docs only for enabled tools; fix docs dependencies
This makes "make documentation" build the man/html pages only for
the tools enabled in the build.  It also fixes the dependency
tracking for the built man pages.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-01 12:33:09 +00:00
Mans Rullgard a0f9c8ce37 Auto-generate dependencies for documentation
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-01 00:10:00 +00:00
Janne Grunau a8f0814a74 doc: modify style for texi2html 1.78+
The generated HTML files are similar to the ones generated with
texi2html 1.56k used on the website.

Tested with texi2html 1.78 and 5.0. 1.78 is the minimal recommended
version.

The removed @sp from the titlepage section were ignored until
texi2html 5.0. If not removed the pages generated by 5.0 will have ugly
empty space around the title.
2011-01-29 16:57:29 +01:00
Mans Rullgard 3d157bf31f Makefile: fix cleaning of tools in tests directory
The variable TESTPROGS is reset by the library makefiles,
use another name.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-25 13:43:54 +00:00
Daniel Verkamp 3adbe49f2b Fix ALLPROGS_G so that *_g binaries get cleaned properly
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-25 12:46:10 +00:00
Mans Rullgard 2b39962eb6 Makefile: simplify test tools handling
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-23 13:55:35 +00:00
Mans Rullgard 583fcb528c Makefile: simplify setting of some variables
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 15:36:05 +00:00