summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-31 23:33:30 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-31 23:33:30 +0000
commit332482d61b756fb3e36f60514d6d0ada79d7f914 (patch)
tree4f17085532cdb75b21beea6d41ab2037ff41a1d8
parentf52aafce6ad5a5ac092ef63d84841afef1de9d7c (diff)
downloadmpv-332482d61b756fb3e36f60514d6d0ada79d7f914.tar.bz2
mpv-332482d61b756fb3e36f60514d6d0ada79d7f914.tar.xz
Append objects derived from sources to OBJS_*. This way the OBJS_* variables
do not get clobbered if they were set before. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22866 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--mpcommon.mak6
1 files changed, 3 insertions, 3 deletions
diff --git a/mpcommon.mak b/mpcommon.mak
index eb04bd19f9..5feb1090ac 100644
--- a/mpcommon.mak
+++ b/mpcommon.mak
@@ -2,9 +2,9 @@ SRCS_COMMON += $(SRCS_COMMON-yes)
SRCS_MPLAYER += $(SRCS_MPLAYER-yes)
SRCS_MENCODER += $(SRCS_MENCODER-yes)
-OBJS_COMMON = $(addsuffix .o, $(basename $(SRCS_COMMON)) )
-OBJS_MPLAYER = $(addsuffix .o, $(basename $(SRCS_MPLAYER)) )
-OBJS_MENCODER = $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
+OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)) )
+OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER)) )
+OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec
CFLAGS-$(CONFIG_LIBAVFORMAT) += -I../libavformat