Mercurial > mplayer.hg
changeset 24858:ca10b24479ff
sync with FFmpeg r10874
| author | diego |
|---|---|
| date | Tue, 30 Oct 2007 07:54:56 +0000 |
| parents | 45359b137c95 |
| children | f9495196e2d8 |
| files | common.mak |
| diffstat | 1 files changed, 5 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/common.mak Tue Oct 30 02:44:17 2007 +0000 +++ b/common.mak Tue Oct 30 07:54:56 2007 +0000 @@ -16,12 +16,10 @@ SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp) OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS) -STATIC_OBJS := $(OBJS) $(STATIC_OBJS) -SHARED_OBJS := $(OBJS) $(SHARED_OBJS) all: $(LIBNAME) $(SLIBNAME) -$(LIBNAME): $(STATIC_OBJS) +$(LIBNAME): $(OBJS) rm -f $@ $(AR) rc $@ $^ $(EXTRAOBJS) $(RANLIB) $@ @@ -29,7 +27,7 @@ $(SLIBNAME): $(SLIBNAME_WITH_MAJOR) $(LN_S) $^ $@ -$(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS) +$(SLIBNAME_WITH_MAJOR): $(OBJS) $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS) $(SLIB_EXTRA_CMD) @@ -58,16 +56,12 @@ distclean: clean rm -f .depend -ifeq ($(BUILD_SHARED),yes) -INSTLIBTARGETS += install-lib-shared -endif -ifeq ($(BUILD_STATIC),yes) -INSTLIBTARGETS += install-lib-static -endif +INSTALL_TARGETS-$(BUILD_SHARED) += install-lib-shared +INSTALL_TARGETS-$(BUILD_STATIC) += install-lib-static install: install-libs install-headers -install-libs: $(INSTLIBTARGETS) +install-libs: $(INSTALL_TARGETS-yes) install-lib-shared: $(SLIBNAME) install -d "$(SHLIBDIR)"