Commit Graph

273 Commits

Author SHA1 Message Date
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
Diego Biurrun
969f949300 Remove Fabrice's copyright from the Makefiles. They have been entirely
rewritten since they were originally created.

Originally committed as revision 13675 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 17:50:32 +00:00
Diego Biurrun
1eacdcc644 Do not remove gmon.out on clean, we never create it.
Originally committed as revision 13453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 00:45:45 +00:00
Diego Biurrun
936d48911a Remove TAGS target cruft.
Originally committed as revision 13451 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 00:38:35 +00:00
Diego Biurrun
5caf0949c0 Simplify phony target declaration.
Originally committed as revision 13450 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 00:32:26 +00:00
Diego Biurrun
60598b2f9a Rename test-server target to servertest for consistency with other test targets.
Originally committed as revision 13449 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 00:26:43 +00:00
Måns Rullgård
54381d7557 clear TESTS variable between subdirs
Originally committed as revision 12866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 21:50:39 +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
Måns Rullgård
d1300235b9 ffplay.d needs SDL_CFLAGS
Originally committed as revision 12787 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-10 22:34:37 +00:00
Måns Rullgård
9987769a8b correct soname for vhooks
Originally committed as revision 12785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-10 19:44:29 +00:00
Måns Rullgård
791a3fc8ec save DEP_LIBS before processing subdirs
Originally committed as revision 12784 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-10 19:44:26 +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
8a03404d4f fix build with --build-suffix
Originally committed as revision 12776 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-09 21:11:35 +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
465d9b1f7a collect vhook-related makefile lines in one place
Originally committed as revision 12762 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-07 22:17:42 +00:00
Stefano Sabatini
d05e360c48 Make the install-man target depend on $(MANPAGES).
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 12761 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-07 21:45:38 +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
Måns Rullgård
b8fcb619e9 simplify LDFLAGS and EXTRALIBS handling
Originally committed as revision 12683 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-03 23:51:29 +00:00
Måns Rullgård
82e8566a02 simplify vhook/*.o rule
Originally committed as revision 12682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-03 22:47:01 +00:00
Måns Rullgård
43527e3edd clean up DEP_LIBS setting
Originally committed as revision 12681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-03 22:39:54 +00:00
Diego Biurrun
60080b0805 10l typo, restore forgotten $.
Originally committed as revision 12673 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-03 16:57:01 +00:00
Björn Axelsson
73e17cdb8c Add libavutil to DEP_LIBS so that PROGS get rebuilt upon libavutil changes.
Closes issue 418, patch by Björn Axelsson, bjorn.axelsson intinor se

Originally committed as revision 12667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-02 18:14:48 +00:00
Måns Rullgård
473a88caaf fix ff*_g -> ff* rules
Originally committed as revision 12624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-29 11:33:58 +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
dfd1083831 Move INSTALL_PROGS_TARGETS variable to a better place.
Originally committed as revision 12616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 03:07:55 +00:00
Diego Biurrun
88ad036874 Handle EXTRALIBS and LDFLAGS for libswscale and libavfilter in a simpler way.
Originally committed as revision 12615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 02:45:09 +00:00
Diego Biurrun
c1ac39b3df Replace ifeq to declare install-progs dependencies by a variable.
Originally committed as revision 12613 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 01:58:53 +00:00
Diego Biurrun
a7319cc22a The install target should depend on enabled installation targets.
Originally committed as revision 12612 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 01:49:01 +00:00
Diego Biurrun
e58cc8e604 Remove TAGS target. It is ages old and has never been updated to match
changes to the source tree. Thus it has to be completely unused.

Originally committed as revision 12610 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 00:59:55 +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
Diego Biurrun
916dafd57c cosmetics: Rename SRCS variable to PROGS_SRCS.
This is in preparation for common.mak inclusion in the main Makefile.

Originally committed as revision 12598 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-26 09:30:09 +00:00
Diego Biurrun
f4428f9992 Merge LDFLAGS lines.
Originally committed as revision 12597 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-26 09:27:58 +00:00
Diego Biurrun
2721715985 cosmetics: Move around some rules and variable declarations.
This is in preparation for common.mak inclusion in the main Makefile.

Originally committed as revision 12596 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-26 09:22:43 +00:00
Diego Biurrun
92e791ff37 cosmetics: Rename 'all' target to 'main'.
This is in preparation for common.mak inclusion in the main Makefile.

Originally committed as revision 12595 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-26 08:58:26 +00:00
Diego Biurrun
b1b184812c Merge binary generation rules.
Originally committed as revision 12455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-15 19:57:09 +00:00
Måns Rullgård
a426bbfc28 set SRC_DIR in top-leve Makefile
Originally committed as revision 12453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-15 19:24:05 +00:00
Diego Biurrun
e6a383d695 Use $< to simplify a few lines.
Originally committed as revision 12451 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-15 19:14:07 +00:00
Diego Biurrun
6e69586b44 Build ffserver_g as well as ffserver, consistent with the other binaries.
Originally committed as revision 12439 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-14 12:44:07 +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
f63b6dc0ff Do not calculate dependencies for header files in the .vhookdepend target.
Originally committed as revision 12422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-12 09:42:36 +00:00
Diego Biurrun
8df4da4eb3 Use $^ without header files instead of $(SRCS) to reference the dependencies
of the .depend target. $^ apparently includes the full path to files found
in a vpath directory, $(SRCS) does not. This makes out of tree builds fail.

Originally committed as revision 12421 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-12 09:40:36 +00:00
Ramiro Polla
1b9cec96e1 Remove windows installer. I'm not aware of anyone that uses it.
Originally committed as revision 12416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 21:15:47 +00:00
Diego Biurrun
30a3ad750b Simplify .depend generation command.
Originally committed as revision 12414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 20:18:40 +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
3c889b5cf7 Merge SDL_CFLAGS handling for files that need it.
Originally committed as revision 12412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 20:01:50 +00:00
Diego Biurrun
bab785a5f9 vhooks really need libav* even if they compile fine without on Linux.
Originally committed as revision 12409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 18:37:18 +00:00
Diego Biurrun
13ca50f367 Rename --enable-swscaler --> enable-swscale to be consistent with the
directory name and other option names. Also rename variables accordingly.

Originally committed as revision 12408 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 17:54:24 +00:00
Diego Biurrun
4a24ab64b1 Rename pp variable to postproc for consistency.
Originally committed as revision 12376 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 18:50:38 +00:00
Diego Biurrun
61c510887b cosmetics: prettyprinting
Originally committed as revision 12369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 16:19:46 +00:00