Commit Graph

313 Commits

Author SHA1 Message Date
Måns Rullgård 9987769a8b correct soname for vhooks
Originally committed as revision 12785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-10 19:44:29 +00:00
Måns Rullgård 791a3fc8ec save DEP_LIBS before processing subdirs
Originally committed as revision 12784 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-10 19:44:26 +00:00
Måns Rullgård 76ca42a8a0 move DEP_LIBS to common.mak
Originally committed as revision 12777 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-09 21:11:39 +00:00
Måns Rullgård 8a03404d4f fix build with --build-suffix
Originally committed as revision 12776 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-09 21:11:35 +00:00
Måns Rullgård caec74dd65 generate separate dependency files per object file
Originally committed as revision 12775 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-09 20:48:17 +00:00
Måns Rullgård 465d9b1f7a collect vhook-related makefile lines in one place
Originally committed as revision 12762 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-07 22:17:42 +00:00
Stefano Sabatini d05e360c48 Make the install-man target depend on $(MANPAGES).
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 12761 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-07 21:45:38 +00:00
Måns Rullgård 71c61f62a3 non-recursive makefiles
Originally committed as revision 12760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-07 21:16:31 +00:00
Måns Rullgård b8fcb619e9 simplify LDFLAGS and EXTRALIBS handling
Originally committed as revision 12683 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-03 23:51:29 +00:00
Måns Rullgård 82e8566a02 simplify vhook/*.o rule
Originally committed as revision 12682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-03 22:47:01 +00:00
Måns Rullgård 43527e3edd clean up DEP_LIBS setting
Originally committed as revision 12681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-03 22:39:54 +00:00
Diego Biurrun 60080b0805 10l typo, restore forgotten $.
Originally committed as revision 12673 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-03 16:57:01 +00:00
Björn Axelsson 73e17cdb8c Add libavutil to DEP_LIBS so that PROGS get rebuilt upon libavutil changes.
Closes issue 418, patch by Björn Axelsson, bjorn.axelsson intinor se

Originally committed as revision 12667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-02 18:14:48 +00:00
Måns Rullgård 473a88caaf fix ff*_g -> ff* rules
Originally committed as revision 12624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-29 11:33:58 +00:00
Diego Biurrun 9bcc2883ac bandaid fix for broken shared library installation
Originally committed as revision 12617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 03:13:21 +00:00
Diego Biurrun dfd1083831 Move INSTALL_PROGS_TARGETS variable to a better place.
Originally committed as revision 12616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 03:07:55 +00:00
Diego Biurrun 88ad036874 Handle EXTRALIBS and LDFLAGS for libswscale and libavfilter in a simpler way.
Originally committed as revision 12615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 02:45:09 +00:00
Diego Biurrun c1ac39b3df Replace ifeq to declare install-progs dependencies by a variable.
Originally committed as revision 12613 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 01:58:53 +00:00
Diego Biurrun a7319cc22a The install target should depend on enabled installation targets.
Originally committed as revision 12612 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 01:49:01 +00:00
Diego Biurrun e58cc8e604 Remove TAGS target. It is ages old and has never been updated to match
changes to the source tree. Thus it has to be completely unused.

Originally committed as revision 12610 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 00:59:55 +00:00
Diego Biurrun 7716f7ffa3 Use common.mak in the top-level Makefile as well.
Originally committed as revision 12599 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-26 09:39:12 +00:00
Diego Biurrun 916dafd57c cosmetics: Rename SRCS variable to PROGS_SRCS.
This is in preparation for common.mak inclusion in the main Makefile.

Originally committed as revision 12598 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-26 09:30:09 +00:00
Diego Biurrun f4428f9992 Merge LDFLAGS lines.
Originally committed as revision 12597 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-26 09:27:58 +00:00
Diego Biurrun 2721715985 cosmetics: Move around some rules and variable declarations.
This is in preparation for common.mak inclusion in the main Makefile.

Originally committed as revision 12596 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-26 09:22:43 +00:00
Diego Biurrun 92e791ff37 cosmetics: Rename 'all' target to 'main'.
This is in preparation for common.mak inclusion in the main Makefile.

Originally committed as revision 12595 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-26 08:58:26 +00:00
Diego Biurrun b1b184812c Merge binary generation rules.
Originally committed as revision 12455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-15 19:57:09 +00:00
Måns Rullgård a426bbfc28 set SRC_DIR in top-leve Makefile
Originally committed as revision 12453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-15 19:24:05 +00:00
Diego Biurrun e6a383d695 Use $< to simplify a few lines.
Originally committed as revision 12451 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-15 19:14:07 +00:00
Diego Biurrun 6e69586b44 Build ffserver_g as well as ffserver, consistent with the other binaries.
Originally committed as revision 12439 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-14 12:44:07 +00:00
Diego Biurrun 315c741d3d Move dependency generation commands into configure.
This will allow specifying gcc-independent commands in the future.

Originally committed as revision 12426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-12 23:30:35 +00:00
Diego Biurrun f63b6dc0ff Do not calculate dependencies for header files in the .vhookdepend target.
Originally committed as revision 12422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-12 09:42:36 +00:00
Diego Biurrun 8df4da4eb3 Use $^ without header files instead of $(SRCS) to reference the dependencies
of the .depend target. $^ apparently includes the full path to files found
in a vpath directory, $(SRCS) does not. This makes out of tree builds fail.

Originally committed as revision 12421 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-12 09:40:36 +00:00
Ramiro Polla 1b9cec96e1 Remove windows installer. I'm not aware of anyone that uses it.
Originally committed as revision 12416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 21:15:47 +00:00
Diego Biurrun 30a3ad750b Simplify .depend generation command.
Originally committed as revision 12414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 20:18:40 +00:00
Diego Biurrun 7853bf93b2 Replace the awkward '1>' with the more natural '>'.
Originally committed as revision 12413 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 20:12:27 +00:00
Diego Biurrun 3c889b5cf7 Merge SDL_CFLAGS handling for files that need it.
Originally committed as revision 12412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 20:01:50 +00:00
Diego Biurrun bab785a5f9 vhooks really need libav* even if they compile fine without on Linux.
Originally committed as revision 12409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 18:37:18 +00:00
Diego Biurrun 13ca50f367 Rename --enable-swscaler --> enable-swscale to be consistent with the
directory name and other option names. Also rename variables accordingly.

Originally committed as revision 12408 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 17:54:24 +00:00
Diego Biurrun 4a24ab64b1 Rename pp variable to postproc for consistency.
Originally committed as revision 12376 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 18:50:38 +00:00
Diego Biurrun 61c510887b cosmetics: prettyprinting
Originally committed as revision 12369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 16:19:46 +00:00
Diego Biurrun 3d323571d6 Install libavfilter if it has been enabled.
Originally committed as revision 12368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 16:19:03 +00:00
Diego Biurrun 4c85ae7ba5 The videohook target does not depend on .libs.
Originally committed as revision 12367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 15:19:07 +00:00
Måns Rullgård 733a6d8360 Remove mp4psp regression test
The PSP MP4 format requires an AAC audio stream, so until
we have an AAC encoder we cannot test this format.

The existing test is broken and does not actually use the
PSP format.

Originally committed as revision 12359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-07 19:27:07 +00:00
Kostya Shishkov 9dc92a38a0 IMA ADPCM encoder - QT variant
Originally committed as revision 12348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 07:30:41 +00:00
Måns Rullgård de2f77d865 allow vpath search only for source files
Originally committed as revision 12343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 21:27:58 +00:00
Vitor Sessak f7679c54dd Build system changes for libavfilter addition. Add --enable-avfilter configure option.
Patch by myself, Bobby Bingham and Víctor Paesa.

Originally committed as revision 12249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 21:32:56 +00:00
Måns Rullgård 4411cb11f8 use diff -u -w in codec regression test
Originally committed as revision 12181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-23 13:15:24 +00:00
Måns Rullgård b147ec08c3 do not run ldconfig after installing shared libraries
Originally committed as revision 12121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-16 14:13:23 +00:00
Måns Rullgård 2009721d99 split lavf regression tests
Originally committed as revision 11833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-03 19:26:29 +00:00
Måns Rullgård 4383ed5cba split regression tests allowing make to run them in parallel
Originally committed as revision 11832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-03 19:26:26 +00:00
Diego Biurrun b15136b793 seektest depends on both codectest and libavtest.
Originally committed as revision 11646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 01:37:19 +00:00
Måns Rullgård 20963a7156 whitespace cosmetics
Originally committed as revision 11634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-27 14:55:16 +00:00
Måns Rullgård a11f43a466 remove some ifeq ($(CONFIG_FOO),yes)
Originally committed as revision 11633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-27 14:55:13 +00:00
Diego Biurrun 1521c500da Merge rules for tools/* into a generic rule.
Originally committed as revision 11620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 18:41:20 +00:00
Diego Biurrun 2b258bbaad Properly remove tools on clean.
Originally committed as revision 11619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 13:43:40 +00:00
Diego Pettenò fc900b7b65 Make .vhookdep depend on version.h, same as .depend.
patch by Diego 'Flameeyes' Pettenò, flameeyes gmail com

Originally committed as revision 11543 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-16 22:43:04 +00:00
Diego Biurrun d75dcfdceb Add compilation rule for tools/pktdumper.
Originally committed as revision 11530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-14 22:23:53 +00:00
Diego Biurrun 6da7cc8185 Add compilation rule for tools/trasher.
Originally committed as revision 11475 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-08 23:02:39 +00:00
Luca Abeni c721d803cb Introduce libavdevice
Originally committed as revision 11077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-22 16:10:02 +00:00
Diego Biurrun 1c2211bd4e Quote paths in uninstall commands where necessary.
Originally committed as revision 10927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-04 23:00:22 +00:00
Diego Biurrun ff21c1b056 Remove redundant -DHAVE_AV_CONFIG_H from tests/seek_test command.
Originally committed as revision 10885 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-31 11:38:08 +00:00
Diego Biurrun 2a4592fedc Clarify comment about gcc -MM.
Originally committed as revision 10875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-30 08:01:48 +00:00
Diego Biurrun ef59bf60c0 Fix uninstall-vhook, SLIBSUF was being left out.
Originally committed as revision 10842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-22 18:09:10 +00:00
Diego Biurrun 282db5fde0 Fix make install of man pages when PROGS is empty.
Originally committed as revision 10841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-22 18:01:33 +00:00
Diego Biurrun 1217916b0d Fix make install when PROGS is empty.
Originally committed as revision 10840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-22 18:00:31 +00:00
Diego Biurrun e1a3a63f13 Further simplify install-progs prerequisites, no need to duplicate PROGS.
Originally committed as revision 10839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-22 17:21:38 +00:00
Diego Biurrun c4fa7ebcda Simplify install-progs prerequisite declaration.
Originally committed as revision 10838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-22 17:15:12 +00:00
Stefano Sabatini 2c8c502182 Make distclean should remove .vhookdep.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 10501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-15 09:49:27 +00:00
Dave Yeo 65f379920f Recurse into libswscale on uninstall.
patch by Dave Yeo, daveryeo telus net

Originally committed as revision 10479 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-12 09:35:30 +00:00
Diego Biurrun 06396e1193 10l: Actually add the .libs dependency to the seek_test binary,
not the phony seektest target.

Originally committed as revision 10258 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-28 23:29:07 +00:00
Diego Biurrun d0e1cd3d9e Split FFmpeg documentation into general documentation and the documentation
of the ffmpeg command line program.

Originally committed as revision 10255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-28 06:22:57 +00:00
Wolfram Gloger d664a6255b Give seektest .libs dependency so that it gets updated on libavformat changes.
patch by Wolfram Gloger, wmglo dent.med.uni-muenchen de

Originally committed as revision 10246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-27 08:42:23 +00:00
Diego Biurrun a5a5984a25 cosmetics: Insert empty line for readability.
Originally committed as revision 10245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-27 08:40:16 +00:00
Stefano Sabatini 4ce5df0856 Make ffserver use cmdutils.c show_license function
patch by Stefano Sabatini: [stefano sabatini minus lala ! poste it]

Originally committed as revision 10183 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-22 13:10:25 +00:00
Diego Biurrun 22a324da72 cosmetics: Use uppercase names for installation directories in makefiles.
Originally committed as revision 9776 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-21 18:53:06 +00:00
Benoit Fouet 83ef1fea65 fix tools compilation
Originally committed as revision 9712 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-17 08:28:48 +00:00
Måns Rullgård c07ed8c8a2 create and populate "tools" directory
Originally committed as revision 9634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-13 21:33:24 +00:00
Måns Rullgård fdc1973e30 libavtest and seektest no longer need gpl
Originally committed as revision 9633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-13 17:41:28 +00:00
Måns Rullgård 7d6ac9a319 prettify conditional targets
Originally committed as revision 9566 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-09 20:42:00 +00:00
Måns Rullgård cbefadbd25 whitespace cosmetics
Originally committed as revision 9565 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-09 20:41:58 +00:00
Måns Rullgård dd9f3d9791 clean up vhook variables
Originally committed as revision 9564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-09 20:22:16 +00:00
Diego Biurrun 742c94cbb4 10l: The ppm video hook depends on fork().
This dependency was apparently accidentally lost while making
the vhook build process non-recursive.

Originally committed as revision 9562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-09 19:28:18 +00:00
Måns Rullgård 3b26ee4719 fix build after breakage in r9544
Originally committed as revision 9546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-08 17:47:15 +00:00
Diego Biurrun ed5614eb56 Make vhook build non-recursive.
Originally committed as revision 9544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-08 15:16:25 +00:00
Diego Biurrun d6cfad679a Revert videohook dependency change.
Originally committed as revision 9368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-19 06:27:11 +00:00
Diego Biurrun 819f3ab6f5 The video hooks do not depend on the libav* libraries.
Originally committed as revision 9281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-11 08:14:45 +00:00
Diego Biurrun b8d4082552 We do not create .d files, thus no need to remove them.
Originally committed as revision 9278 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-10 21:48:54 +00:00
Diego Biurrun fa62bdb868 Move libpostproc-specific uninstallation command to the libpostproc Makefile.
Originally committed as revision 9277 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-10 21:29:56 +00:00
Diego Biurrun 06694949b4 Use consistent paths for adding values to LDFLAGS.
Originally committed as revision 9276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-10 21:19:15 +00:00
Diego Biurrun 364a960704 Move HAVE_AV_CONFIG_H definition to the Makefile like in the rest of FFmpeg.
Originally committed as revision 9273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-10 14:34:56 +00:00
Diego Biurrun bb8fe69a09 whitespace cosmetics
Originally committed as revision 9272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-10 14:28:42 +00:00
Diego Biurrun 4566de5707 Simplify ffplay.o CFLAGS handling.
Originally committed as revision 9271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-10 14:21:53 +00:00
Diego Biurrun 18caf192e7 Compile all binaries with default CFLAGS.
Originally committed as revision 9270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-10 14:21:07 +00:00
Diego Biurrun ed7bf3c3c8 Simplify command with automatic variable.
Originally committed as revision 9267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-10 14:05:12 +00:00
Diego Biurrun b13cdd333f Remove stray commented out line, fix individual regression test dependencies.
Originally committed as revision 9259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-08 19:05:48 +00:00
Diego Biurrun 4fbd52f0b8 Merge tests Makefile into the top-level Makefile.
This gets rid of some recursion and simplifies the code.

Originally committed as revision 9255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-07 22:36:39 +00:00
Diego Biurrun 5e2dfd3906 Add seektest to top-level targets, remove individual codec tests.
Originally committed as revision 9126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-25 13:12:17 +00:00
Diego Biurrun e9b19db82b Make documentation build nonrecursive: Merge it into the top-level Makefile.
Originally committed as revision 9042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-17 08:39:50 +00:00
Måns Rullgård 7f0f6e13a7 include only files actually built in SRCS
Originally committed as revision 8289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-08 00:24:14 +00:00
Måns Rullgård 42a4ca83ea remove useless OBJS variable
Originally committed as revision 8154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-27 22:56:02 +00:00