1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

243 Commits

Author SHA1 Message Date
Diego Biurrun
873b092353 version.h should depend on config.mak.
The extra version string that is passed to configure is recorded in config.mak
and changes to config.mak can therefore make version.h rebuilds necessary.

Originally committed as revision 17730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-02 09:33:57 +00:00
Måns Rullgård
f2f35d3364 Fix version.h dependency on version.sh
Originally committed as revision 16801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-26 09:24:52 +00:00
Diego Biurrun
1db2c5c9ef version.h depends on version.sh.
Originally committed as revision 16799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-26 09:10:04 +00:00
Diego Biurrun
7b5e8a274a Extend 'checkheaders' target to architecture-specific subdirectories.
Originally committed as revision 16559 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 22:48:07 +00:00
Diego Biurrun
a6493a8fbd Rename libavcodec/i386/ --> libavcodec/x86/.
It contains optimizations that are not specific to i386 and
libavutil uses this naming scheme already.

Originally committed as revision 16270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-22 09:12:42 +00:00
Måns Rullgård
c87348a922 Use OBJS variable for all object files
There is no longer any need to differentiate the object files
by source type.

Originally committed as revision 15708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-25 14:00:28 +00:00
Måns Rullgård
0ca1656a2b Remove unused SRCS make variable
Originally committed as revision 15707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-25 14:00:26 +00:00
Diego Biurrun
ac63af34b5 Add support for passing a version string to configure that is appended to
FFmpeg's version string output. This can be used by distributions to mark
their packages as being modified versions without hacking the sources.

Originally committed as revision 15433 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 21:37:50 +00:00
Michael Niedermayer
488b1ca476 10000l, revert mistakely commited and unrelated hunk.
Originally committed as revision 14730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 18:20:54 +00:00
Michael Niedermayer
ad1d871021 Move -D_ISOC9X_SOURCE to configure so its available to all tests.
Originally committed as revision 14729 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 18:17:26 +00:00
Loren Merritt
304d586de6 yasm buildsystem
Originally committed as revision 14696 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-11 23:53:31 +00:00
Måns Rullgård
18c640054c regenerate dependencies when building object files
Originally committed as revision 14143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-09 19:09:50 +00:00
Måns Rullgård
9e6165b53e enable version.h to be created from subdirs
Originally committed as revision 13819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 16:57:38 +00:00
Diego Biurrun
25cd5cb33c Generate pkg-config files in each library subdirectory so that they do
not clutter the root of the source tree.

Originally committed as revision 13780 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-16 18:01:55 +00:00
Måns Rullgård
0147b92ea5 Revert "Add version information to DLLs."
Revert "Forgot to commit changes to subdir.mak in last revision."

Originally committed as revision 13426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 06:34:57 +00:00
Jeremy Kolb
3f28da61de Add version information to DLLs.
Patch by Jeremy Kolb.

Originally committed as revision 13379 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 14:09:56 +00:00
Diego Biurrun
9b3cdc2ece Remove -I flags pointing to local paths, they are no longer necessary.
Originally committed as revision 13100 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 12:12:13 +00:00
Måns Rullgård
bf237413f3 fix make tests in subdirs
Originally committed as revision 12893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-18 19:28:40 +00:00
Måns Rullgård
b153c68b8a fix building of test programs (make tests)
Originally committed as revision 12867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 21:50:41 +00:00
Diego Biurrun
16507ddd6b Add DIRS variable to the list of variables to be cleared instead of
unsetting it manually.

Originally committed as revision 12825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 21:39:56 +00:00
Diego Biurrun
e825656f1d Clear DIRS variable in common.mak, so it does not have to be cleared in
each subdirectory Makefile.

Originally committed as revision 12803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 10:37:30 +00:00
Diego Biurrun
95d2afec0f Remove all dependency files on distclean.
Originally committed as revision 12802 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 10:23:38 +00:00
Diego Biurrun
adc393503f Generate the list of files to clean in subdirectories in common.mak.
This way, it can be used from all directories.

