diff options
| author | Michael Catanzaro <mcatanzaro@gnome.org> | 2016-08-21 15:58:19 -0500 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2016-08-21 16:00:29 -0500 |
| commit | 74b907c58c98f18ffc466f1a8386b20a67a1a8cb (patch) | |
| tree | 9e46f668ff3f7a98e4a7c95e2b8eecea64635dcd | |
| parent | 7e705f68338519ad12c1ff1fef4177bbd9b1f4e4 (diff) | |
| download | epiphany-74b907c58c98f18ffc466f1a8386b20a67a1a8cb.tar.gz | |
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
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index d9791e594..a6edc8de4 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 a85dcf9d3..a7a631edd 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) \ |