diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-08 17:06:25 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-08 17:06:25 +0000 |
| commit | ae75174784f5c4172b28dafd7a3e91b1037a4dc4 (patch) | |
| tree | e1b2a2182486f742699bf22d30ab2d54cf45b381 | |
| parent | 4022a072f0f97483c7fc66ca38fac245288ebe33 (diff) | |
| download | mpv-ae75174784f5c4172b28dafd7a3e91b1037a4dc4.tar.bz2 mpv-ae75174784f5c4172b28dafd7a3e91b1037a4dc4.tar.xz | |
Merge simplifications from FFmpeg r12764.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26349 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | common.mak | 3 | ||||
| -rw-r--r-- | subdir.mak | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/common.mak b/common.mak index c405430308..62dddcd5cf 100644 --- a/common.mak +++ b/common.mak @@ -4,7 +4,7 @@ all: # make "all" default target -ifeq ($(SUBDIR),) +ifndef SUBDIR vpath %.c $(SRC_DIR) vpath %.h $(SRC_DIR) vpath %.S $(SRC_DIR) @@ -36,6 +36,7 @@ OBJS += $(OBJS-yes) ASM_OBJS += $(ASM_OBJS-yes) CPP_OBJS += $(CPP_OBJS-yes) FFLIBS := $(FFLIBS-yes) $(FFLIBS) +TESTS += $(TESTS-yes) FFEXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS) FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS) diff --git a/subdir.mak b/subdir.mak index 6384d8baf8..5b92f78566 100644 --- a/subdir.mak +++ b/subdir.mak @@ -19,7 +19,7 @@ endif INCINSTDIR := $(INCDIR)/lib$(NAME) define RULES -ifeq ($(BUILD_SHARED),yes) +ifdef BUILD_SHARED all: $(SUBDIR)$(SLIBNAME) install-libs: install-lib$(NAME)-shared @@ -32,7 +32,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$^ $(FFEXTRALIBS) $(EXTRAOBJS) $(SLIB_EXTRA_CMD) -ifneq ($(SUBDIR),) +ifdef SUBDIR $(SUBDIR)$(SLIBNAME_WITH_MAJOR): \ $(foreach L,$(FFLIBS),lib$(L)/$(SLIBPREF)$(L)$(SLIBSUF)) endif |