]> git.sesse.net Git - ffmpeg/commitdiff
build: Rename host_libs/HOSTLIBS variables to host_extralibs/HOSTEXTRALIBS
authorDiego Biurrun <diego@biurrun.de>
Tue, 6 Dec 2016 17:19:09 +0000 (18:19 +0100)
committerDiego Biurrun <diego@biurrun.de>
Fri, 9 Dec 2016 17:51:23 +0000 (18:51 +0100)
This is more in line with the other related variable names.

common.mak
configure

index d73addeffe927d15c231907d45b9776ac475caf9..70ebd4b7ab3621ef6fbe58972b65630add7fbf49 100644 (file)
@@ -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)))
index 6ff5863491f775beee7e769e877af7ddef99e560..dc540f6d9b452d0cf0f0a38bba2e37c3b29973da 100755 (executable)
--- 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