diff options
| author | James Almer <jamrial@gmail.com> | 2017-05-04 19:59:30 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-05-04 19:59:30 -0300 |
| commit | 6fdd35a3126f6ecbe4ebab12bdf8867e4f544958 (patch) | |
| tree | 7e0a89ba5a5e99377ec5461e9946ff1a0003a545 /ffbuild/common.mak | |
| parent | c0f17a905f3588bf61ba6d86a83c6835d431ed3d (diff) | |
| parent | 92db5083077a8b0f8e1050507671b456fd155125 (diff) | |
| download | ffmpeg-6fdd35a3126f6ecbe4ebab12bdf8867e4f544958.tar.gz | |
Merge commit '92db5083077a8b0f8e1050507671b456fd155125'
* commit '92db5083077a8b0f8e1050507671b456fd155125':
build: Generate pkg-config files from Make and not from configure
build: Store library version numbers in .version files
Includes cherry-picked commits 8a34f3659371680ca523aecfd9098c28f0f809eb and
ee164727dd64c199b87118917e674b17c25e0da3 to fix issues.
Changes were also made to retain support for raise_major and build_suffix.
Reviewed-by: ubitux
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'ffbuild/common.mak')
| -rw-r--r-- | ffbuild/common.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ffbuild/common.mak b/ffbuild/common.mak index 195737028a..e61f853ebb 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -89,7 +89,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC) %.h.c: $(Q)echo '#include "$*.h"' >$@ -%.c %.h %.ver: TAG = GEN +%.c %.h %.pc %.ver %.version: TAG = GEN # Dummy rule to stop make trying to rebuild removed or renamed headers %.h: @@ -154,7 +154,7 @@ $(TOOLOBJS): | tools OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(TESTOBJS)) -CLEANSUFFIXES = *.d *.o *~ *.h.c *.gcda *.gcno *.map *.ver *.ho *$(DEFAULT_YASMD).asm +CLEANSUFFIXES = *.d *.o *~ *.h.c *.gcda *.gcno *.map *.ver *.version *.ho *$(DEFAULT_YASMD).asm DISTCLEANSUFFIXES = *.pc LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a |