Commit Graph

218 Commits

Author SHA1 Message Date
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
Måns Rullgård
4c9b0af57b simplify conditional targets
Originally committed as revision 8153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-27 22:51:30 +00:00
Måns Rullgård
0cb8579af2 simplify
Originally committed as revision 8152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-27 19:00:26 +00:00
Diego Biurrun
6ca0c110f5 Simplify .depend file inclusion.
Originally committed as revision 8104 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-23 23:44:48 +00:00
Ramiro Polla
ca3798dc22 Remove installstrip in favor of explicit strip; better for cross-compilation.
patch by Ramiro Ribeiro Polla, ramiro lisha.ufsc br

Originally committed as revision 7709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-25 12:29:48 +00:00
Diego Biurrun
7a7be12663 comment typo
Originally committed as revision 7708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-25 12:13:15 +00:00
Diego Biurrun
634444f4ce PROGS depends on PROGS_G so depending on just PROGS is enough.
Originally committed as revision 7700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-25 00:39:32 +00:00
Måns Rullgård
a4da50e17f make version.h depend on .svn/entries
Originally committed as revision 7377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-26 17:25:16 +00:00
Måns Rullgård
da34f7ac23 do not use non-standard test -nt
Originally committed as revision 7252 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 19:25:04 +00:00
Diego Biurrun
cb741242a1 Nuke config.log support.
Originally committed as revision 7141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-20 21:46:43 +00:00
Diego Biurrun
3e4134f697 Also remove cws2fws on clean.
Originally committed as revision 7086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-15 02:13:11 +00:00
Diego Biurrun
4d15aae193 Do not build output_example and qt-faststart by default.
Originally committed as revision 7085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-15 02:11:24 +00:00
Diego Biurrun
c5173a3b09 Remove ifneq MINGW condition around man page uninstallation. We don't do
OS-dependent conditions in Makefiles anymore and I doubt this is correct.
If it turns out to be a problem it can easily be fixed.

Originally committed as revision 7083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-15 01:45:19 +00:00
Diego Biurrun
9464f2b836 Move BeOS extralibs handling into configure.
Originally committed as revision 7082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-15 01:36:16 +00:00
Diego Biurrun
bedb355098 Remove tar target, it's hardly useful.
Originally committed as revision 7080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-15 00:51:07 +00:00
Diego Biurrun
8233b75041 Make man page installation dependent on documentation generation.
Originally committed as revision 7042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 02:53:59 +00:00
Diego Biurrun
c21fb33916 Remove ifneq MINGW condition around man page installation. We don't do
OS-dependent conditions in Makefiles anymore and I doubt this is correct.
If it turns out to be a problem it can easily be fixed.

Originally committed as revision 7028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 00:50:05 +00:00
Måns Rullgård
0032cac2c9 fix make dep with some gcc versions
Originally committed as revision 6988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-12 16:37:32 +00:00
Diego Biurrun
354ca798b2 slight simplification
Originally committed as revision 6984 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-12 16:07:14 +00:00
Måns Rullgård
3894bc74db fix make dep for out of tree builds
Originally committed as revision 6974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-11 20:58:32 +00:00
Måns Rullgård
d226c75084 rename HAVE_VHOOK/BUILD_VHOOK to CONFIG_VHOOK
Originally committed as revision 6949 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-08 23:18:18 +00:00
Måns Rullgård
997baf0141 allow spaces in source and build directory names
out of tree builds from a source dir with spaces is impossible
due to how make handles vpath

Originally committed as revision 6938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-08 00:02:15 +00:00
Diego Biurrun
786b30af26 Add option to disable ffmpeg build.
Patch taken from the Debian package by Sam Hocevar.

Originally committed as revision 6871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-02 17:09:47 +00:00
Luca Abeni
a163ed1aaa Do not use a fake libavcodec/swscale.h, but always use the real one
(from libswscale) instead

