From c0ce28374c90ac32124b3cc97addbc994f15c3ea Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 18 Oct 2016 15:29:29 +0100 Subject: [PATCH] build: Drop LDADD from GSK's Makefile We can use the LDFLAGS target build. --- gsk/Makefile.am | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/gsk/Makefile.am b/gsk/Makefile.am index 920c858d3e..9dd4d05fd6 100644 --- a/gsk/Makefile.am +++ b/gsk/Makefile.am @@ -11,16 +11,6 @@ AM_CPPFLAGS = \ $(GTK_WARN_FLAGS) \ $(GSK_DEP_CFLAGS) -# libtool stuff: set version and export symbols for resolving -# since automake doesn't support conditionalized libsomething_la_LDFLAGS -# we use the general approach here -LDADD = \ - $(GTK_LINK_FLAGS) \ - -version-info $(LT_VERSION_INFO) \ - -export-dynamic \ - -rpath $(libdir) \ - $(no_undefined) - BUILT_SOURCES = CLEANFILES = @@ -116,7 +106,12 @@ libgsk_4_la_SOURCES = $(all_sources) nodist_libgsk_4_la_SOURCES = $(gsk_built_source_h) $(gsk_built_source_c) libgsk_4_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS) libgsk_4_la_LIBADD = $(GSK_DEP_LIBS) $(top_builddir)/gdk/libgdk-4.la -libgsk_4_la_LDFLAGS = $(LDADD) +libgsk_4_la_LDFLAGS = \ + $(GTK_LINK_FLAGS) \ + -version-info $(LT_VERSION_INFO) \ + -export-dynamic \ + -rpath $(libdir) \ + $(no_undefined) lib_LTLIBRARIES += libgsk-4.la