summaryrefslogtreecommitdiffstats
path: root/common.mak
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-13 10:54:33 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-13 10:54:33 +0000
commitf3ffc8ca3a8af230a9bb6170f4a04de9992d4495 (patch)
treea3aef7fba2aae1b6b203ffa77b73785fea2869c6 /common.mak
parent0cf1308e21777a13e7b30fc90bad10cb60314747 (diff)
downloadmpv-f3ffc8ca3a8af230a9bb6170f4a04de9992d4495.tar.bz2
mpv-f3ffc8ca3a8af230a9bb6170f4a04de9992d4495.tar.xz
Sync with latest FFmpeg changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26435 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'common.mak')
-rw-r--r--common.mak33
1 files changed, 24 insertions, 9 deletions
diff --git a/common.mak b/common.mak
index 62dddcd5cf..1fbdf2b489 100644
--- a/common.mak
+++ b/common.mak
@@ -24,6 +24,15 @@ CFLAGS = -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
%.ho: %.h
$(CC) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $<
+%.d: %.c
+ $(DEPEND_CMD) > $@
+
+%.d: %.S
+ $(DEPEND_CMD) > $@
+
+%.d: %.cpp
+ $(DEPEND_CMD) > $@
+
install: install-libs install-headers
uninstall: uninstall-libs uninstall-headers
@@ -48,13 +57,17 @@ SRCS := $(addprefix $(SUBDIR),$(SRCS))
OBJS := $(addprefix $(SUBDIR),$(OBJS))
TESTS := $(addprefix $(SUBDIR),$(TESTS))
+DEP_LIBS:=$(foreach NAME,$(FFLIBS),lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME))
+
ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h))
checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
-depend dep: $(SUBDIR).depend
+DEPS := $(OBJS:.o=.d)
+depend dep: $(DEPS)
-CLEANFILES += *.o *~ *.a *.lib *.so *.so.* *.dylib *.dll \
- *.def *.dll.a *.exp *.ho *.map
+CLEANSUFFIXES = *.o *~ *.ho
+LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp *.map
+DISTCLEANSUFFIXES = *.d
define RULES
$(SUBDIR)%: $(SUBDIR)%.o $(LIBNAME)
@@ -63,18 +76,20 @@ $(SUBDIR)%: $(SUBDIR)%.o $(LIBNAME)
$(SUBDIR)%-test$(EXESUF): $(SUBDIR)%.c $(LIBNAME)
$(CC) $(CFLAGS) $(FFLDFLAGS) -DTEST -o $$@ $$^ $(FFEXTRALIBS)
-$(SUBDIR).depend: $(SRCS)
- $(DEPEND_CMD) > $$@
-
clean::
- rm -f $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES))
+ rm -f $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
+ $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
distclean:: clean
- rm -f $(SUBDIR).depend
+ rm -f $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
+ $(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
endef
$(eval $(RULES))
+# Clear DIRS variable so that it is not used in other subdirectories.
+DIRS =
+
tests: $(TESTS)
--include $(SUBDIR).depend
+-include $(DEPS)