Mercurial > mplayer.hg
annotate mpcommon.mak @ 26110:69790f7caffa
configure: Set CONFIG_ENCODERS=yes in config.mak unconditionally
config.h already had "#define CONFIG_ENCODERS 1" unconditionally, but
the config.mak value depended on whether MEncoder was enabled.
Encoders need to be enabled as some encoder code is used by MPlayer
too. The inconsistent values broke compilation with --disable-mencoder
after libavcodec Makefile made compilation of i386/dsputilenc_mmx.o
depend on the config.mak value.
author | uau |
---|---|
date | Mon, 03 Mar 2008 03:02:36 +0000 |
parents | 1955b4e60574 |
children | 8ca532b5e704 |
rev | line source |
---|---|
22528
8bcff5c7e387
Give more descriptive names to the source and library variables and split
diego
parents:
22526
diff
changeset
|
1 SRCS_COMMON += $(SRCS_COMMON-yes) |
8bcff5c7e387
Give more descriptive names to the source and library variables and split
diego
parents:
22526
diff
changeset
|
2 SRCS_MPLAYER += $(SRCS_MPLAYER-yes) |
8bcff5c7e387
Give more descriptive names to the source and library variables and split
diego
parents:
22526
diff
changeset
|
3 SRCS_MENCODER += $(SRCS_MENCODER-yes) |
21307 | 4 |
22848
82f06c55cf97
Append objects derived from sources to OBJS_*. This way the OBJS_* variables
diego
parents:
22814
diff
changeset
|
5 OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)) ) |
82f06c55cf97
Append objects derived from sources to OBJS_*. This way the OBJS_* variables
diego
parents:
22814
diff
changeset
|
6 OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER)) ) |
82f06c55cf97
Append objects derived from sources to OBJS_*. This way the OBJS_* variables
diego
parents:
22814
diff
changeset
|
7 OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER)) ) |
21259
92b122592776
Merge common parts of all Makefiles into one file included by all.
diego
parents:
diff
changeset
|
8 |
23092
21e496522217
cosmetics: Remove CONFIG_ prefix from FFmpeg library Makefile variables.
diego
parents:
22848
diff
changeset
|
9 CFLAGS-$(LIBAVCODEC) += -I../libavcodec |
21e496522217
cosmetics: Remove CONFIG_ prefix from FFmpeg library Makefile variables.
diego
parents:
22848
diff
changeset
|
10 CFLAGS-$(LIBAVFORMAT) += -I../libavformat |
23781
1955b4e60574
Revert include flag reordering, it does not fix the compilation problem.
diego
parents:
23773
diff
changeset
|
11 CFLAGS += $(CFLAGS-yes) $(OPTFLAGS) |
21259
92b122592776
Merge common parts of all Makefiles into one file included by all.
diego
parents:
diff
changeset
|
12 |
22528
8bcff5c7e387
Give more descriptive names to the source and library variables and split
diego
parents:
22526
diff
changeset
|
13 LIBS-$(MPLAYER) += $(LIBNAME_MPLAYER) |
8bcff5c7e387
Give more descriptive names to the source and library variables and split
diego
parents:
22526
diff
changeset
|
14 LIBS-$(MENCODER) += $(LIBNAME_MENCODER) |
8bcff5c7e387
Give more descriptive names to the source and library variables and split
diego
parents:
22526
diff
changeset
|
15 LIBS = $(LIBNAME_COMMON) $(LIBS-yes) |
21287
f423ce0a1c36
Move common code for generating multiple libraries to mpcommon.mak.
diego
parents:
21259
diff
changeset
|
16 |
22526
cbf425ba6a96
Give the library generation target a more sensible name.
diego
parents:
22522
diff
changeset
|
17 libs: $(LIBS) |
21259
92b122592776
Merge common parts of all Makefiles into one file included by all.
diego
parents:
diff
changeset
|
18 |
22528
8bcff5c7e387
Give more descriptive names to the source and library variables and split
diego
parents:
22526
diff
changeset
|
19 $(LIBNAME_COMMON): $(OBJS_COMMON) |
8bcff5c7e387
Give more descriptive names to the source and library variables and split
diego
parents:
22526
diff
changeset
|
20 $(LIBNAME_MPLAYER): $(OBJS_MPLAYER) |
8bcff5c7e387
Give more descriptive names to the source and library variables and split
diego
parents:
22526
diff
changeset
|
21 $(LIBNAME_MENCODER): $(OBJS_MENCODER) |
8bcff5c7e387
Give more descriptive names to the source and library variables and split
diego
parents:
22526
diff
changeset
|
22 $(LIBNAME_COMMON) $(LIBNAME_MPLAYER) $(LIBNAME_MENCODER): |
21287
f423ce0a1c36
Move common code for generating multiple libraries to mpcommon.mak.
diego
parents:
21259
diff
changeset
|
23 $(AR) r $@ $^ |
f423ce0a1c36
Move common code for generating multiple libraries to mpcommon.mak.
diego
parents:
21259
diff
changeset
|
24 $(RANLIB) $@ |
f423ce0a1c36
Move common code for generating multiple libraries to mpcommon.mak.
diego
parents:
21259
diff
changeset
|
25 |
21259
92b122592776
Merge common parts of all Makefiles into one file included by all.
diego
parents:
diff
changeset
|
26 clean:: |
92b122592776
Merge common parts of all Makefiles into one file included by all.
diego
parents:
diff
changeset
|
27 rm -f *.o *.a *~ |
92b122592776
Merge common parts of all Makefiles into one file included by all.
diego
parents:
diff
changeset
|
28 |
92b122592776
Merge common parts of all Makefiles into one file included by all.
diego
parents:
diff
changeset
|
29 distclean:: clean |
22784
afb7111123bb
Move test program removal on distclean to mpcommon.mak.
diego
parents:
22718
diff
changeset
|
30 rm -f .depend test test2 |
21259
92b122592776
Merge common parts of all Makefiles into one file included by all.
diego
parents:
diff
changeset
|
31 |
22542
974f5ffb5097
dep/depend should be a double colon target as well.
diego
parents:
22528
diff
changeset
|
32 dep depend:: |
22528
8bcff5c7e387
Give more descriptive names to the source and library variables and split
diego
parents:
22526
diff
changeset
|
33 $(CC) -MM $(CFLAGS) $(SRCS_COMMON) $(SRCS_MPLAYER) $(SRCS_MENCODER) 1>.depend |
21259
92b122592776
Merge common parts of all Makefiles into one file included by all.
diego
parents:
diff
changeset
|
34 |
22317 | 35 -include .depend |
22522 | 36 |
22526
cbf425ba6a96
Give the library generation target a more sensible name.
diego
parents:
22522
diff
changeset
|
37 .PHONY: libs clean distclean dep depend |