Originally committed as revision 12800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 10:09:47 +00:00
Diego Biurrun
d4210e2a4b Split CLEANFILES variable into CLEANSUFFIXES and LIBSUFFIXES.
Originally committed as revision 12799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 09:59:36 +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
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
8e255b8bda replace some ifeq with prettier ifdef
Originally committed as revision 12764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-07 22:17:47 +00:00
Måns Rullgård
dbe6c6ff00 append TESTS-yes to TESTS; one ifeq less
Originally committed as revision 12763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-07 22:17:44 +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
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
7b3ca33fb6 Fix circular dependency between install-progs and install-libs targets.
Originally committed as revision 12611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 01:40:49 +00:00
François Revol
0d14ab27a8 Fix building with C++ objects, variable names were inconsistent.
Originally committed as revision 12608 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 16:10:18 +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
Måns Rullgård
c415857d06 rename LIBSRC to SRC_DIR, add quotes where SRC_DIR was used
Originally committed as revision 12452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-15 19:24:03 +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
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
88855b51cd Work around gcc stupidity: With -MM gcc outputs just the basename of files as
target name. This breaks when compiling targets in subdirectories, so prepend
the subdirectory name to the target name.

Originally committed as revision 12398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 18:29:41 +00:00
Måns Rullgård
0e32c8c65a simplify library version handling
Originally committed as revision 12362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-07 19:27:17 +00:00
Måns Rullgård
5671fc14f6 consolidate CFLAGS, LDFLAGS, EXTRALIBS assignment
Originally committed as revision 12354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 20:44:44 +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
Måns Rullgård
76a448ed4f Install headers in $prefix/include/$libname
Install each library's headers in $prefix/include/$libname.
The installed headers use #include "lib*/*.h"; applications
are expected to do the same.

Specify only $prefix/include in .pc files.

Originally committed as revision 12194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 09:22:11 +00:00
Diego Biurrun
bca9e0bcf1 Move common test program infrastructure to common.mak.
Originally committed as revision 11645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-27 23:28:56 +00:00
Dave Yeo
d22e844250 OS/2 support restored in cleaner form.
patch by Dave Yeo, daveryeo telus net

Originally committed as revision 11172 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-05 23:15:24 +00:00
Diego Biurrun
582c1c47da Declare libpostproc prerequisites directly instead of using a layer of
indirection. This moves build system workarounds closer to libpostproc
where they are really needed.

Originally committed as revision 10874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-30 07:54:18 +00:00
Diego Biurrun
71fa13e875 Simplify install-libs prerequisite generation.
Originally committed as revision 10844 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-23 06:51:44 +00:00
Diego Biurrun
24743a767f Rename LIB to LIBNAME for consistency.
Originally committed as revision 10774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 09:34:49 +00:00
Dave Yeo
5b5d0491b5 Add SLIB_UNINSTALL_EXTRA_COMMAND to uninstall the things installed via
SLIB_INSTALL_EXTRA_COMMAND.
patch by Dave Yeo, daveryeo telus net

Originally committed as revision 10767 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-17 13:48:47 +00:00
Dave Yeo
2036977325 ln is not available on all platforms, so introduce a variable for it
that can be set to a suitable platform-specific command.
patch by Dave Yeo, daveryeo telus net

Originally committed as revision 10503 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-15 11:09:30 +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
Ramiro Polla
b8ef6423c7 Remove EXTRADEPS from common.mak since it is no longer used
Originally committed as revision 9766 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-19 21:44:33 +00:00
Måns Rullgård
e4d86a5790 add "checkheaders" target
Originally committed as revision 9346 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-17 00:05:39 +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
1963f5e379 readability cosmetics
Originally committed as revision 9195 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-03 23:11:13 +00:00
Diego Biurrun
2d93bcc784 Add CPP_OBJS-yes to CPP_OBJS, same as the other *_OBJS variables.
Originally committed as revision 8616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-03 16:32:11 +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
722dabcc94 Move conditional CFLAGS and OBJS setting to common place.
Originally committed as revision 7699 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-25 00:34:38 +00:00
Diego Biurrun
6718659c0f Remove BeOS hack.
Originally committed as revision 7634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 23:27:30 +00:00
Ramiro Polla
8fbec4f4d0 Install generated .lib files in shlibdir on MinGW.
patch by Ramiro Polla, ramiro lisha.ufsc br

