[FFmpeg-cvslog] build: Rename host_libs/HOSTLIBS variables to host_extralibs/HOSTEXTRALIBS

Diego Biurrun git at videolan.org
Mon Apr 17 10:41:15 EEST 2017


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Dec  6 18:19:09 2016 +0100| [0507cd5b9f3c3769645bc6e9177eaf760f490d1c] | committer: Diego Biurrun

build: Rename host_libs/HOSTLIBS variables to host_extralibs/HOSTEXTRALIBS

This is more in line with the other related variable names.

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

 common.mak | 2 +-
 configure  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common.mak b/common.mak
index d73addeffe..70ebd4b7ab 100644
--- a/common.mak
+++ b/common.mak
@@ -39,7 +39,7 @@ $(HOSTOBJS): %.o: %.c
 	$(COMPILE_HOSTC)
 
 $(HOSTPROGS): %$(HOSTEXESUF): %.o
-	$(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTLIBS)
+	$(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTEXTRALIBS)
 
 $(OBJS):     | $(sort $(dir $(OBJS)))
 $(HOBJS):    | $(sort $(dir $(HOBJS)))
diff --git a/configure b/configure
index 6ff5863491..dc540f6d9b 100755
--- a/configure
+++ b/configure
@@ -1807,9 +1807,9 @@ CMDLINE_SET="
     extra_version
     host_cc
     host_cflags
+    host_extralibs
     host_ld
     host_ldflags
-    host_libs
     host_os
     ld
     logfile
@@ -2572,7 +2572,7 @@ HOSTCC_E='-E -o $@'
 HOSTCC_O='-o $@'
 HOSTLD_O='-o $@'
 
-host_libs='-lm'
+host_extralibs='-lm'
 host_cflags_filter=echo
 host_ldflags_filter=echo
 
@@ -3809,7 +3809,7 @@ case $target_os in
     haiku)
         prefix_default="/boot/common"
         network_extralibs="-lnetwork"
-        host_libs=
+        host_extralibs=
         ;;
     sunos)
         SHFLAGS='-shared -Wl,-h,$$(@F)'
@@ -5281,7 +5281,7 @@ HOSTCFLAGS=$host_cflags
 HOSTCPPFLAGS=$host_cppflags
 HOSTEXESUF=$HOSTEXESUF
 HOSTLDFLAGS=$host_ldflags
-HOSTLIBS=$host_libs
+HOSTEXTRALIBS=$host_extralibs
 DEPHOSTCC=$host_cc
 DEPHOSTCCFLAGS=$DEPHOSTCCFLAGS \$(HOSTCCFLAGS)
 HOSTCCDEP=$HOSTCCDEP



More information about the ffmpeg-cvslog mailing list