Originally committed as revision 6777 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-23 17:06:32 +00:00
Diego Biurrun
84471efd91 Consistently use $(BUILD_ROOT).
Originally committed as revision 6699 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-15 12:57:47 +00:00
Diego Biurrun
cbeee4d8e5 Replace -I../-I. by -I$(BUILD_ROOT).
Originally committed as revision 6572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 09:22:44 +00:00
Diego Biurrun
3263626feb Mark all phony targets as such.
Originally committed as revision 6538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-03 17:42:17 +00:00
Diego Biurrun
902d3c6d33 Add codectest to test targets.
Originally committed as revision 6532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 16:56:09 +00:00
Diego Biurrun
eaa6d7b683 make depend should recurse into libswscale as well.
Originally committed as revision 6406 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-01 16:33:31 +00:00
Diego Biurrun
4054e2452f Remove bogus .PHONY declaration from version.h target.
Should fix make dep to be invoked before distclean under some circumstances.

Originally committed as revision 6405 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-01 15:24:31 +00:00
Måns Rullgård
496cfa3c9e ffmpeg, ffplay, ffserver need version.h
Originally committed as revision 6242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-12 23:13:22 +00:00
Diego Biurrun
691c480e7f Fix 'make depend' for libpostproc.
Originally committed as revision 6238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-12 10:33:27 +00:00
Måns Rullgård
f3cd195aac add our -L flags before any other linker flags
Originally committed as revision 6220 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-10 14:13:19 +00:00
Måns Rullgård
3acc68b4ff fix out of tree builds
Originally committed as revision 6214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-09 17:28:53 +00:00
Panagiotis Issaris
8dc6f118b7 Add -lav* to the front of LDFLAGS, fixes linking on Linux.
patch by Panagiotis Issaris, takis.issaris uhasselt be

Originally committed as revision 6204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-08 19:36:21 +00:00
Diego Biurrun
6de9e50649 FFLIBS --> EXTRALIBS
Originally committed as revision 6203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-08 18:28:58 +00:00
Diego Biurrun
f381af7b7f Remove pointless variable indirection.
Originally committed as revision 6202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-08 18:17:50 +00:00
Diego Biurrun
a9550eb670 simplify
Originally committed as revision 6201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-08 18:17:08 +00:00
Diego Biurrun
cc654dd7b6 FFLIBDIRS --> LDFLAGS
Originally committed as revision 6200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-08 18:06:22 +00:00
Diego Biurrun
91beada72a Some gcc versions dislike version.h to appear in the list of files to
compile dependencies for.

Originally committed as revision 6144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-31 18:30:41 +00:00
Diego Biurrun
92c3ef657b FFMPEG_VERSION was moved to version.h.
hint by Ramiro Polla, angustia at arrozcru d.t no-ip d.t org

Originally committed as revision 6089 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-25 14:53:47 +00:00
Luca Abeni
790c9ca72a Enable swscale usage in ffmpeg
Originally committed as revision 5959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-08 18:51:38 +00:00
Diego Biurrun
c536cb09f9 Rename FFSLDFLAGS variable to FFSERVERLDFLAGS to lessen confusion.
Originally committed as revision 5817 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-24 00:52:42 +00:00
Måns Rullgård
4b65d88fd7 replace -D_GNU_SOURCE with -D_ISOC9X_SOURCE to avoid accidental use
of gnu extensions

Originally committed as revision 5733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-13 23:10:01 +00:00
Diego Biurrun
2f30a81d19 CONFIG_WIN32 implies MinGW and Cygwin and possibly more, so use just
CONFIG_MINGW or __MINGW32__ instead.

Originally committed as revision 5718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-11 21:45:45 +00:00
Diego Biurrun
1db54e20ff Move gprof compiler flag handling to configure.
Originally committed as revision 5701 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-10 00:49:16 +00:00
Diego Biurrun
dea4953d82 Remove silly TEST variable that is used in one line but not directly above.
Originally committed as revision 5700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-10 00:29:33 +00:00
Diego Biurrun
f130fd4630 cosmetics: Break overly long lines.
Originally committed as revision 5622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-05 14:12:00 +00:00
Diego Biurrun
5c6a5d584e simplify
Originally committed as revision 5581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-02 18:24:11 +00:00
Luca Barbato
bf8409947f make distclean clean everything
Originally committed as revision 5580 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-02 18:17:30 +00:00
Måns Rullgård
54003e1a70 get svn version when using separate build tree
Originally committed as revision 5539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-28 20:46:58 +00:00
Diego Biurrun
fd071c2659 .depend needs version.h, noticed by Uoti Urpala
Originally committed as revision 5510 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-22 21:28:30 +00:00
Diego Biurrun
f1cc88a5d6 Use Subversion revision for FFMPEG_VERSION.
based on a patch by Ismail Dönmez ismail$$at$$pardus$$dot$$org$$dot$$tr

