Signed-off-by: Mans Rullgard <[email protected]>
---
Makefile | 2 +-
common.mak | 4 ++--
doc/Makefile | 2 --
tests/Makefile | 3 ---
4 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index a05d3fc..10f52f2 100644
--- a/Makefile
+++ b/Makefile
@@ -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 98c274e..aed11f7 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 15e7323..8f90674 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 91f2d49..203f4e2 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/'
--
1.7.11.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
