[epiphany] Link the web extension to libephymisc.la



commit b518c6e900a05bfbc7d3f61ce2b9b71e5469bf2c
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Aug 30 12:40:37 2015 -0500

    Link the web extension to libephymisc.la
    
    This avoids compiling many files multiple times. Also, move the
    uri-tester into the web extension directory, since that's the only place
    it's used.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=747521

 embed/web-extension/Makefile.am        |   20 +++-----------------
 embed/{ => web-extension}/uri-tester.c |    0
 embed/{ => web-extension}/uri-tester.h |    0
 3 files changed, 3 insertions(+), 17 deletions(-)
---
diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
index 124177a..71a15e5 100644
--- a/embed/web-extension/Makefile.am
+++ b/embed/web-extension/Makefile.am
@@ -17,25 +17,10 @@ libephywebextension_la_SOURCES = \
        ephy-web-overview.c \
        ephy-web-overview-model.h \
        ephy-web-overview-model.c \
-       $(top_srcdir)/embed/uri-tester.c \
-       $(top_srcdir)/embed/uri-tester.h \
-       $(top_srcdir)/lib/ephy-debug.c \
-       $(top_srcdir)/lib/ephy-debug.h \
-       $(top_srcdir)/lib/ephy-file-helpers.c \
-       $(top_srcdir)/lib/ephy-file-helpers.h \
-       $(top_srcdir)/lib/ephy-form-auth-data.c \
-       $(top_srcdir)/lib/ephy-form-auth-data.h \
-       $(top_srcdir)/lib/ephy-settings.c \
-       $(top_srcdir)/lib/ephy-settings.h \
-       $(top_srcdir)/lib/ephy-string.c \
-       $(top_srcdir)/lib/ephy-string.h \
-       $(top_srcdir)/lib/ephy-uri-helpers.c \
-       $(top_srcdir)/lib/ephy-uri-helpers.h \
-       $(top_srcdir)/lib/ephy-web-dom-utils.c \
-       $(top_srcdir)/lib/ephy-web-dom-utils.h
+       uri-tester.c \
+       uri-tester.h
 
 libephywebextension_la_CPPFLAGS = \
-       -I$(top_srcdir)/embed \
        -I$(top_srcdir)/lib \
        $(AM_CPPFLAGS)
 
@@ -46,6 +31,7 @@ libephywebextension_la_CFLAGS = \
        $(WEB_EXTENSION_CFLAGS)
 
 libephywebextension_la_LIBADD = \
+       $(top_builddir)/lib/libephymisc.la \
        $(WEB_EXTENSION_LIBS)
 
 libephywebextension_la_LDFLAGS = \
diff --git a/embed/uri-tester.c b/embed/web-extension/uri-tester.c
similarity index 100%
rename from embed/uri-tester.c
rename to embed/web-extension/uri-tester.c
diff --git a/embed/uri-tester.h b/embed/web-extension/uri-tester.h
similarity index 100%
rename from embed/uri-tester.h
rename to embed/web-extension/uri-tester.h


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