Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Thomas Martitz kugel@rockbox.org Date: Tue, 10 Mar 2015 22:16:49 UTC Commit: bc013ae9fea0d312a12b89098aa135f2ff9850a4 https://github.com/geany/geany/commit/bc013ae9fea0d312a12b89098aa135f2ff9850...
Log Message: ----------- 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.
Modified Paths: -------------- m4/geany-lib.m4 scintilla/Makefile.am src/Makefile.am tagmanager/ctags/Makefile.am tagmanager/mio/Makefile.am tagmanager/src/Makefile.am
Modified: m4/geany-lib.m4 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -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], [
Modified: scintilla/Makefile.am 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -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@
Modified: src/Makefile.am 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -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
Modified: tagmanager/ctags/Makefile.am 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -83,5 +83,3 @@ libctags_la_SOURCES = \ vstring.c \ vstring.h \ $(parsers) - -libctags_la_LDFLAGS = @LIBGEANY_LIBS@
Modified: tagmanager/mio/Makefile.am 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -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 \
Modified: tagmanager/src/Makefile.am 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -30,5 +30,3 @@ libtagmanager_la_SOURCES =\ tm_tag.c \ tm_workspace.h \ tm_workspace.c - -libtagmanager_la_LDFLAGS = @LIBGEANY_LIBS@
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).