From bc013ae9fea0d312a12b89098aa135f2ff9850a4 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Tue, 28 Oct 2014 15:27:41 +0100
Subject: [PATCH] Rename LIBGEANY_LIBS to LIBGEANY_LDFLAGS and only use it on
 libgeany.la

The flags in this variables are used to tune the linker behavior on the
final libgeany (currently set the version information), so should only
used on really linked libraries, not Libtool helper libraries.
---
 m4/geany-lib.m4              | 4 ++--
 scintilla/Makefile.am        | 1 -
 src/Makefile.am              | 8 ++++----
 tagmanager/ctags/Makefile.am | 2 --
 tagmanager/mio/Makefile.am   | 1 -
 tagmanager/src/Makefile.am   | 2 --
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/m4/geany-lib.m4 b/m4/geany-lib.m4
index 3e63b09b53..8336862920 100644
--- a/m4/geany-lib.m4
+++ b/m4/geany-lib.m4
@@ -24,10 +24,10 @@ dnl `__attribute__((visibility(...)))` extension and use it if so.
 		])
 	CFLAGS="${libgeany_backup_cflags}"
 
-	LIBGEANY_LIBS="-version-info ${libgeany_current}:${libgeany_revision}:${libgeany_age}"
+	LIBGEANY_LDFLAGS="-version-info ${libgeany_current}:${libgeany_revision}:${libgeany_age}"
 
 	AC_SUBST([LIBGEANY_CFLAGS])
-	AC_SUBST([LIBGEANY_LIBS])
+	AC_SUBST([LIBGEANY_LDFLAGS])
 
 dnl Check for utilities needed to do codegen
 	AC_PATH_PROG([SORT], [sort], [
diff --git a/scintilla/Makefile.am b/scintilla/Makefile.am
index 022f38c8c3..091c2169d2 100644
--- a/scintilla/Makefile.am
+++ b/scintilla/Makefile.am
@@ -140,7 +140,6 @@ src/XPM.h \
 $(LEXER_SRCS)
 
 libscintilla_la_SOURCES = $(SRCS)
-libscintilla_la_LDFLAGS = @LIBGEANY_LIBS@
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)/include -I$(srcdir)/src -I$(srcdir)/lexlib \
 	@GTK_CFLAGS@ @LIBGEANY_CFLAGS@
diff --git a/src/Makefile.am b/src/Makefile.am
index 45f740bcd0..f2a9529ab1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -121,7 +121,6 @@ libgeany_la_LIBADD = \
 	@GTK_LIBS@ \
 	@GTHREAD_LIBS@ \
 	$(INTLLIBS) \
-	@LIBGEANY_LIBS@ \
 	-lole32 -lwsock32 -lcomdlg32
 
 libgeany_la_LDFLAGS = -Wl,-luuid $(AM_LDFLAGS)
@@ -136,7 +135,7 @@ AM_CFLAGS = -DGEANY_DATADIR=\"data\" \
 			-DGTK \
 			-DG_LOG_DOMAIN=\""Geany"\"
 
-libgeany_la_LDFLAGS +=	-mwindows -mms-bitfields -no-undefined
+libgeany_la_LDFLAGS += @LIBGEANY_LDFLAGS@ -mwindows -mms-bitfields -no-undefined
 
 WINDRES = $(host_alias)-windres
 
@@ -159,8 +158,7 @@ libgeany_la_LIBADD = \
 	@GTK_LIBS@ \
 	@GTHREAD_LIBS@ \
 	$(MAC_INTEGRATION_LIBS) \
-	$(INTLLIBS) \
-	@LIBGEANY_LIBS@
+	$(INTLLIBS)
 
 AM_CFLAGS = -DGEANY_DATADIR=\""$(datadir)"\" \
 			-DGEANY_DOCDIR=\""$(docdir)"\" \
@@ -171,6 +169,8 @@ AM_CFLAGS = -DGEANY_DATADIR=\""$(datadir)"\" \
 			-DGTK \
 			-DG_LOG_DOMAIN=\""Geany"\"
 
+libgeany_la_LDFLAGS = @LIBGEANY_LDFLAGS@
+
 clean-local:
 
 endif
diff --git a/tagmanager/ctags/Makefile.am b/tagmanager/ctags/Makefile.am
index c81ccf73b2..8bd5d483f5 100644
--- a/tagmanager/ctags/Makefile.am
+++ b/tagmanager/ctags/Makefile.am
@@ -83,5 +83,3 @@ libctags_la_SOURCES = \
 	vstring.c \
 	vstring.h \
 	$(parsers)
-
-libctags_la_LDFLAGS = @LIBGEANY_LIBS@
diff --git a/tagmanager/mio/Makefile.am b/tagmanager/mio/Makefile.am
index c198107249..ca27c1c15f 100644
--- a/tagmanager/mio/Makefile.am
+++ b/tagmanager/mio/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS = -DG_LOG_DOMAIN=\"MIO\" #-DMIO_DEBUG
 AM_CFLAGS   = $(GTK_CFLAGS) @LIBGEANY_CFLAGS@
 
 libmio_la_SOURCES = mio.c
-libmio_la_LDFLAGS = @LIBGEANY_LIBS@
 
 EXTRA_DIST = \
 	mio.h \
diff --git a/tagmanager/src/Makefile.am b/tagmanager/src/Makefile.am
index c7e640950c..65ee42c5ab 100644
--- a/tagmanager/src/Makefile.am
+++ b/tagmanager/src/Makefile.am
@@ -30,5 +30,3 @@ libtagmanager_la_SOURCES =\
 	tm_tag.c \
 	tm_workspace.h \
 	tm_workspace.c
-
-libtagmanager_la_LDFLAGS = @LIBGEANY_LIBS@