diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-06-10 22:20:24 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-06-10 22:20:24 +0000 |
| commit | 17722f1e6c201b398947be20ec8d2937cc463aad (patch) | |
| tree | 90ba15250c2f6bdba4ac16b34d24eecbce4ae2c5 /common.mak | |
| parent | 9c5ce32cadd111fdd06135df9395b62de80c2797 (diff) | |
| download | mpv-17722f1e6c201b398947be20ec8d2937cc463aad.tar.bz2 mpv-17722f1e6c201b398947be20ec8d2937cc463aad.tar.xz | |
Sync with FFmpeg r9278.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23544 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/common.mak b/common.mak index 0d5fdceec4..0274a5a725 100644 --- a/common.mak +++ b/common.mak @@ -8,10 +8,12 @@ SRC_DIR = "$(VPATH)" CFLAGS += $(CFLAGS-yes) OBJS += $(OBJS-yes) ASM_OBJS += $(ASM_OBJS-yes) +CPP_OBJS += $(CPP_OBJS-yes) CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \ -I$(SRC_PATH)/libavutil $(OPTFLAGS) + SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp) OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS) STATIC_OBJS := $(OBJS) $(STATIC_OBJS) @@ -44,7 +46,7 @@ depend dep: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend clean:: - rm -f *.o *.d *~ *.a *.lib *.so *.so.* *.dylib *.dll \ + rm -f *.o *~ *.a *.lib *.so *.so.* *.dylib *.dll \ *.def *.dll.a *.exp distclean: clean @@ -63,8 +65,8 @@ install-libs: $(INSTLIBTARGETS) install-lib-shared: $(SLIBNAME) install -d "$(shlibdir)" - install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ - "$(shlibdir)/$(SLIBNAME_WITH_VERSION)" + install -m 755 $(SLIBNAME) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)" + $(STRIP) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)" cd "$(shlibdir)" && \ ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR) cd "$(shlibdir)" && \ @@ -90,12 +92,10 @@ uninstall-libs: "$(shlibdir)/$(SLIBNAME_WITH_VERSION)" -rm -f "$(libdir)/$(LIB)" -uninstall-headers: +uninstall-headers:: rm -f $(addprefix "$(incdir)/",$(HEADERS)) rm -f "$(libdir)/pkgconfig/lib$(NAME).pc" .PHONY: all depend dep clean distclean install* uninstall* -ifneq ($(wildcard .depend),) -include .depend -endif +-include .depend |