# HG changeset patch # User diego # Date 1175384010 0 # Node ID 82f06c55cf97d6786540dd357319458600281c7f # Parent 97cb08575ed57a220fe07b98867e1eb3cbae705d Append objects derived from sources to OBJS_*. This way the OBJS_* variables do not get clobbered if they were set before. diff -r 97cb08575ed5 -r 82f06c55cf97 mpcommon.mak --- a/mpcommon.mak Sat Mar 31 23:02:36 2007 +0000 +++ b/mpcommon.mak Sat Mar 31 23:33:30 2007 +0000 @@ -2,9 +2,9 @@ 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