diff options
Diffstat (limited to 'contrib/ffmpeg/common.mak')
| -rw-r--r-- | contrib/ffmpeg/common.mak | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/contrib/ffmpeg/common.mak b/contrib/ffmpeg/common.mak index d4a8dca41..7989b9021 100644 --- a/contrib/ffmpeg/common.mak +++ b/contrib/ffmpeg/common.mak @@ -5,6 +5,10 @@ VPATH = $(SRC_PATH_BARE)/lib$(NAME) SRC_DIR = "$(VPATH)" +CFLAGS += $(CFLAGS-yes) +OBJS += $(OBJS-yes) +ASM_OBJS += $(ASM_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) @@ -33,10 +37,6 @@ $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS) %.o: %.S $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< -# BeOS: remove -Wall to get rid of all the "multibyte constant" warnings -%.o: %.cpp - g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $< - %: %.o $(LIB) $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) @@ -63,12 +63,13 @@ 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)" && \ ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME) + $(SLIB_INSTALL_EXTRA_CMD) install-lib-static: $(LIB) install -d "$(libdir)" @@ -95,6 +96,4 @@ uninstall-headers: .PHONY: all depend dep clean distclean install* uninstall* -ifneq ($(wildcard .depend),) -include .depend -endif +-include .depend |