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
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
d530e57944
build: move vpath directives to main Makefile
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-14 19:53:53 +01:00
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
b9c6c7cb25
build: remove empty $(OBJS) target
...
This target was added to prevent some files being deleted
by make when using chains of implicit rules. This is no
longer required.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-07 01:28:40 +01:00
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
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
171ae1eb0d
build: remove stale dependency
...
This dependency is implicitly covered elsewhere.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-06 15:52:23 +01:00
5eaba041a0
build: do not add CFLAGS-yes to CFLAGS
...
CFLAGS-yes is never set so this serves no purpose.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-06 15:48:44 +01:00
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
2f97b12eaf
Include dependencies for test programs
...
This makes sure the various *-test programs are correctly rebuilt
when necessary.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-31 12:01:27 +01:00
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
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
55127e7b49
Create config.asm for use with yasm
...
Originally committed as revision 25039 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-03 21:27:19 +00:00
6fa5a91b14
Remove dep/depend targets and related variables.
...
We no longer create dependency files directly, so the rules are now pointless.
Originally committed as revision 24807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 15:02:33 +00:00
aac6ca6978
Add libavcore.
...
The new library is meant to contain the core multimedia utilities for
FFmpeg, to make them shareable between more libav* libraries.
See thread:
Subject: [FFmpeg-devel] [RFC] New library for shared non-generic libav* utils
Date: Fri, 9 Jul 2010 01:07:40 +0200
Originally committed as revision 24393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 18:28:42 +00:00
11d788cade
Stop make complaining about moved/deleted headers
...
Originally committed as revision 24041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-04 18:33:37 +00:00
7f02d3570a
Add -I flags to HOSTCFLAGS
...
Originally committed as revision 23805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-26 20:28:40 +00:00
bf9aa44bf4
Fix brief make messages when CC etc are specified on command line
...
Originally committed as revision 23792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-26 10:03:30 +00:00
de5aba8cca
Make ranlib silent in brief output mode
...
Running ranlib is quick and uninteresting, no need to print it.
Originally committed as revision 22582 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-17 14:43:03 +00:00
7732f641ff
Fix brief make output for generated tables
...
Originally committed as revision 22526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 19:48:09 +00:00
0680c40a25
Remove .SECONDARY directive
...
The presence of the .SECONDARY directive caused thing to not always
be correctly rebuilt. Mentioning the object files explicitly as
targets gives the desired result of make not deleting them without
unpleasant side-effects.
Originally committed as revision 22422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 02:57:01 +00:00
6a53fffd77
Improve version.h generation
...
Force version.sh to run whenever the version might have changed,
regardless of what is being built. This is done by attaching the
dependencies to a dummy file (.version) which is included from the
makefile. As make will always attempt to rebuild any included files
before considering other rules, this ensures that the real version.h
is (re-)created before it is required by any source file.
Originally committed as revision 22420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 02:56:56 +00:00
93bff1de77
Replace $(G) with more generic $(M) in silent make rules
...
Originally committed as revision 22419 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 02:56:52 +00:00
86be2bc36f
Prettify make output for documentation
...
Originally committed as revision 22418 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 02:56:50 +00:00
a736e0e5c2
Prettify make output when generating headers
...
Originally committed as revision 22401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 15:56:16 +00:00
451db9832c
Simplify static/shared build rules
...
Originally committed as revision 22394 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 14:58:18 +00:00
7acc01042e
Remove duplicates from OBJS
...
Originally committed as revision 22391 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 14:58:08 +00:00
f89c14027a
checkheaders: skip per-arch headers not meant for direct inclusion
...
Some of the per-arch headers are only meant to be used through
the parent header of the same name. Testing these standalone
does not make sense.
Originally committed as revision 22341 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 20:17:47 +00:00
2a5500b13e
Add TESTOBJS make variable for extra objects used by test apps
...
Originally committed as revision 22335 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 18:43:44 +00:00
9b55e2e727
Skip cmdutils_common_opts.h fragment in checkheaders
...
Originally committed as revision 22333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 18:43:38 +00:00
72c2bdebcf
Define HAVE_AV_CONFIG_H only when building libraries
...
Originally committed as revision 22294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 22:18:33 +00:00
a0ac950109
Fix build with compilers using a separate dependency command
...
Originally committed as revision 22249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 19:29:29 +00:00
63611f31e8
Prettify make output
...
This gives brief messages from make by default. For full command
echoing, add V=1 to make command line.
Originally committed as revision 22244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:14:19 +00:00
1d53620311
Stop make deleting intermediate files (ffmpeg.o and friends)
...
Originally committed as revision 22094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-27 15:25:28 +00:00
f3a572ca14
Disable suffix rules
...
Most of the make builtin rules, which we do not need, are suffix rules,
and we use only new-style pattern rules. Disabling suffix rules saves
some time when building on slow systems.
Originally committed as revision 22064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 23:27:54 +00:00
8be0a5c384
Move ECFLAGS so it doesn't get added multiple times
...
Originally committed as revision 21520 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 23:30:24 +00:00
604b2f5276
Append ECFLAGS to CFLAGS
...
This makes it easy to supply extra flags on the make command line
for testing purposes.
Originally committed as revision 21515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 20:13:46 +00:00
d3cb93b374
Revert r21226, it was a joke:
...
Get one step closer to world domination.
Remove "make uninstall".
Originally committed as revision 21466 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-26 22:23:12 +00:00
a482e61bd6
Add symbol versioning for shared libraries
...
Based on patch by Reinhard Tartler <siretart tauware de>
Originally committed as revision 21236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-16 04:49:02 +00:00
93fe7eb68d
Get one step closer to world domination.
...
Remove "make uninstall".
Originally committed as revision 21226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-15 19:16:28 +00:00
79de9c83e0
Delete *.d files with make clean
...
Originally committed as revision 20577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-22 14:22:13 +00:00
de4070b520
Add generic rules for building helpers with HOSTCC
...
Originally committed as revision 20412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-29 00:55:35 +00:00
bce7b696a2
Add PIC flags early so tests they affect give correct results
...
This is mainly the checks for ebx on x86, but possibly others too.
Originally committed as revision 19687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-23 13:46:07 +00:00
95f2c769c3
Skip headers requiring external libs not present in checkheaders
...
Originally committed as revision 19685 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-23 11:02:37 +00:00
07dec06e6a
Generate dependencies while compiling if supported by compiler
...
Originally committed as revision 19609 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-08 18:27:27 +00:00
c1c3933a98
Generate dependencies when object files are built
...
Originally committed as revision 19608 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-08 18:27:22 +00:00
bea81a52c9
Replace BUILD_{SHARED,STATIC} with CONFIG_ counterparts
...
Originally committed as revision 19527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-28 08:58:48 +00:00
adcb219081
Move output redirection of deps generation from make rule to DEPEND_CMD
...
Originally committed as revision 19493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-22 22:30:20 +00:00
04a803bef4
Append the user CPPFLAGS value to the CPPFLAGS used for compilation,
...
rather than prepend it.
This way there is the guarantee that the included headers are those in
the FFmpeg sources, rather than pre-installed headers referenced by
the user CPPFLAGS.
Originally committed as revision 19416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 15:50:25 +00:00
2f2e6c7ce1
Pass ASFLAGS to assembler instead of CFLAGS
...
Originally committed as revision 19412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:29:53 +00:00
7e6c86e65d
Allow unusual ways of specifying compiler output file
...
Some compilers do not use the typical -c -o foo.o style.
This allows compiler-specific equivalents to be set by the
configure script.
Originally committed as revision 19409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:29:46 +00:00
3198f6187a
Set CFLAGS directly in config.mak instead of using OPTFLAGS
...
Originally committed as revision 19406 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:29:38 +00:00
50a334e426
Separate C preprocessor flags into CPPFLAGS variable
...
Originally committed as revision 19404 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:29:32 +00:00
8e8a67faec
Move *.map from LIBSUFFIXES to CLEANSUFFIXES, executables on OS/2 have
...
generated map files as well, so map files need to be removed in all
places where executables are removed.
patch by Dave Yeo, daveryeo telus net
Originally committed as revision 18981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-29 11:56:54 +00:00
b4c80b649e
Fix building from within subdirs
...
Originally committed as revision 18881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-20 10:24:59 +00:00
c5662879ff
Move addition of MMX-OBJS to OBJS into common.mak instead of duplicating it.
...
Originally committed as revision 18478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 22:48:44 +00:00
bdc2cc16eb
Always use -L flags for all subdirs
...
Originally committed as revision 18295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-01 00:53:25 +00:00
3fd422ff77
Move make rules applicable only to subdirs into subdir.mak
...
Originally committed as revision 18294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-01 00:53:22 +00:00
43a0cb7ca2
Generalize example target rule in common.mak so that it sets a -example$(EXESUF)
...
suffix for all example files instead of doing this in individual Makefiles.
Originally committed as revision 18217 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-29 14:35:20 +00:00
3344cf851c
Use a wildcard match instead of a list to remove test programs.
...
This is robust against renames and also removes test programs not
(yet) hooked up in the main Makefiles.
Originally committed as revision 18193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-26 10:12:21 +00:00
7304c2c4ce
Move adding the '-test$(EXESUF)' suffix to test programs into common.mak.
...
Originally committed as revision 18189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-25 18:19:20 +00:00
6ccf540fa5
prettyprinting cosmetics
...
Originally committed as revision 18188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-25 18:14:28 +00:00
661ce28996
Rename 'tests' target to 'testprogs'. It is too easily confused with the
...
'test' target and a directory named tests exists.
Originally committed as revision 18165 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 23:13:21 +00:00
6708cfc4d3
Add rule for building API example programs.
...
Originally committed as revision 18161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 22:33:41 +00:00
0cc647cbfb
Mark all clean targets as phony.
...
Originally committed as revision 17950 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-13 15:55:16 +00:00
313c46a610
Compile .S files with $(AS), set it in configure
...
Assembler files using the GNU syntax need to be processed by gcc,
whichever compiler is used for C files.
Originally committed as revision 17827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-05 21:20:01 +00:00
9d821fc2d2
Do not add -D_FILE_OFFSET_BITS=64 and -D_LARGEFILE_SOURCE unconditionally to
...
CFLAGS. Apparently there are some systems that do not like these definitions.
Originally committed as revision 17755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 12:52:12 +00:00
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
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
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
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
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
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
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
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
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
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
304d586de6
yasm buildsystem
...
Originally committed as revision 14696 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-11 23:53:31 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
71c61f62a3
non-recursive makefiles
...
Originally committed as revision 12760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-07 21:16:31 +00:00
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
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
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
Mans Rullgard