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

56 Commits

Author SHA1 Message Date
Luca Barbato
8a54bfe83f build: make examples build normally
The link target was missing $(EXAMPLES)
2011-07-30 13:42:44 +02: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
Mans Rullgard
2f138f0b7c build: clean up library installation rules
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-07 17:57:47 +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
659aa20e56 build: improve rules for test programs
This generates dependencies for the *-test.o files ensuring
rebuilds when necessary.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-26 23:07:40 +01:00
Diego Biurrun
729f953fb5 build: Add DEP_LIBS dependency directly to the shared library build rule.
The dependency was added conditional to a variable that is always defined,
so it is safe to add it directly.
2011-06-25 13:02:51 +02: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
dc6632f119 build: simplify commands for clean target
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-03 19:33:32 +01: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
Ramiro Polla
a854bcdbec fix building test programs with gnu make 3.82
Test programs may be named either %.c or %-test.c. In some cases (ie. fft),
both files exist and make has to choose which rule to use. Up to gnu make
3.81, rules were applied in definition order, in this case favouring the
generic %.c rule from common.mak. gnu make 3.82 uses a shortest stem first
order, applying definition order for same length stems. In this case,
%-test.c must come first in order for make to pick the proper source file.

Originally committed as revision 25918 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-07 16:42:25 +00:00
Måns Rullgård
838c7c7407 Remove $(MSG) override for install-lib targets
This is no longer needed and causes incorrect output in some cases.

Originally committed as revision 22583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-17 14:43:05 +00:00
Måns Rullgård
0c8cc2c4d8 Reorder some make rules
I like it better this way.

Originally committed as revision 22397 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 14:58:29 +00:00
Måns Rullgård
d8e117ddfe Remove superflous ifdef CONFIG_{STATIC,SHARED} in makefiles
Originally committed as revision 22396 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 14:58:25 +00:00
Måns Rullgård
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
Måns Rullgård
8c5239b382 Move some make rules outside of eval'd block
These rules use only global variables and thus do not need to be expanded.

Originally committed as revision 22393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 14:58:15 +00:00
Måns Rullgård
477b338266 cosmetic: move some makefile variable definitions
Originally committed as revision 22392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 14:58:11 +00:00
Måns Rullgård
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
Måns Rullgård
09ad80855c Define HAVE_AV_CONFIG_H for checkheaders in libs
Originally committed as revision 22332 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 18:43:35 +00:00
Måns Rullgård
2f8ba7fc74 Define HAVE_AV_CONFIG_H when building test apps
Originally committed as revision 22330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 18:43:29 +00:00
Måns Rullgård
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
Måns Rullgård
5654067341 10l: fix make install with only shared libs
Originally committed as revision 22280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 15:46:22 +00:00
Måns Rullgård
bfca777713 Fix install with shared libs on weird systems
Originally committed as revision 22246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:45:38 +00:00
Måns Rullgård
6cfac0e908 Fix make install
Originally committed as revision 22245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:44:18 +00:00
Måns Rullgård
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
Måns Rullgård
34512bca0e Split install-headers target and simplify rules
Originally committed as revision 22243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:14:16 +00:00
Måns Rullgård
fd676deb96 Add INSTALL makefile variable
Originally committed as revision 22242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:14:13 +00:00
Måns Rullgård
b578357e59 Use mkdir -p to create directories
Originally committed as revision 22241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:14:11 +00:00
Måns Rullgård
a4aea515b0 Add YASMDEP variable; use for deps on yasm files
Originally committed as revision 22239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:14:06 +00:00
Måns Rullgård
50e10cbd7a Use $(RM) to delete files
Originally committed as revision 22234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 14:25:10 +00:00
Ramiro Polla
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
Måns Rullgård
38d7ad1954 Use $(CC_O) in %-test.o rules
Originally committed as revision 21350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-20 14:14:42 +00:00
Måns Rullgård
aa310a9fc7 Add rules to install generated headers
Originally committed as revision 21320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-19 04:40:13 +00:00
Måns Rullgård
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
Ramiro Polla
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
Måns Rullgård
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
Måns Rullgård
e273b0389f Makefile cosmetics
Originally committed as revision 20410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-28 20:46:21 +00:00
Måns Rullgård
b7c10b2a2b Fix dependency generation for yasm assembler files
Originally committed as revision 19683 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-23 11:02:32 +00:00
Måns Rullgård
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
Måns Rullgård
b0f0c43051 Use CPPFLAGS when building tests
Originally committed as revision 19446 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-16 22:29:17 +00:00
Måns Rullgård
684b28e09c Use LD for linking, default to same as CC
Originally committed as revision 19407 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:29:40 +00:00
Måns Rullgård
d349685bb9 Create shared libs correctly, fix mingw build
Originally committed as revision 18884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-20 18:37:34 +00:00
Diego Biurrun
9292bd7725 Remove example programs with a wildcard expression.
Originally committed as revision 18632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-20 11:14:19 +00:00
Måns Rullgård
33afad5451 Add $(ELIBS) to example/test app link command
Originally committed as revision 18298 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-01 00:53:34 +00:00
Måns Rullgård
bbba084b4f Make examples and test progs depend on libraries
Originally committed as revision 18297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-01 00:53:31 +00:00
Måns Rullgård
92c093c1b5 Link tests/examples with -lfoo instead of libfoo.a
Originally committed as revision 18296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-01 00:53:28 +00:00
Måns Rullgård
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
Diego Biurrun
3c3e0680b5 Use $< automatic variable to simplify some commands.
Originally committed as revision 18143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 13:00:15 +00:00
Måns Rullgård
93c021a242 Remove other shared lib names from linker command line for shared libs
Originally committed as revision 16103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 15:31:30 +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