diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-07-20 11:01:19 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-07-26 23:58:59 +0100 |
| commit | b9d3c3784865090e202483c73cc158f7d3918771 (patch) | |
| tree | 813fe5a1b1834f9d44cddfae930538b31dcfba08 | |
| parent | a758c5e2594893c0e7e1c5d966d6e486e2a77bb3 (diff) | |
| download | ffmpeg-b9d3c3784865090e202483c73cc158f7d3918771.tar.gz | |
build: use COMPILE template for HOSTOBJS
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | common.mak | 4 | ||||
| -rw-r--r-- | doc/Makefile | 2 | ||||
| -rw-r--r-- | tests/Makefile | 3 |
4 files changed, 3 insertions, 8 deletions
@@ -28,7 +28,7 @@ CFLAGS += $(ECFLAGS) CCFLAGS = $(CPPFLAGS) $(CFLAGS) ASFLAGS := $(CPPFLAGS) $(ASFLAGS) YASMFLAGS += $(IFLAGS) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm -HOSTCFLAGS += $(IFLAGS) +HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS) LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS) define COMPILE diff --git a/common.mak b/common.mak index 98c274e366..aed11f7891 100644 --- a/common.mak +++ b/common.mak @@ -33,7 +33,7 @@ checkheaders: $(filter-out $(SKIPHEADERS:.h=.ho),$(ALLHEADERS:.h=.ho)) alltools: $(TOOLS) $(HOSTOBJS): %.o: %.c - $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $< + $(call COMPILE,HOSTCC) $(HOSTPROGS): %$(HOSTEXESUF): %.o $(HOSTCC) $(HOSTLDFLAGS) -o $@ $< $(HOSTLIBS) @@ -49,4 +49,4 @@ CLEANSUFFIXES = *.d *.o *~ *.ho *.map *.ver DISTCLEANSUFFIXES = *.pc 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)) diff --git a/doc/Makefile b/doc/Makefile index 15e7323acc..8f9067417c 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -17,8 +17,6 @@ documentation: $(DOCS) 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 := $(GENTEXI:%=doc/avoptions_%.texi) diff --git a/tests/Makefile b/tests/Makefile index 63cf1f2f23..0b11102cdb 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -3,9 +3,6 @@ AREF = tests/data/asynth1.sw 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 $(M)./$< 'tests/vsynth1/' |