[FFmpeg-cvslog] build: remove references to unused EXTRAOBJS variable

Mans Rullgard git at videolan.org
Thu Oct 11 15:50:58 CEST 2012


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Wed Oct 10 22:36:54 2012 +0100| [4436f25a1682ada3f7226cb6fadf429946933161] | committer: Mans Rullgard

build: remove references to unused EXTRAOBJS variable

This was part of a ghastly hack that is long since gone.

Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4436f25a1682ada3f7226cb6fadf429946933161
---

 library.mak |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library.mak b/library.mak
index 98e0c6f..7f26984 100644
--- a/library.mak
+++ b/library.mak
@@ -25,7 +25,7 @@ $(TESTOBJS): CPPFLAGS += -DTEST
 
 $(SUBDIR)$(LIBNAME): $(OBJS)
 	$(RM) $@
-	$(AR) $(ARFLAGS) $(AR_O) $^ $(EXTRAOBJS)
+	$(AR) $(ARFLAGS) $(AR_O) $^
 	$(RANLIB) $@
 
 install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig
@@ -45,7 +45,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
 
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(DEP_LIBS)
 	$(SLIB_CREATE_DEF_CMD)
-	$$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS)
+	$$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)
 	$(SLIB_EXTRA_CMD)
 
 clean::



More information about the ffmpeg-cvslog mailing list