summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Add libswresample.Michael Niedermayer2011-09-191-0/+1
* Merge remote-tracking branch 'hexene/scratchpad'Michael Niedermayer2011-09-141-1/+1
|\
| * C++ Support ;)Mohamed Naufal2011-08-311-1/+7
| * Fix NASM include directiveDave Yeo2011-08-151-1/+1
* | build: fix install rule with --progs-suffix.Clément Bœsch2011-09-111-1/+2
* | Makefile: remove unused PROGS_G.Clément Bœsch2011-09-011-1/+0
* | build: introduce --progs-suffix option.Clément Bœsch2011-09-011-6/+6
* | Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'Michael Niedermayer2011-08-131-1/+2
|\ \ | |/
| * Make a copy of ffmpeg under a new name -- avconv.Anton Khirnov2011-08-121-1/+2
| * Rename ffserver to avserver.Anton Khirnov2011-08-091-3/+3
| * Rename ffprobe to avprobe.Anton Khirnov2011-08-091-2/+2
| * Rename ffplay to avplay.Anton Khirnov2011-08-091-4/+4
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-211-2/+0
|\ \ | |/
| * build: add -L flags before existing LDFLAGSMans Rullgard2011-07-211-3/+3
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-121-4/+4
|\ \ | |/
| * build: remove unnecessary dependency on libs from 'all' targetMans Rullgard2011-07-111-1/+1
| * build: remove unnecessary FFLDFLAGS variableMans Rullgard2011-07-111-3/+3
* | Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'Michael Niedermayer2011-07-111-13/+8
|\ \ | |/
| * build: rework rules for things in the tools dirMans Rullgard2011-07-101-13/+8
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-051-1/+1
|\ \ | |/
| * build: Remove deleted 'check' target from .PHONY list.Diego Biurrun2011-07-041-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-011-2/+0
|\ \ | |/
| * build: Eliminate obsolete test targets.Diego Biurrun2011-06-301-2/+0
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-301-3/+19
|\ \ | |/
| * build: fix creation of tools dir with make 3.81Mans Rullgard2011-06-291-2/+5
| * build: Mark all-yes Makefile target as phony.Diego Biurrun2011-06-291-1/+1
| * build: create output directories as neededMans Rullgard2011-06-291-1/+6
* | Move SRC_PATH hack around to allow compilation from subdir again.Reimar Döffinger2011-06-301-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-291-4/+4
|\ \ | |/
| * build: include sub-makefiles using full path instead of symlinksMans Rullgard2011-06-281-4/+4
| * build: factor out the .c and .S compile commands as a macroMans Rullgard2011-06-261-4/+11
* | Restore some more rules to common.mak to improve building in subdirs.Reimar Döffinger2011-06-251-11/+0
* | Allow running make in subdirs again.Reimar Döffinger2011-06-241-0/+1
* | Revert "build: move basic rules and variables to main Makefile"Reimar Döffinger2011-06-241-35/+0
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-241-11/+55
|\ \ | |/
| * build: remove SRC_PATH_BARE variableMans Rullgard2011-06-231-13/+11
| * build: move basic rules and variables to main MakefileMans Rullgard2011-06-231-0/+35
| * build: move special targets to end of main MakefileMans Rullgard2011-06-231-0/+8
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-231-158/+6
|\ \ | |/
| * build: move documentation rules to doc/MakefileMans Rullgard2011-06-221-38/+3
| * build: move test rules to tests/MakefileMans Rullgard2011-06-221-120/+3
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-151-0/+7
|\ \ | |/
| * build: move vpath directives to main MakefileMans Rullgard2011-06-141-0/+5
| * build: move ALLFFLIBS to a more logical placeMans Rullgard2011-06-141-0/+2
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-121-10/+12
|\ \ | |/
| * build: fix "make install" with documentation disabledMans Rullgard2011-06-111-0/+1
| * build: simplify some conditional targetsMans Rullgard2011-06-111-10/+11
* | Makefile: critical build fix after the merge. make fate passed locally due to...Michael Niedermayer2011-06-071-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-071-8/+10
|\ \ | |/
| * build: make rule for linking ff* apply only to these targetsMans Rullgard2011-06-071-1/+1
OpenPOWER on IntegriCloud