[geany/geany] 056e53: Make our convenience libraries more self-contained

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Wed, 04 May 2016 17:11:13 UTC
Commit:      056e53c2c510602b9e35e79a128bdea77dd4de04
             https://github.com/geany/geany/commit/056e53c2c510602b9e35e79a128bdea77dd4de04

Log Message:
-----------
Make our convenience libraries more self-contained

Make each convenience library depend on the ones it requires, which is
pretty straightforward for us as they each only depend on a single
other one, avoiding any worry about double linking of static objects.


Modified Paths:
--------------
    src/Makefile.am
    tagmanager/Makefile.am
    tagmanager/ctags/Makefile.am
    tagmanager/mio/Makefile.am
    tagmanager/src/Makefile.am

Modified: src/Makefile.am
2 lines changed, 0 insertions(+), 2 deletions(-)
===================================================================
@@ -120,8 +120,6 @@ libgeany_la_LDFLAGS = @LIBGEANY_LDFLAGS@
 
 libgeany_la_LIBADD = \
 	$(top_builddir)/scintilla/libscintilla.la \
-	$(top_builddir)/tagmanager/ctags/libctags.la \
-	$(top_builddir)/tagmanager/mio/libmio.la \
 	$(top_builddir)/tagmanager/src/libtagmanager.la \
 	@GTK_LIBS@ \
 	@GTHREAD_LIBS@ \


Modified: tagmanager/Makefile.am
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,3 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = ctags mio src
+SUBDIRS = mio ctags src


Modified: tagmanager/ctags/Makefile.am
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -11,6 +11,8 @@ EXTRA_DIST = \
 
 noinst_LTLIBRARIES = libctags.la
 
+libctags_la_LIBADD = ../mio/libmio.la
+
 parsers = \
 	abaqus.c \
 	abc.c \


Modified: tagmanager/mio/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -3,6 +3,7 @@ noinst_LTLIBRARIES = libmio.la
 AM_CPPFLAGS = -DG_LOG_DOMAIN=\"MIO\" #-DMIO_DEBUG
 AM_CFLAGS   = $(GTK_CFLAGS) @LIBGEANY_CFLAGS@
 
+libmio_la_LIBADD = $(GTK_LIBS)
 libmio_la_SOURCES = mio.c
 
 EXTRA_DIST = \


Modified: tagmanager/src/Makefile.am
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -32,3 +32,5 @@ libtagmanager_la_SOURCES =\
 	tm_workspace.c \
 	tm_ctags_wrappers.h \
 	tm_ctags_wrappers.c
+
+libtagmanager_la_LIBADD = ../ctags/libctags.la $(GTK_LIBS)



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).