ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Fri May 5 00:16:06 2017 -0300| [a5fdda79eee0b195ef4958193d17e68b820c8856] | committer: James Almer
library.mak: fix build rules that depend on pgk-config files Regression since 6fdd35a312 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5fdda79eee0b195ef4958193d17e68b820c8856 --- ffbuild/library.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ffbuild/library.mak b/ffbuild/library.mak index addc945168..cfc2d36067 100644 --- a/ffbuild/library.mak +++ b/ffbuild/library.mak @@ -9,8 +9,8 @@ INCINSTDIR := $(INCDIR)/lib$(NAME) INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%) -all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME) $(SUBDIR)lib$(NAME).pc -all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME) $(SUBDIR)lib$(NAME).pc +all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME) $(SUBDIR)lib$(FULLNAME).pc +all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME) $(SUBDIR)lib$(FULLNAME).pc LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS) $(LIBOBJS) $(LIBOBJS:.o=.s) $(LIBOBJS:.o=.i): CPPFLAGS += -DHAVE_AV_CONFIG_H @@ -57,7 +57,7 @@ endif clean:: $(RM) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(CLEANSUFFIXES:%=$(SUBDIR)tests/%) - + distclean:: clean $(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) \ $(DISTCLEANSUFFIXES:%=$(SUBDIR)tests/%) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
