diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-09 00:26:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-09 00:51:02 +0200 |
| commit | 11a1033c9fcae380f4da06b2b0253ab0eb82b026 (patch) | |
| tree | cee0379ce616e16ef342622b77fe417fa604c014 /library.mak | |
| parent | 4270d8c04d354b928d2329abd1037c6f0a72c07f (diff) | |
| parent | 5864eb427f2f05342136f3bc9727d826e68d8dbf (diff) | |
| download | ffmpeg-11a1033c9fcae380f4da06b2b0253ab0eb82b026.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
build: cosmetics: Reorder some lists in a more logical fashion
x86: pngdsp: Fix assembly for OS/2
fate: add test for RTjpeg in nuv with frameheader
rtmp: send check_bw as notification
g723_1: clip argument for 15-bit version of normalize_bits()
g723_1: use all LPC vectors in formant postfilter
id3v2: Support v2.2 PIC
avplay: fix build with lavfi disabled.
avconv: split configuring filter configuration to a separate file.
avconv: split option parsing into a separate file.
mpc8: do not leave padding after last frame in buffer for the next decode call
mpegaudioenc: list supported channel layouts.
mpegaudiodec: don't print an error on > 1 frame in a packet.
api-example: update to new audio encoding API.
configure: add --enable/disable-random option
doc: cygwin: Update list of FATE package requirements
build: Remove all installed headers and header directories on uninstall
build: change checkheaders to use regular build rules
rtmp: Add a new option 'rtmp_subscribe'
rtmp: Add support for subscribing live streams
...
Conflicts:
Makefile
common.mak
configure
doc/examples/decoding_encoding.c
ffmpeg.c
libavcodec/g723_1.c
libavcodec/mpegaudiodec.c
libavcodec/x86/pngdsp.asm
libavformat/version.h
library.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'library.mak')
| -rw-r--r-- | library.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library.mak b/library.mak index b1dd95411a..a53c635ada 100644 --- a/library.mak +++ b/library.mak @@ -20,7 +20,7 @@ $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d) $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $< -$(OBJS) $(OBJS:.o=.s) $(SUBDIR)%.ho $(TESTOBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H +$(OBJS) $(OBJS:.o=.s) $(SUBDIR)%.h.o $(TESTOBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H $(TESTOBJS): CPPFLAGS += -DTEST $(SUBDIR)$(LIBNAME): $(OBJS) @@ -87,7 +87,7 @@ uninstall-libs:: -$(RM) "$(LIBDIR)/$(LIBNAME)" uninstall-headers:: - $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS)) $(addprefix "$(INCINSTDIR)/",$(BUILT_HEADERS)) + $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS)) $(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc" -rmdir "$(INCINSTDIR)" endef |