summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-26 09:58:37 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-26 09:58:37 +0000
commitc9bd9a617aa27da9350b8c3e1148074d9b2a5b2d (patch)
treefe9d3037f06adce60d8fd2b994c8c9cd99e95a6c
parent0383a49a67d77d2fac9bdaadc7be26eb8cd8636f (diff)
downloadmpv-c9bd9a617aa27da9350b8c3e1148074d9b2a5b2d.tar.bz2
mpv-c9bd9a617aa27da9350b8c3e1148074d9b2a5b2d.tar.xz
sync with FFmpeg r12599
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26278 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--common.mak27
1 files changed, 13 insertions, 14 deletions
diff --git a/common.mak b/common.mak
index 46cac9f6d8..a8a8b256b9 100644
--- a/common.mak
+++ b/common.mak
@@ -2,16 +2,14 @@
# common bits used by all libraries
#
-LIBSRC = $(SRC_PATH_BARE)/lib$(NAME)
+SRC_DIR = $(SRC_PATH_BARE)/lib$(NAME)
LIBVERSION = $(lib$(NAME)_VERSION)
LIBMAJOR = $(lib$(NAME)_VERSION_MAJOR)
-vpath %.c $(LIBSRC)
-vpath %.h $(LIBSRC)
-vpath %.S $(LIBSRC)
-
-SRC_DIR = "$(LIBSRC)"
+vpath %.c $(SRC_DIR)
+vpath %.h $(SRC_DIR)
+vpath %.S $(SRC_DIR)
ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
@@ -58,18 +56,19 @@ $(SLIBNAME_WITH_MAJOR): $(OBJS)
%.ho: %.h
$(CC) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $<
-ALLHEADERS = $(subst $(LIBSRC)/,,$(wildcard $(LIBSRC)/*.h))
+ALLHEADERS = $(subst $(SRC_DIR)/,,$(wildcard $(SRC_DIR)/*.h))
checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
-# gcc stupidly only outputs the basename of targets with -MM
-depend dep: $(SRCS)
- $(CC) -MM $(CFLAGS) $^ | sed 's,[0-9a-z._-]*: \([a-z0-9]*/\).*,\1&,' 1>.depend
+depend dep: .depend
+
+.depend: $(SRCS)
+ $(DEPEND_CMD) > .depend
clean::
rm -f *.o *~ *.a *.lib *.so *.so.* *.dylib *.dll \
*.def *.dll.a *.exp *.ho *.map $(TESTS)
-distclean: clean
+distclean:: clean
rm -f .depend
INSTALL_TARGETS-$(BUILD_SHARED) += install-lib-shared
@@ -96,15 +95,15 @@ install-lib-static: $(LIBNAME)
INCINSTDIR = $(INCDIR)/lib$(NAME)
-install-headers:
+install-headers::
install -d "$(INCINSTDIR)"
install -d "$(LIBDIR)/pkgconfig"
- install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(INCINSTDIR)"
+ install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
uninstall: uninstall-libs uninstall-headers
-uninstall-libs:
+uninstall-libs::
-rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
"$(SHLIBDIR)/$(SLIBNAME)" \
"$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"