diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-30 07:54:56 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-30 07:54:56 +0000 |
| commit | 4f01d9c698019a5aa15eda837795e2449383c0a7 (patch) | |
| tree | fe65f18e3d8dcaba2bb7453f33b3e6fc8979ac0d /common.mak | |
| parent | 4e927b4d212411b1b60020a995cf6a86f1baa6e8 (diff) | |
| download | mpv-4f01d9c698019a5aa15eda837795e2449383c0a7.tar.bz2 mpv-4f01d9c698019a5aa15eda837795e2449383c0a7.tar.xz | |
sync with FFmpeg r10874
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24886 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/common.mak b/common.mak index 823cc8ef59..babcd10329 100644 --- a/common.mak +++ b/common.mak @@ -16,12 +16,10 @@ CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ 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 @@ $(LIBNAME): $(STATIC_OBJS) $(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 @@ clean:: 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)" |