diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-20 11:54:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-20 11:54:06 +0100 |
| commit | 39b03932c2edee1d96183ace15ca09109d9420d2 (patch) | |
| tree | 3b054e055bacfacabfc951cd7740850df41e9ade /common.mak | |
| parent | 8c6d9ca6387f25f2dfc47e18cc1def87d733586f (diff) | |
| parent | 8a11ce43d08352f7a290355ebb5b29c495ad9609 (diff) | |
| download | ffmpeg-39b03932c2edee1d96183ace15ca09109d9420d2.tar.gz | |
Merge commit '8a11ce43d08352f7a290355ebb5b29c495ad9609'
* commit '8a11ce43d08352f7a290355ebb5b29c495ad9609':
build: Ensure that output directories for header objects are created
h264: Get rid of unnecessary casts
Conflicts:
common.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common.mak b/common.mak index 8775b02158..c42ea9ff74 100644 --- a/common.mak +++ b/common.mak @@ -117,12 +117,12 @@ $(HOSTPROGS): %$(HOSTEXESUF): %.o $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $< $(HOSTLIBS) $(OBJS): | $(sort $(dir $(OBJS))) +$(HOBJS): | $(sort $(dir $(HOBJS))) $(HOSTOBJS): | $(sort $(dir $(HOSTOBJS))) $(TESTOBJS): | $(sort $(dir $(TESTOBJS))) -$(HOBJS): | $(sort $(dir $(HOBJS))) $(TOOLOBJS): | tools -OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOSTOBJS) $(TESTOBJS) $(HOBJS)) +OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(TESTOBJS)) CLEANSUFFIXES = *.d *.o *~ *.h.c *.map *.ver *.ho *.gcno *.gcda DISTCLEANSUFFIXES = *.pc |