[epiphany] Link libephyhistory.la directly into libephymisc.la



commit 74b907c58c98f18ffc466f1a8386b20a67a1a8cb
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Aug 21 15:58:19 2016 -0500

    Link libephyhistory.la directly into libephymisc.la
    
    This way, we don't need separate static copies of libephyhistory.la in
    both libephymain.la and epiphany-profile-migrator.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=720248

 lib/Makefile.am |    2 +-
 src/Makefile.am |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d9791e5..a6edc8d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -97,6 +97,7 @@ libephymisc_la_LDFLAGS = \
        $(AM_LDFLAGS) -avoid-version -no-undefined
 
 libephymisc_la_LIBADD = \
+       $(top_builddir)/lib/history/libephyhistory.la \
        $(CAIRO_LIBS)           \
        $(GDK_PIXBUF_LIBS)      \
        $(GDK_X11_LIBS)         \
@@ -132,7 +133,6 @@ ephy_profile_migrator_CPPFLAGS = \
        $(AM_CPPFLAGS)
 
 ephy_profile_migrator_LDADD = \
-       $(top_builddir)/lib/history/libephyhistory.la \
        libephymisc.la          \
        $(GLIB_LIBS)            \
        $(GTK_LIBS)             \
diff --git a/src/Makefile.am b/src/Makefile.am
index a85dcf9..a7a631e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -100,7 +100,6 @@ libephymain_la_LIBADD = \
        $(top_builddir)/src/bookmarks/libephybookmarks.la       \
        $(top_builddir)/embed/libephyembed.la                   \
        $(top_builddir)/lib/widgets/libephywidgets.la           \
-       $(top_builddir)/lib/history/libephyhistory.la           \
        $(top_builddir)/lib/libephymisc.la                      \
        $(top_builddir)/lib/egg/libegg.la                       \
        $(GDK_LIBS)             \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]