build: ldflags conversion: libogg.

The next step on the way to the removing the per-executable ldflags
variables.  This sets ogg_ldflags in configure.ac, creates an output
variable from it, and adds it to LDFLAGS in Makefile.in for all
executables that need it.

diff --git a/Makefile.in b/Makefile.in
index 54cfd44128f7fa9864ccd88e204a619648778af2..bb4be2ff743274f1e6f7f0044cc7e3526e6513ad 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,6 +20,7 @@ HELP2MAN := @help2man@
 MKDIR_P := mkdir -p
 
 id3tag_ldflags := @id3tag_ldflags@
 MKDIR_P := mkdir -p
 
 id3tag_ldflags := @id3tag_ldflags@

+ogg_ldflags := @ogg_ldflags@

 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")


@@ -255,6 +256,14 @@ endif
 
 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
 
 
 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
 

+para_server \
+para_filter \
+para_audiod \
+para_play \
+para_afh \
+para_recv \
+: LDFLAGS += $(ogg_ldflags)
+

 para_recv: $(recv_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'
        $(Q) $(CC) $(recv_objs) -o $@ @recv_ldflags@ $(LDFLAGS)
 para_recv: $(recv_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'
        $(Q) $(CC) $(recv_objs) -o $@ @recv_ldflags@ $(LDFLAGS)

diff --git a/configure.ac b/configure.ac
index f4049373d56391b3dbff79d166ed9969eff5607d..2f2de09be029e2fe832291338b616c86baa36c25 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -618,16 +618,11 @@ if test "$have_vorbis" = "yes" || \
                test "$have_speex" = "yes" || \
                test "$have_opus" = "yes"; then
        AC_SUBST(ogg_cppflags)
                test "$have_speex" = "yes" || \
                test "$have_opus" = "yes"; then
        AC_SUBST(ogg_cppflags)

-       ogg_libs="$ogg_libs -logg"
+       ogg_ldflags="$ogg_libs -logg"

        if test "$OSTYPE" = "Darwin"; then
        if test "$OSTYPE" = "Darwin"; then

-               ogg_libs="-Wl,-bind_at_load $ogg_libs"
+               ogg_ldflags="-Wl,-bind_at_load $ogg_ldflags"

        fi
        fi

-       server_ldflags="$server_ldflags $ogg_libs"
-       filter_ldflags="$filter_ldflags $ogg_libs"
-       audiod_ldflags="$audiod_ldflags $ogg_libs"
-       play_ldflags="$play_ldflags $ogg_libs"
-       afh_ldflags="$afh_ldflags $ogg_libs"
-       recv_ldflags="$recv_ldflags $ogg_libs"
+       AC_SUBST(ogg_ldflags)

        afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
        recv_errlist_objs="$recv_errlist_objs ogg_afh_common"
        server_errlist_objs="$server_errlist_objs ogg_afh_common"
        afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
        recv_errlist_objs="$recv_errlist_objs ogg_afh_common"
        server_errlist_objs="$server_errlist_objs ogg_afh_common"