← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ffmpeg-debian/utopic

« back to all changes in this revision

Viewing changes to common.mak

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-01-20 09:20:53 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090120092053-izz63p40hc98qfgp
Tags: 3:0.svn20090119-1ubuntu1
https://launchpad.net/bugs/318501
https://launchpad.net/bugs/253767
* merge from debian. LP: #318501
* new version fixes CVE-2008-3230, LP: #253767

Show diffs side-by-side

added added

removed removed

Lines of Context:
common.mak
71
71
 
72
72
DEP_LIBS:=$(foreach NAME,$(FFLIBS),lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME))
73
73
 
74
 
ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h))
 
74
ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
75
75
checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
76
76
 
77
77
DEPS := $(OBJS:.o=.d)
91
91
$(SUBDIR)%-test.o: $(SUBDIR)%-test.c
92
92
        $(CC) $(CFLAGS) -DTEST -c -o $$@ $$^
93
93
 
94
 
$(SUBDIR)i386/%.o: $(SUBDIR)i386/%.asm
 
94
$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
95
95
        $(YASM) $(YASMFLAGS) -I $$(<D)/ -o $$@ $$<
96
96
 
97
 
$(SUBDIR)i386/%.d: $(SUBDIR)i386/%.asm
 
97
$(SUBDIR)x86/%.d: $(SUBDIR)x86/%.asm
98
98
        $(YASM) $(YASMFLAGS) -I $$(<D)/ -M -o $$(@:%.d=%.o) $$< > $$@
99
99
 
100
100
clean::