mirror of https://github.com/mpv-player/mpv
sync with FFmpeg r5930
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19381 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
20b008a791
commit
a17fe78087
38
common.mak
38
common.mak
|
@ -22,9 +22,7 @@ $(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
|
||||||
|
|
||||||
$(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
|
$(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
|
||||||
$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
|
$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
|
||||||
ifeq ($(CONFIG_MINGW),yes)
|
$(SLIB_EXTRA_CMD)
|
||||||
-lib /machine:i386 /def:$(@:.dll=.def)
|
|
||||||
endif
|
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
|
$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
|
||||||
|
@ -42,7 +40,7 @@ depend: $(SRCS)
|
||||||
dep: depend
|
dep: depend
|
||||||
|
|
||||||
clean::
|
clean::
|
||||||
rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll \
|
rm -f *.o *.d *~ *.a *.lib *.so *.so.* *.dylib *.dll \
|
||||||
*.lib *.def *.dll.a *.exp
|
*.lib *.def *.dll.a *.exp
|
||||||
|
|
||||||
distclean: clean
|
distclean: clean
|
||||||
|
@ -60,17 +58,13 @@ install: install-libs install-headers
|
||||||
install-libs: $(INSTLIBTARGETS)
|
install-libs: $(INSTLIBTARGETS)
|
||||||
|
|
||||||
install-lib-shared: $(SLIBNAME)
|
install-lib-shared: $(SLIBNAME)
|
||||||
install -d "$(libdir)"
|
install -d "$(shlibdir)"
|
||||||
ifeq ($(CONFIG_MINGW),yes)
|
|
||||||
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
|
|
||||||
else
|
|
||||||
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
|
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
|
||||||
$(libdir)/$(SLIBNAME_WITH_VERSION)
|
"$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
|
||||||
ln -sf $(SLIBNAME_WITH_VERSION) \
|
cd "$(shlibdir)" && \
|
||||||
$(libdir)/$(SLIBNAME_WITH_MAJOR)
|
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
|
||||||
ln -sf $(SLIBNAME_WITH_VERSION) \
|
cd "$(shlibdir)" && \
|
||||||
$(libdir)/$(SLIBNAME)
|
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
|
||||||
endif
|
|
||||||
|
|
||||||
install-lib-static: $(LIB)
|
install-lib-static: $(LIB)
|
||||||
install -d "$(libdir)"
|
install -d "$(libdir)"
|
||||||
|
@ -85,18 +79,14 @@ install-headers:
|
||||||
uninstall: uninstall-libs uninstall-headers
|
uninstall: uninstall-libs uninstall-headers
|
||||||
|
|
||||||
uninstall-libs:
|
uninstall-libs:
|
||||||
ifeq ($(CONFIG_MINGW),yes)
|
-rm -f "$(shlibdir)/$(SLIBNAME_WITH_MAJOR)" \
|
||||||
-rm -f $(prefix)/$(SLIBNAME)
|
"$(shlibdir)/$(SLIBNAME)" \
|
||||||
else
|
"$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
|
||||||
-rm -f $(libdir)/$(SLIBNAME_WITH_MAJOR) \
|
-rm -f "$(libdir)/$(LIB)"
|
||||||
$(libdir)/$(SLIBNAME) \
|
|
||||||
$(libdir)/$(SLIBNAME_WITH_VERSION)
|
|
||||||
endif
|
|
||||||
-rm -f $(libdir)/$(LIB)
|
|
||||||
|
|
||||||
uninstall-headers:
|
uninstall-headers:
|
||||||
rm -f $(addprefix $(incdir)/,$(HEADERS))
|
rm -f "$(addprefix $(incdir)/,$(HEADERS))"
|
||||||
rm -f $(libdir)/pkgconfig/lib$(NAME).pc
|
rm -f "$(libdir)/pkgconfig/lib$(NAME).pc"
|
||||||
|
|
||||||
#
|
#
|
||||||
# include dependency files if they exist
|
# include dependency files if they exist
|
||||||
|
|
Loading…
Reference in New Issue