Get rid of CAIRO_LDADD in favor of CAIRO_LIBS

build/analysis.ac

@@ -70,7 +70,7 @@ dnl  PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.gcov, $abs_srcdir)
 
   dnl Add the special gcc flags
   CAIRO_CFLAGS="$CAIRO_CFLAGS -O0 -fprofile-arcs -ftest-coverage"
-  CAIRO_LDADD="$CAIRO_LDADD -lgcov"
+  CAIRO_LIBS="$CAIRO_LIBS -lgcov"
 fi
 AM_CONDITIONAL(CAIRO_HAS_LCOV, test "x$cairo_has_lcov" = "xyes")
 

build/enable.ac

@@ -194,7 +194,6 @@ CAIRO_SUPPORTED_FEATURES=""
 CAIRO_REQUIRES=""
 CAIRO_NONPKGCONFIG_CFLAGS=""
 CAIRO_NONPKGCONFIG_LIBS="$LIBS"
-CAIRO_LDADD=""
 CAIRO_CFLAGS=$CAIRO_NONPKGCONFIG_CFLAGS
 CAIRO_LIBS=$CAIRO_NONPKGCONFIG_LIBS
 CAIRO_CONFIG_AMAKE='# Generated by configure.  Do not edit.
@@ -220,7 +219,6 @@ AC_SUBST(CAIRO_REQUIRES)
 AC_SUBST(CAIRO_NONPKGCONFIG_CFLAGS)
 AC_SUBST(CAIRO_NONPKGCONFIG_LIBS)
 AC_SUBST(CAIRO_CFLAGS)
-AC_SUBST(CAIRO_LDADD)
 AC_SUBST(CAIRO_LIBS)
 
 CAIRO_CONFIG_COMMANDS([$srcdir/src/Config.mk],

src/Makefile.am

@@ -36,7 +36,7 @@ libcairo_la_SOURCES = \
 	$(enabled_cairo_sources) \
 	$(NULL)
 libcairo_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
-libcairo_la_LIBADD = $(CAIRO_LIBS) $(CAIRO_LDADD)
+libcairo_la_LIBADD = $(CAIRO_LIBS)
 libcairo_la_DEPENDENCIES = $(cairo_def_dependency)
 
 # Special headers