Signed-off-by: Mans Rullgard <mans@mansr.com>tags/n1.0
| @@ -28,7 +28,7 @@ CFLAGS += $(ECFLAGS) | |||||
| CCFLAGS = $(CPPFLAGS) $(CFLAGS) | CCFLAGS = $(CPPFLAGS) $(CFLAGS) | ||||
| ASFLAGS := $(CPPFLAGS) $(ASFLAGS) | ASFLAGS := $(CPPFLAGS) $(ASFLAGS) | ||||
| YASMFLAGS += $(IFLAGS) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm | YASMFLAGS += $(IFLAGS) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm | ||||
| HOSTCFLAGS += $(IFLAGS) | |||||
| HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS) | |||||
| LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS) | LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS) | ||||
| define COMPILE | define COMPILE | ||||
| @@ -33,7 +33,7 @@ checkheaders: $(filter-out $(SKIPHEADERS:.h=.ho),$(ALLHEADERS:.h=.ho)) | |||||
| alltools: $(TOOLS) | alltools: $(TOOLS) | ||||
| $(HOSTOBJS): %.o: %.c | $(HOSTOBJS): %.o: %.c | ||||
| $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $< | |||||
| $(call COMPILE,HOSTCC) | |||||
| $(HOSTPROGS): %$(HOSTEXESUF): %.o | $(HOSTPROGS): %$(HOSTEXESUF): %.o | ||||
| $(HOSTCC) $(HOSTLDFLAGS) -o $@ $< $(HOSTLIBS) | $(HOSTCC) $(HOSTLDFLAGS) -o $@ $< $(HOSTLIBS) | ||||
| @@ -49,4 +49,4 @@ CLEANSUFFIXES = *.d *.o *~ *.ho *.map *.ver | |||||
| DISTCLEANSUFFIXES = *.pc | DISTCLEANSUFFIXES = *.pc | ||||
| LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a | LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a | ||||
| -include $(wildcard $(OBJS:.o=.d) $(TESTOBJS:.o=.d)) | |||||
| -include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d)) | |||||
| @@ -17,8 +17,6 @@ documentation: $(DOCS) | |||||
| TEXIDEP = awk '/^@include/ { printf "$@: $(@D)/%s\n", $$2 }' <$< >$(@:%=%.d) | TEXIDEP = awk '/^@include/ { printf "$@: $(@D)/%s\n", $$2 }' <$< >$(@:%=%.d) | ||||
| doc/print_options.o: libavformat/options_table.h libavcodec/options_table.h | |||||
| GENTEXI = format codec | GENTEXI = format codec | ||||
| GENTEXI := $(GENTEXI:%=doc/avoptions_%.texi) | GENTEXI := $(GENTEXI:%=doc/avoptions_%.texi) | ||||
| @@ -3,9 +3,6 @@ AREF = tests/data/asynth1.sw | |||||
| OBJDIRS += tests/data tests/vsynth1 | OBJDIRS += tests/data tests/vsynth1 | ||||
| # Required due to missing automatic dependency tracking for HOSTOBJS. | |||||
| tests/rotozoom.o tests/videogen.o: tests/utils.c | |||||
| tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF) | tests/vsynth1 | tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF) | tests/vsynth1 | ||||
| $(M)./$< 'tests/vsynth1/' | $(M)./$< 'tests/vsynth1/' | ||||