Originally committed as revision 5502 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-20 10:24:08 +00:00
Diego Biurrun
0cfd96cc1f Avoid binary stripping rule code duplication.
Originally committed as revision 5500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-19 23:26:46 +00:00
Måns Rullgård
5d38ba3384 put local -L flags first in link commands
Originally committed as revision 5494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-17 19:51:45 +00:00
Diego Biurrun
36b1b0bcc6 CVS --> Subversion
Originally committed as revision 5461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-09 13:13:08 +00:00
Diego Biurrun
ea0f0681a6 'make depend' should recurse into libavutil as well.
Originally committed as revision 5444 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-01 23:20:51 +00:00
Diego Biurrun
6d9a242106 libavcodec/libpostproc ---> libpostproc
Originally committed as revision 5440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-01 21:37:48 +00:00
Diego Biurrun
6b991cb29f Generate the list of all programs, unstripped programs and man pages in a more
elegant fashion and unconditionally remove all programs on clean.

Originally committed as revision 5400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-18 12:33:13 +00:00
Diego Biurrun
7d2f45464b Rename singular variables to more sensible plural form.
Originally committed as revision 5399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-18 12:19:07 +00:00
Diego Biurrun
f9edb71744 uninstallation support
inspired by a patch from Richard, richiek.,@,.optushome.,.,.com.,.,.au

Originally committed as revision 5398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-18 12:14:02 +00:00
Diego Biurrun
5d22ccf73f cosmetics: Prettyprint some commands.
Originally committed as revision 5395 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-18 08:40:15 +00:00
Diego Biurrun
1e7ffa50b7 Use '-' instead of '|| true' to ignore errors.
Originally committed as revision 5225 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-26 21:01:49 +00:00
Baptiste Coudurier
95ca7c94e4 use CFLAGS when compiling qt-faststart, to enable largefile support
Originally committed as revision 5168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-16 00:15:30 +00:00
Måns Rullgård
c7bb67c485 Create installation directories in the common install-* targets.
This is needed for components that override install locations (libpostproc).