Originally committed as revision 7356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-22 05:29:14 +00:00
Diego Biurrun
167de74f10 Remove redundant comment.
Originally committed as revision 7167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-25 15:44:55 +00:00
Diego Biurrun
009618ea0d Remove duplicate *.lib from rm command.
Originally committed as revision 7084 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-15 01:55:46 +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
14f29f795d Revert putting EXTRALIBS in common.mak, linking fails on MinGW.
Originally committed as revision 6700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-15 12:59:45 +00:00
Diego Biurrun
dadb850a50 Move CFLAGS handling to common.mak.
Originally committed as revision 6642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-11 08:30:13 +00:00
Víctor Paesa
76808d6e7e Quote names individually, since otherwise the whole list was understood
as a single long filename by the shell.
patch by Víctor Paesa, wzrlpy arsystel com

Originally committed as revision 6589 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-08 14:14:33 +00:00
Diego Biurrun
c6c4651138 Simplify test program build.
Originally committed as revision 6563 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-05 17:10:33 +00:00
Diego Biurrun
3aba428998 Libraries are created in the build tree, not in the source tree.
Originally committed as revision 6555 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-04 16:22:14 +00:00
Diego Biurrun
db671614cc Replace .. by $(SRC_PATH), otherwise there might be problems with
out-of-tree builds.

Originally committed as revision 6553 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-04 13:47:30 +00:00
Diego Biurrun
0533322ea3 Move EXTRALIBS handling to common.mak.
Originally committed as revision 6545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-03 19:23:39 +00:00
Diego Biurrun
9d0199f450 depend and dep are really the same target.
Originally committed as revision 6539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-03 17:47:04 +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
d7e27559b1 Mac OS X requires running ranlib on static libraries after installation.
Originally committed as revision 6001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-15 19:30:38 +00:00
Diego Biurrun
e35a3b7d65 Remove MinGW specialcasing and make shared library installation compatible
with MinGW where ln is emulated by cp.

Originally committed as revision 5930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-04 10:23:06 +00:00
Diego Biurrun
afa615327b Add quotes where necessary.
Originally committed as revision 5929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-04 10:13:10 +00:00
Diego Biurrun
a1309f8f61 Shared libraries now go in $(shlibdir), not $(libdir).
Originally committed as revision 5927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-03 22:50:54 +00:00
Diego Biurrun
5cb854e1c6 Move MinGW special casing for shared lib creation to configure.
Originally committed as revision 5921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-03 16:27:30 +00:00
Diego Biurrun
eb9ab5834c prettyprinting cosmetics
Originally committed as revision 5875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-31 22:34:51 +00:00
Diego Biurrun
b8e10478eb Create $(shlibdir), not $(libdir) for shared libs.
Originally committed as revision 5874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-31 22:30:32 +00:00
Diego Biurrun
84c22efdfb Create infrastructure to install shared and static libs into different places.
based on patch by Víctor Paesa wzrlpy at arsystel com

Originally committed as revision 5755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-15 23:01:52 +00:00
Diego Biurrun
b8635ec6ef Also remove versioned .so files on make clean.
Originally committed as revision 5719 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-11 23:09:19 +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
7b0cd9ee2b Move MinGW LDFLAGS setting to configure.
Originally committed as revision 5699 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-10 00:19:38 +00:00
Diego Biurrun
d7b34d0831 Move UltraSparc CFLAG addition to configure.
Originally committed as revision 5698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-10 00:12:38 +00:00
Måns Rullgård
42225a3058 remove redundant make variable SUBDIR
Originally committed as revision 5442 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-01 21:57:44 +00:00
Diego Biurrun
2afc0c12a7 Add a small comment about a part that should be in configure.
Originally committed as revision 5414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-27 12:57:54 +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
Måns Rullgård
baa3a93781 Create shared libraries using versioned filenames and add -rpath-link
to LDFLAGS so linker finds them when using --as-needed (which is default
in some installations).  Using --as-needed is generally a good thing, so
add that explicitly as well.

Originally committed as revision 5362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-11 20:36:00 +00:00
Diego Biurrun
06aa32ff18 Add EXTRADEPS variable for extra dependencies that need to be built first.
Originally committed as revision 5323 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-27 03:30:50 +00:00
Måns Rullgård
1540cfdcce SRCS must be set using := or things break when ASM_OBJS is added to OBJS
Originally committed as revision 5069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-27 02:47:05 +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
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