Originally committed as revision 5036 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-19 12:44:38 +00:00
Måns Rullgård
2fdd5a68d3 add quotes around $(libdir)
Originally committed as revision 5016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-13 14:28:32 +00:00
Måns Rullgård
8b2121e3de move common parts of makefiles into common.mak
Originally committed as revision 5015 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-13 12:53:25 +00:00
Alexander Strasser
46ff904f3d Build also ffserver (if configured) when doing `make test' .
approved by Diego

Originally committed as revision 4995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-11 21:44:55 +00:00
Diego Biurrun
1a9150b194 Move libpostproc compilation to the top-level Makefile.
Originally committed as revision 4993 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-11 21:42:11 +00:00
Diego Biurrun
dc2a1ce5c0 Simplify header installation.
Originally committed as revision 4986 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-11 19:30:55 +00:00
Diego Biurrun
a4848db6fe Make sure that install-progs has the proper dependencies when compiling
against shared libs.

Originally committed as revision 4984 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-11 19:01:54 +00:00
Diego Biurrun
b12f8273fa Separate library install into static and shared installation.
Originally committed as revision 4983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-11 18:50:45 +00:00
Diego Biurrun
f29f3b5d9f Separate header file installation from the general install target.
Originally committed as revision 4981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-11 17:44:06 +00:00
Diego Biurrun
1eb17b3c35 The install-progs target should depend on $(PROG).
Originally committed as revision 4979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-11 17:15:11 +00:00
Diego Biurrun
81dcdc53a3 Separate program installation into its own target.
Originally committed as revision 4978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-11 17:06:59 +00:00
Diego Biurrun
04c07634d6 Remove obscure Makefile.bak entry from distclean rules.
Originally committed as revision 4901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-26 23:42:30 +00:00
Diego Biurrun
767b49a56e Make sure that ffmpeg_g and ffplay_g get removed on 'make clean'.
Originally committed as revision 4893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-24 20:27:08 +00:00
Diego Biurrun
98013cc16c Make clean/distclean consistent throughout all the Makefiles.
Originally committed as revision 4863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-16 14:59:54 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Diego Biurrun
ea7e68b1e2 Remove .pc files on distclean.
Originally committed as revision 4648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-10-18 20:11:41 +00:00
j@v2v.cc
c99dd23307 Move all definitions of external dependencies into configure instead of
defining it in configure and the Makefiles in a random fashion.
patch by j -- at -- v2v -- dot -- cc

Originally committed as revision 4628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-10-04 11:19:08 +00:00
Justin Ruggles
6870a440ce configure libgsm patch by (Justin Ruggles: jruggle, earthlink net)
Originally committed as revision 4500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-08-10 08:49:10 +00:00
Alexander Strasser
c11c2bc20b libavutil: Utility code from libavcodec moved to a separate library.
Originally committed as revision 4489 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-08-01 20:07:05 +00:00
Charles Yates
eb94aca926 support BUILDSUF patch by <charles dot yates at pandora dot be>
Originally committed as revision 4203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-08 15:04:59 +00:00
Víctor Paesa
078a8dd66d ogg has to be at the right of vorbis patch by ("Víctor Paesa" wzrlpy hotmail com)
Originally committed as revision 4055 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-18 02:13:13 +00:00
Steven M. Schultz
c80d990fa9 changes 'make' in a couple places to $(MAKE) patch by ("Steven M. Schultz" <sms 2bsd com>)
Originally committed as revision 3988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-27 02:46:30 +00:00
Nilesh Bansal
5c5dea3f0c 01-makefile_fix_updated.patch
Adds --enable-theora/--enable-vorbis/--enable-ogg to configure
   If compiled WITHOUT --enable-theora, native VP3 decoder is used
patch by (Nilesh Bansal <nileshbansal gmail com>)

Originally committed as revision 3975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-24 15:18:02 +00:00
Philipp Matthias Hahn
8b8e1c5580 Out-of-directory build patch by (Philipp Matthias Hahn <pmhahn titan.lahn de>)
preserve support for spaces in directories in case of in-tree builds by (James A. Morrison <ja2morri csclub.uwaterloo ca>)

Originally committed as revision 3855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-21 22:16:05 +00:00
Roman Shaposhnik
f02be79d61 * Introducing IIDC1394 grabbing interface.
Use it with -grab dc1394

   * Introducing yet another packed pix_fmt in order to support some of
     the IIDC1394 modes: uyvy411 (Cb Y0 Y1 Cr Y2 Y3).

Originally committed as revision 3621 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-22 02:04:30 +00:00
Alex Beregszaszi
f7599d5ff0 cws2fws, utility to convert compressed flash files to uncompressed ones, which can be than played back with ffplay. note: this doesn't gets compiled automatically
Originally committed as revision 3598 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-16 11:08:49 +00:00
Michel Bardiaux
f255e0abfc config options log patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
Originally committed as revision 3582 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-11 19:50:50 +00:00
Zdenek Kabelac
2c7357793d * missing targets cleanup
Originally committed as revision 3564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-06 09:55:32 +00:00
Robert Lippmann
2b50a5a896 Fix link fail of ffserver on mingw with --enable-vorbis patch by ("Robert Lippmann" <rlippmann at imsventures dot com>)
Originally committed as revision 3560 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-05 18:15:26 +00:00
Michel Bardiaux
65d1bea201 Help debugging by keeping symbols ans line numbers patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
Originally committed as revision 3545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-01 13:32:13 +00:00
Michael Niedermayer
426c31a1a0 make dep fixes by (Måns Rullgård <mru at kth dot se>)
Originally committed as revision 3379 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-11 01:24:28 +00:00
Adam Thayer
1ddadfa9e3 XviD Support patch by (Adam Thayer <krevnik at comcast dot net>)
Originally committed as revision 3325 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-16 19:48:30 +00:00