GNOME.org
 

[epiphany] build: Handle dependencies more explicitly

commit 8f956f737622626965ca03c889a65c25b3f8ee37
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Aug 7 14:58:13 2016 -0500

    build: Handle dependencies more explicitly
    
    Also, to make this commit more confusing, make several style adjustments
    in the Automake files.

 configure.ac                    |   76 +++++++++++------------
 embed/Makefile.am               |   55 +++++++++++------
 embed/web-extension/Makefile.am |   57 ++++++++++-------
 lib/Makefile.am                 |   69 +++++++++++++++------
 lib/egg/Makefile.am             |   28 ++-------
 lib/history/Makefile.am         |   24 +++++---
 lib/widgets/Makefile.am         |   29 +++++++--
 src/Makefile.am                 |  129 ++++++++++++++++++++++-----------------
 src/bookmarks/Makefile.am       |   37 +++++++++---
 tests/Makefile.am               |   44 +++++++------
 10 files changed, 324 insertions(+), 224 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ed5be9c..6b60ec0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,19 +74,6 @@ GLIB_GSETTINGS
 AX_REQUIRE_DEFINED([YELP_HELP_INIT])
 YELP_HELP_INIT
 
-GLIB_REQUIRED=2.44.0
-GTK_REQUIRED=3.19.1
-LIBXML_REQUIRED=2.6.12
-LIBXSLT_REQUIRED=1.1.7
-WEBKIT_GTK_REQUIRED=2.13.2
-LIBSOUP_REQUIRED=2.48.0
-GNOME_DESKTOP_REQUIRED=2.91.2
-LIBSECRET_REQUIRED=0.14
-GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.0.1
-LIBNOTIFY_REQUIRED=0.5.1
-GCR_REQUIRED=3.5.5
-AVAHI_REQUIRED=0.6.22
-
 # Tests
 
 AC_MSG_CHECKING([whether to build tests])
@@ -97,35 +84,44 @@ AC_MSG_RESULT([$enable_tests])
 
 AM_CONDITIONAL([ENABLE_TESTS],[test "$enable_tests" = "yes"])
 
+# ************
+# Dependencies
+# ************
+
 LIBGD_INIT([_view-common static])
 
-PKG_CHECK_MODULES([DEPENDENCIES], [
-                 glib-2.0 >= $GLIB_REQUIRED
-                 gthread-2.0
-                 gio-unix-2.0 >= $GLIB_REQUIRED
-                 gtk+-3.0 >= $GTK_REQUIRED
-                 gtk+-unix-print-3.0 >= $GTK_REQUIRED
-                 x11
-                 libxml-2.0 >= $LIBXML_REQUIRED
-                 libxslt >= $LIBXSLT_REQUIRED
-                 webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED
-                 libsoup-2.4 >= $LIBSOUP_REQUIRED
-                 libsecret-1 >= $LIBSECRET_REQUIRED
-                 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED
-                 gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
-                 libnotify >= $LIBNOTIFY_REQUIRED
-                 sqlite3
-                 gcr-3 >= $GCR_REQUIRED
-                 avahi-gobject >= $AVAHI_REQUIRED
-                 avahi-client >= $AVAHI_REQUIRED
-                 ])
-
-PKG_CHECK_MODULES([WEB_EXTENSION], [
-                  webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED
-                  libsecret-1 >= $LIBSECRET_REQUIRED
-                  ])
-AC_SUBST([WEB_EXTENSION_CFLAGS])
-AC_SUBST([WEB_EXTENSION_LIBS])
+LT_LIB_M
+
+AVAHI_REQUIRED=0.6.22
+GLIB_REQUIRED=2.44.0
+GTK_REQUIRED=3.19.1
+WEBKITGTK_REQUIRED=2.13.2
+
+PKG_CHECK_MODULES([AVAHI_CLIENT], [avahi-client >= $AVAHI_REQUIRED])
+PKG_CHECK_MODULES([AVAHI_GOBJECT], [avahi-gobject >= $AVAHI_REQUIRED])
+PKG_CHECK_MODULES([CAIRO], [cairo])
+PKG_CHECK_MODULES([GCR], [gcr-3 >= 3.5.5])
+PKG_CHECK_MODULES([GDK], [gdk-3.0 >= $GTK_REQUIRED])
+PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0])
+dnl FIXME: x11 should not be mandatory.
+PKG_CHECK_MODULES([GDK_X11], [gdk-x11-3.0 >= $GTK_REQUIRED])
+PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= $GLIB_REQUIRED])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= $GLIB_REQUIRED])
+PKG_CHECK_MODULES([GNOME_DESKTOP], [gnome-desktop-3.0 >= 2.91.2])
+PKG_CHECK_MODULES([GSETTINGS_DESKTOP_SCHEMAS], [gsettings-desktop-schemas])
+PKG_CHECK_MODULES([GTHREAD], [gthread-2.0 >= $GLIB_REQUIRED])
+PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= $GTK_REQUIRED])
+PKG_CHECK_MODULES([GTK_UNIX_PRINT], [gtk+-unix-print-3.0 >= $GTK_REQUIRED])
+PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= 0.5.1])
+PKG_CHECK_MODULES([LIBSECRET], [libsecret-1 >= 0.14])
+PKG_CHECK_MODULES([LIBSOUP], [libsoup-2.4 >= 2.48.0])
+PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= 2.6.12])
+PKG_CHECK_MODULES([LIBXSLT], [libxslt >= 1.1.7])
+PKG_CHECK_MODULES([SQLITE3], [sqlite3])
+PKG_CHECK_MODULES([WEBKIT2GTK], [webkit2gtk-4.0 >= $WEBKITGTK_REQUIRED])
+PKG_CHECK_MODULES([WEBKIT2GTK_WEB_EXTENSION], [webkit2gtk-web-extension-4.0 >= $WEBKITGTK_REQUIRED])
+dnl FIXME: x11 should not be mandatory.
+PKG_CHECK_MODULES([X11], [x11])
 
 # ******************
 # Portability checks
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 8969e1b..f503421 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -1,11 +1,10 @@
-NULL =
-
 SUBDIRS = web-extension
 
-AM_CFLAGS = $(WARN_CFLAGS)
-AM_LDFLAGS = $(WARN_LDFLAGS)
+AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(WARN_CFLAGS)
+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) $(WARN_LDFLAGS)
 
-noinst_LTLIBRARIES = libephyembed.la
+noinst_LTLIBRARIES = \
+       libephyembed.la
 
 TYPES_H_FILES = \
        ephy-download.h                 \
@@ -52,23 +51,41 @@ libephyembed_la_SOURCES = \
 nodist_libephyembed_la_SOURCES = \
        $(BUILT_SOURCES)
 
+libephyembed_la_CFLAGS = \
+       $(GDK_CFLAGS)           \
+       $(GIO_CFLAGS)           \
+       $(GLIB_CFLAGS)          \
+       $(GTK_CFLAGS)           \
+       $(LIBSECRET_CFLAGS)     \
+       $(LIBSOUP_CFLAGS)       \
+       $(WEBKIT2GTK_CFLAGS)    \
+       $(AM_CFLAGS)
+
 libephyembed_la_CPPFLAGS = \
-       -I$(top_srcdir)/embed/web-extension \
-       -I$(top_builddir)/lib               \
-       -I$(top_srcdir)/lib                 \
-       -I$(top_srcdir)/lib/egg             \
-       -I$(top_srcdir)/lib/history         \
-       -I$(top_srcdir)/lib/widgets         \
-       -I$(top_builddir)/lib/widgets       \
+       -I$(top_builddir)/lib                   \
+       -I$(top_builddir)/lib/widgets           \
+       -I$(top_srcdir)/embed/web-extension     \
+       -I$(top_srcdir)/lib                     \
+       -I$(top_srcdir)/lib/egg                 \
+       -I$(top_srcdir)/lib/history             \
+       -I$(top_srcdir)/lib/widgets             \
+       -DDATADIR=\"$(datadir)\"                \
+       -DSHARE_DIR=\"$(pkgdatadir)\"           \
+       -DEPHY_WEB_EXTENSIONS_DIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/web-extensions\" \
        $(AM_CPPFLAGS)
 
-libephyembed_la_CFLAGS = \
-       -DDATADIR="\"$(datadir)\""      \
-       -DSHARE_DIR=\"$(pkgdatadir)\"   \
-       -DEPHY_WEB_EXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/web-extensions"\" \
-       $(DEPENDENCIES_CFLAGS)  \
-       $(CODE_COVERAGE_CFLAGS) \
-       $(AM_CFLAGS)
+libephyembed_la_LDFLAGS = \
+       $(AM_LDFLAGS)
+
+libephyembed_la_LIBADD = \
+       $(GDK_LIBS)             \
+       $(GIO_LIBS)             \
+       $(GLIB_LIBS)            \
+       $(GTK_LIBS)             \
+       $(LIBM)                 \
+       $(LIBSECRET_LIBS)       \
+       $(LIBSOUP_LIBS)         \
+       $(WEBKIT2GTK_LIBS)
 
 CLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 
diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
index 0095e3b..b02476d 100644
--- a/embed/web-extension/Makefile.am
+++ b/embed/web-extension/Makefile.am
@@ -3,40 +3,49 @@ AM_LDFLAGS = $(WARN_LDFLAGS)
 
 webextension_LTLIBRARIES = libephywebextension.la
 
-webextensiondir = \
-       $(libdir)/epiphany/$(EPIPHANY_MAJOR)/web-extensions
+webextensiondir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/web-extensions
 
 libephywebextension_la_SOURCES = \
-       ephy-embed-form-auth.c \
-       ephy-embed-form-auth.h \
-       ephy-uri-tester.c \
-       ephy-uri-tester.h \
-       ephy-web-dom-utils.c \
-       ephy-web-dom-utils.h \
-       ephy-web-extension.c \
-       ephy-web-extension.h \
-       ephy-web-extension-main.c \
-       ephy-web-extension-names.h \
-       ephy-web-overview.h \
-       ephy-web-overview.c \
-       ephy-web-overview-model.h \
+       ephy-embed-form-auth.c          \
+       ephy-embed-form-auth.h          \
+       ephy-uri-tester.c               \
+       ephy-uri-tester.h               \
+       ephy-web-dom-utils.c            \
+       ephy-web-dom-utils.h            \
+       ephy-web-extension.c            \
+       ephy-web-extension.h            \
+       ephy-web-extension-main.c       \
+       ephy-web-extension-names.h      \
+       ephy-web-overview.h             \
+       ephy-web-overview.c             \
+       ephy-web-overview-model.h       \
        ephy-web-overview-model.c
 
 libephywebextension_la_CPPFLAGS = \
-       -I$(top_srcdir)/lib \
+       -I$(top_srcdir)/lib     \
+       -DSHARE_DIR=\"$(pkgdatadir)\"                   \
+       -DTOP_SRC_DATADIR=\"$(top_srcdir)/data\"        \
        $(AM_CPPFLAGS)
 
 libephywebextension_la_CFLAGS = \
-       -DSHARE_DIR=\"$(pkgdatadir)\" \
-       -DTOP_SRC_DATADIR=\"$(top_srcdir)/data\" \
-       $(AM_CFLAGS) \
-       $(WEB_EXTENSION_CFLAGS)
+       $(GIO_CFLAGS)                                   \
+       $(GLIB_CFLAGS)                                  \
+       $(GTK_CFLAGS)                                   \
+       $(LIBSECRET_CFLAGS)                             \
+       $(LIBSOUP_CFLAGS)                               \
+       $(WEBKIT2GTK_WEB_EXTENSION_CFLAGS)              \
+       $(AM_CFLAGS)
+
+libephywebextension_la_LDFLAGS = \
+       $(AM_LDFLAGS) -module -avoid-version -no-undefined
 
 libephywebextension_la_LIBADD = \
        $(top_builddir)/lib/libephymisc.la \
-       $(WEB_EXTENSION_LIBS)
-
-libephywebextension_la_LDFLAGS = \
-       -module -avoid-version -no-undefined
+       $(GIO_LIBS) \
+       $(GLIB_LIBS) \
+       $(GTK_LIBS) \
+       $(LIBSECRET_LIBS) \
+       $(LIBSOUP_LIBS) \
+       $(WEBKIT2GTK_WEB_EXTENSION_LIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/lib/Makefile.am b/lib/Makefile.am
index b130c16..9584aee 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = widgets egg history
 
-AM_CFLAGS = $(WARN_CFLAGS)
-AM_LDFLAGS = $(WARN_LDFLAGS)
+AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(WARN_CFLAGS)
+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) $(WARN_LDFLAGS)
 
 noinst_LTLIBRARIES = libephymisc.la
 
@@ -69,24 +69,47 @@ nodist_libephymisc_la_SOURCES = \
        $(BUILT_SOURCES)
 
 libephymisc_la_CPPFLAGS = \
-       -I$(top_builddir)/lib                       \
-       -I$(top_srcdir)/lib/egg                     \
+       -DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \
        -DDATADIR=\"$(datadir)\"                    \
+       -DLOCALEDIR=\"$(localedir)\"                \
        -DSHARE_DIR=\"$(pkgdatadir)\"               \
        -DTOP_SRC_DATADIR=\"$(top_srcdir)/data\"    \
-       -DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \
-       -DLOCALEDIR=\"$(localedir)\"                \
+       -I$(top_builddir)/lib                       \
+       -I$(top_srcdir)/lib/egg                     \
        $(AM_CPPFLAGS)
 
 libephymisc_la_CFLAGS = \
-       $(DEPENDENCIES_CFLAGS)  \
-       $(CODE_COVERAGE_CFLAGS) \
+       $(CAIRO_CFLAGS)         \
+       $(GDK_PIXBUF_CFLAGS)    \
+       $(GDK_X11_CFLAGS)       \
+       $(GIO_CFLAGS)           \
+       $(GLIB_CFLAGS)          \
+       $(GNOME_DESKTOP_CFLAGS) \
+       $(GTK_CFLAGS)           \
+       $(LIBSECRET_CFLAGS)     \
+       $(LIBSOUP_CFLAGS)       \
+       $(LIBXML_CFLAGS)        \
+       $(SQLITE3_CFLAGS)       \
+       $(WEBKIT2GTK_CFLAGS)    \
        $(AM_CFLAGS)
 
+libephymisc_la_LDFLAGS = \
+       $(AM_LDFLAGS)
+
 libephymisc_la_LIBADD = \
-       -lm \
-       $(CODE_COVERAGE_LDFLAGS) \
-       $(DEPENDENCIES_LIBS)
+       $(CAIRO_LIBS)           \
+       $(GDK_PIXBUF_LIBS)      \
+       $(GDK_X11_LIBS)         \
+       $(GIO_LIBS)             \
+       $(GLIB_LIBS)            \
+       $(GNOME_DESKTOP_LIBS)   \
+       $(GTK_LIBS)             \
+       $(LIBSECRET_LIBS)       \
+       $(LIBSOUP_LIBS)         \
+       $(LIBXML_LIBS)          \
+       $(LIBM)                 \
+       $(SQLITE3_LIBS)         \
+       $(WEBKIT2GTK_LIBS)
 
 bin_PROGRAMS = ephy-profile-migrator
 
@@ -94,15 +117,13 @@ ephy_profile_migrator_SOURCES = \
        ephy-profile-migrator.c
 
 ephy_profile_migrator_CFLAGS = \
-       $(DEPENDENCIES_CFLAGS) \
-       $(NSS_CFLAGS) \
+       $(GLIB_CFLAGS)          \
+       $(GTK_CFLAGS)           \
+       $(LIBSECRET_CFLAGS)     \
+       $(LIBSOUP_CFLAGS)       \
+       $(WEBKIT2GTK_CFLAGS)    \
        $(AM_CFLAGS)
 
-ephy_profile_migrator_LDADD = \
-       $(top_builddir)/lib/history/libephyhistory.la \
-       libephymisc.la \
-       $(DEPENDENCIES_LIBS)
-
 ephy_profile_migrator_CPPFLAGS = \
        -I$(top_builddir)/lib \
        -I$(srcdir)/history \
@@ -111,6 +132,18 @@ ephy_profile_migrator_CPPFLAGS = \
        -DLOCALEDIR=\"$(localedir)\" \
        $(AM_CPPFLAGS)
 
+ephy_profile_migrator_LDADD = \
+       $(top_builddir)/lib/history/libephyhistory.la \
+       libephymisc.la          \
+       $(GLIB_LIBS)            \
+       $(GTK_LIBS)             \
+       $(LIBSECRET_LIBS)       \
+       $(LIBSOUP_LIBS)         \
+       $(WEBKIT2GTK_LIBS)
+
+ephy_profile_migrator_LDFLAGS = \
+       $(AM_LDFLAGS)
+
 BUILT_SOURCES = \
        ephy-lib-type-builtins.c        \
        ephy-lib-type-builtins.h
diff --git a/lib/egg/Makefile.am b/lib/egg/Makefile.am
index bd1eb95..1cadf46 100644
--- a/lib/egg/Makefile.am
+++ b/lib/egg/Makefile.am
@@ -1,31 +1,13 @@
-NULL =
-
-EGGSOURCES = \
-       eggtreemultidnd.c \
-        $(NULL)
-
-EGGHEADERS = \
-       eggtreemultidnd.h \
-        $(NULL)
-
-noinst_HEADERS = \
-       $(EGGHEADERS) \
-       $(NULL)
-
 noinst_LTLIBRARIES = libegg.la
 
 libegg_la_SOURCES = \
-       $(EGGSOURCES) \
-       $(EGGHEADERS)
+       eggtreemultidnd.c       \
+       eggtreemultidnd.h
 
-libegg_la_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\""Egg"\"                \
-       $(AM_CPPFLAGS)
+libegg_la_CFLAGS = $(GTK_CFLAGS)
 
-libegg_la_CFLAGS = \
-       $(DEPENDENCIES_CFLAGS)          \
-       $(CODE_COVERAGE_CFLAGS)         \
-       $(AM_CFLAGS)
+libegg_la_CPPFLAGS = -DG_LOG_DOMAIN=\""Egg"\"
 
+libegg_la_LIBADD = $(GTK_LIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/lib/history/Makefile.am b/lib/history/Makefile.am
index ab4f3af..cb4f21b 100644
--- a/lib/history/Makefile.am
+++ b/lib/history/Makefile.am
@@ -1,5 +1,5 @@
-AM_CFLAGS = $(WARN_CFLAGS)
-AM_LDFLAGS = $(WARN_LDFLAGS)
+AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(WARN_CFLAGS)
+AM_LDFLAGS = $(CODE_COVERAGE_CFLAGS) $(WARN_LDFLAGS)
 
 noinst_LTLIBRARIES = libephyhistory.la
 
@@ -16,19 +16,27 @@ libephyhistory_la_SOURCES = \
 nodist_libephyhistory_la_SOURCES = \
        $(BUILT_SOURCES)
 
+libephyhistory_la_CFLAGS = \
+       $(GLIB_CFLAGS)          \
+       $(GIO_CFLAGS)           \
+       $(AM_CFLAGS)
+
 libephyhistory_la_CPPFLAGS = \
-       -I$(top_builddir)/lib/history   \
        -I$(top_builddir)/lib           \
+       -I$(top_builddir)/lib/history   \
        -I$(top_srcdir)/lib             \
        -DSHARE_DIR=\"$(pkgdatadir)\"   \
        $(AM_CPPFLAGS)
 
-libephyhistory_la_CFLAGS = \
-       $(DEPENDENCIES_CFLAGS)  \
-       $(CODE_COVERAGE_CFLAGS) \
-       $(AM_CFLAGS)
+libephyhistory_la_LDFLAGS = \
+       $(AM_LDFLAGS)
 
-TYPES_H_FILES = ephy-history-types.h
+libephyhistory_la_LIBADD = \
+       $(GLIB_LIBS)    \
+       $(GIO_LIBS)
+
+TYPES_H_FILES = \
+       ephy-history-types.h
 
 BUILT_SOURCES = \
        ephy-history-type-builtins.c    \
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index 090c36a..e210a6f 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libephywidgets.la
 
-AM_CFLAGS = $(WARN_CFLAGS)
-AM_LDFLAGS = $(WARN_LDFLAGS)
+AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(WARN_CFLAGS)
+AM_LDFLAGS = $(CODE_COVERAGE_LIBS) $(WARN_LDFLAGS)
 
 BUILT_SOURCES = \
        ephy-widgets-type-builtins.c    \
@@ -89,8 +89,8 @@ libephywidgets_la_SOURCES = \
 libephywidgets_la_CPPFLAGS = \
        -I$(top_builddir)/lib           \
        -I$(top_builddir)/lib/widgets   \
-       -I$(top_srcdir)/lib             \
        -I$(top_srcdir)/embed           \
+       -I$(top_srcdir)/lib             \
        -I$(top_srcdir)/lib/egg         \
        -I$(top_srcdir)/lib/history     \
        -I$(top_srcdir)/libgd           \
@@ -98,11 +98,28 @@ libephywidgets_la_CPPFLAGS = \
        $(AM_CPPFLAGS)
 
 libephywidgets_la_CFLAGS = \
-       $(DEPENDENCIES_CFLAGS)  \
-       $(CODE_COVERAGE_CFLAGS) \
+       $(GCR_CFLAGS)           \
+       $(GDK_CFLAGS)           \
+       $(GDK_PIXBUF_CFLAGS)    \
+       $(GIO_CFLAGS)           \
+       $(GLIB_CFLAGS)          \
+       $(GTK_CFLAGS)           \
+       $(LIBSOUP_CFLAGS)       \
+       $(WEBKIT2GTK_CFLAGS)    \
        $(AM_CFLAGS)
 
+libephywidgets_la_LDFLAGS = \
+       $(AM_LDFLAGS)
+
 libephywidgets_la_LIBADD = \
-       $(top_builddir)/libgd/libgd.la
+       $(top_builddir)/libgd/libgd.la  \
+       $(GCR_LIBS)             \
+       $(GDK_LIBS)             \
+       $(GDK_PIXBUF_LIBS)      \
+       $(GIO_LIBS)             \
+       $(GLIB_LIBS)            \
+       $(GTK_LIBS)             \
+       $(LIBSOUP_LIBS)         \
+       $(WEBKIT2GTK_LIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index a3c300a..6988d59 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,7 @@
 SUBDIRS = bookmarks
 
-NULL =
-
-AM_CFLAGS = $(WARN_CFLAGS)
-AM_LDFLAGS = $(WARN_LDFLAGS)
+AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(WARN_CFLAGS)
+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) $(WARN_LDFLAGS)
 
 noinst_LTLIBRARIES = libephymain.la
 
@@ -12,16 +10,14 @@ bin_PROGRAMS = epiphany
 EXTRA_DIST = \
        org.gnome.ShellSearchProvider2.xml \
        epiphany.gresource.xml \
-       $(RESOURCE_FILES)      \
-       $(NULL)
+       $(RESOURCE_FILES)
 
 TYPES_H_FILES = \
        ephy-link.h                             \
        ephy-session.h                          \
        ephy-shell.h                            \
        ephy-window.h                           \
-       ephy-title-box.h                        \
-       $(NULL)
+       ephy-title-box.h
 
 libephymain_la_SOURCES = \
        clear-data-dialog.c                     \
@@ -66,33 +62,58 @@ libephymain_la_SOURCES = \
        prefs-dialog.c                          \
        prefs-dialog.h                          \
        window-commands.c                       \
-       window-commands.h                       \
-       $(NULL)
+       window-commands.h
 
 nodist_libephymain_la_SOURCES = \
        $(TYPES_SOURCE)
 
 libephymain_la_CPPFLAGS = \
-       -I$(top_builddir)/lib           \
        -I$(top_builddir)/embed         \
+       -I$(top_builddir)/lib           \
+       -I$(top_builddir)/lib/widgets   \
        -I$(top_srcdir)/embed           \
        -I$(top_srcdir)/lib             \
        -I$(top_srcdir)/lib/egg         \
        -I$(top_srcdir)/lib/history     \
        -I$(top_srcdir)/lib/widgets     \
-       -I$(top_builddir)/lib/widgets   \
        -I$(top_srcdir)/src/bookmarks   \
-       -DLOADER_DIR=\""$(pkglibdir)/$(EPIPHANY_MAJOR)/loaders"\"               \
-       -DDATADIR=\""$(pkgdatadir)"\"   \
+       -DLOADER_DIR=\"$(pkglibdir)/$(EPIPHANY_MAJOR)/loaders\"         \
+       -DDATADIR=\"$(pkgdatadir)\"     \
        -DLOCALEDIR=\"$(localedir)\"    \
        $(AM_CPPFLAGS)
 
 libephymain_la_CFLAGS = \
-       $(DEPENDENCIES_CFLAGS)    \
-       $(WEBKIT_CFLAGS)          \
-       $(CODE_COVERAGE_CFLAGS)   \
+       $(GDK_CFLAGS)           \
+       $(GIO_CFLAGS)           \
+       $(GLIB_CFLAGS)          \
+       $(GTK_CFLAGS)           \
+       $(LIBNOTIFY_CFLAGS)     \
+       $(LIBSECRET_CFLAGS)     \
+       $(LIBSOUP_CFLAGS)       \
+       $(LIBXML_CFLAGS)        \
+       $(WEBKIT2GTK_CFLAGS)    \
        $(AM_CFLAGS)
 
+libephymain_la_LDFLAGS = \
+       $(AM_LDFLAGS)
+
+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)             \
+       $(GIO_LIBS)             \
+       $(GLIB_LIBS)            \
+       $(GTK_LIBS)             \
+       $(LIBNOTIFY_LIBS)       \
+       $(LIBSECRET_LIBS)       \
+       $(LIBSOUP_LIBS)         \
+       $(LIBXML_LIBS)          \
+       $(WEBKIT2GTK_LIBS)
+
 RESOURCE_FILES = \
        resources/about.css                       \
        resources/bookmark-properties.ui          \
@@ -113,29 +134,29 @@ RESOURCE_FILES = \
        resources/prefs-dialog.ui                 \
        resources/prefs-lang-dialog.ui            \
        resources/shortcuts-dialog.ui             \
-       resources/gtk/menus.ui                    \
-       $(NULL)
+       resources/gtk/menus.ui
 
 epiphany-resources.c: epiphany.gresource.xml $(RESOURCE_FILES)
-       $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir)/resources --generate-source 
--c-name epiphany $(srcdir)/epiphany.gresource.xml
+       $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir)/resources --generate-source 
--c-name epiphany $(srcdir)/epiphany.gresource.xml
 
 epiphany-resources.h: epiphany.gresource.xml $(RESOURCE_FILES)
-       $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir)/resources --generate-header 
--c-name epiphany $(srcdir)/epiphany.gresource.xml
+       $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir)/resources --generate-header 
--c-name epiphany $(srcdir)/epiphany.gresource.xml
 
 EPIPHANY_RESOURCES = \
        epiphany-resources.c \
-       epiphany-resources.h \
-       $(NULL)
+       epiphany-resources.h
 
 BUILT_SOURCES = \
        $(dbus_shell_search_provider_built_sources) \
        $(EPIPHANY_RESOURCES) \
-       $(TYPES_SOURCE)       \
-       $(NULL)
+       $(TYPES_SOURCE)
 
 epiphany_SOURCES = ephy-main.c \
-       $(EPIPHANY_RESOURCES)  \
-       $(NULL)
+       $(EPIPHANY_RESOURCES)
+
+epiphany_CFLAGS = \
+       $(libephymain_la_CFLAGS)        \
+       $(AM_CFLAGS)
 
 epiphany_CPPFLAGS = \
        -I$(top_builddir)/lib           \
@@ -146,30 +167,23 @@ epiphany_CPPFLAGS = \
        -I$(top_srcdir)/lib/widgets     \
        -I$(top_builddir)/lib/widgets   \
        -I$(top_srcdir)/src/bookmarks   \
-       -DDATADIR=\""$(datadir)"\"      \
+       -DDATADIR=\"$(datadir)\"        \
        -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
        -DLOCALEDIR=\"$(localedir)\"    \
        $(AM_CPPFLAGS)
 
-epiphany_CFLAGS = \
-       $(DEPENDENCIES_CFLAGS)  \
-       $(AM_CFLAGS)
+epiphany_LDADD = \
+       libephymain.la          \
+       $(GLIB_LIBS)            \
+       $(GTK_LIBS)             \
+       $(LIBNOTIFY_LIBS)       \
+       $(LIBXML_LIBS)          \
+       $(X11_LIBS)
 
 epiphany_LDFLAGS = \
-       -dlopen self \
+       -dlopen self    \
        $(AM_LDFLAGS)
 
-epiphany_LDADD = \
-       libephymain.la \
-       $(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 \
-       $(DEPENDENCIES_LIBS) \
-       $(CODE_COVERAGE_LDFLAGS)
-
 libexec_PROGRAMS = epiphany-search-provider
 
 epiphany_search_provider_SOURCES = \
@@ -177,6 +191,10 @@ epiphany_search_provider_SOURCES = \
        ephy-search-provider.c \
        ephy-search-provider-main.c
 
+epiphany_search_provider_CFLAGS = \
+       $(libephymain_la_CFLAGS)        \
+       $(AM_CFLAGS)
+
 epiphany_search_provider_CPPFLAGS = \
        -I$(top_builddir)/lib           \
        -I$(top_srcdir)/embed           \
@@ -188,18 +206,18 @@ epiphany_search_provider_CPPFLAGS = \
        -DLOCALEDIR=\"$(localedir)\"    \
        $(AM_CPPFLAGS)
 
-epiphany_search_provider_CFLAGS = $(epiphany_CFLAGS)
-
 epiphany_search_provider_LDADD = \
-       libephymain.la \
-       $(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 \
-       $(DEPENDENCIES_LIBS) \
-       $(CODE_COVERAGE_LDFLAGS)
+       libephymain.la          \
+       $(GIO_LIBS)             \
+       $(GLIB_LIBS)            \
+       $(GTK_LIBS)             \
+       $(LIBSECRET_LIBS)       \
+       $(LIBSOUP_LIBS)         \
+       $(LIBXML_LIBS)
+
+epiphany_search_provider_LDFLAGS = \
+       -dlopen self    \
+       $(AM_LDFLAGS)
 
 TYPES_SOURCE = \
        ephy-type-builtins.c    \
@@ -259,8 +277,7 @@ $(dbus_shell_search_provider_built_sources) : Makefile.am $(srcdir)/org.gnome.Sh
                --interface-prefix org.gnome.                           \
                --c-namespace Ephy                                      \
                --generate-c-code ephy-shell-search-provider-generated  \
-               $(srcdir)/org.gnome.ShellSearchProvider2.xml            \
-               $(NULL)
+               $(srcdir)/org.gnome.ShellSearchProvider2.xml
 
 CLEANFILES = \
        $(stamp_files) \
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index af191a9..905993f 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libephybookmarks.la
 
-AM_CFLAGS = $(WARN_CFLAGS)
-AM_LDFLAGS = $(WARN_LDFLAGS)
+AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(WARN_CFLAGS)
+AM_LDFLAGS = $(CODE_COVERAGE_LIBS) $(WARN_LDFLAGS)
 
 TYPES_H_FILES = \
        ephy-bookmarks.h
@@ -94,24 +94,43 @@ stamp-ephy-bookmarks-type-builtins.h: Makefile $(TYPES_H_FILES)
        && rm -f xgen-$(@F) \
        && echo timestamp > $(@F)
 
+libephybookmarks_la_CFLAGS = \
+       $(AVAHI_CLIENT_CFLAGS)  \
+       $(AVAHI_GOBJECT_CFLAGS) \
+       $(GDK_CFLAGS)           \
+       $(GIO_CFLAGS)           \
+       $(GLIB_CFLAGS)          \
+       $(GTK_CFLAGS)           \
+       $(LIBXML_CFLAGS)        \
+       $(LIBXSLT_CFLAGS)       \
+       $(WEBKIT2GTK_CFLAGS)    \
+       $(AM_CFLAGS)
+
 libephybookmarks_la_CPPFLAGS = \
        -I$(top_builddir)/lib           \
+       -I$(top_builddir)/lib/widgets   \
        -I$(top_srcdir)/lib             \
        -I$(top_srcdir)/src             \
        -I$(top_srcdir)/embed           \
        -I$(top_srcdir)/lib/widgets     \
-       -I$(top_builddir)/lib/widgets   \
        -I$(top_srcdir)/lib/history     \
        -I$(top_srcdir)/lib/egg         \
-       -DDATADIR=\""$(pkgdatadir)"\"   \
+       -DDATADIR=\"$(pkgdatadir)\"     \
        $(AM_CPPFLAGS)
 
-libephybookmarks_la_CFLAGS = \
-       $(DEPENDENCIES_CFLAGS)  \
-       $(CODE_COVERAGE_CFLAGS) \
-       $(AM_CFLAGS)
+libephybookmarks_la_LDFLAGS = \
+       $(AM_LDFLAGS)
 
-libephybookmarks_la_LIBADD =
+libephybookmarks_la_LIBADD = \
+       $(AVAHI_CLIENT_LIBS)    \
+       $(AVAHI_GOBJECT_LIBS)   \
+       $(GDK_LIBS)             \
+       $(GIO_LIBS)             \
+       $(GLIB_LIBS)            \
+       $(GTK_LIBS)             \
+       $(LIBXML_LIBS)          \
+       $(LIBXSLT_LIBS)         \
+       $(WEBKIT2GTK_LIBS)
 
 CLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6de4240..d581b1f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -89,33 +89,35 @@ test-report perf-report full-report: ${TEST_PROGS}
 check-local: test-nonrecursive
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/embed    \
-       -I$(top_srcdir)/lib      \
-       -I$(top_srcdir)/lib/history \
-       -I$(top_srcdir)/lib/widgets \
-       -I$(top_builddir)/lib/widgets \
-       -I$(top_srcdir)/src      \
-       -I$(top_srcdir)/src/bookmarks
+       -I$(top_srcdir)/embed           \
+       -I$(top_srcdir)/lib             \
+       -I$(top_srcdir)/lib/history     \
+       -I$(top_srcdir)/lib/widgets     \
+       -I$(top_builddir)/lib/widgets   \
+       -I$(top_srcdir)/src             \
+       -I$(top_srcdir)/src/bookmarks   \
+       -DTEST_DIR=\"$(srcdir)\"
 
 AM_CFLAGS = \
-       -DTEST_DIR=\"$(srcdir)\"\
-       $(DEPENDENCIES_CFLAGS)  \
        $(CODE_COVERAGE_CFLAGS) \
-       $(WARN_CFLAGS)
-
-AM_LDFLAGS = $(WARN_LDFLAGS)
+       $(GDK_CFLAGS)           \
+       $(GLIB_CFLAGS)          \
+       $(GTK_CFLAGS)           \
+       $(LIBSOUP_CFLAGS)       \
+       $(WARN_CFLAGS)          \
+       $(WEBKIT2GTK_CFLAGS)
+
+AM_LDFLAGS = \
+       $(CODE_COVERAGE_LDFLAGS) \
+       $(WARN_LDFLAGS)
 
 LDADD = \
        $(top_builddir)/src/libephymain.la \
-       $(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 \
-       $(DBUS_LIBS) \
-       $(CODE_COVERAGE_LDFLAGS) \
-       $(DEPENDENCIES_LIBS) 
+       $(GDK_LIBS)             \
+       $(GLIB_LIBS)            \
+       $(GTK_LIBS)             \
+       $(LIBSOUP_LIBS)         \
+       $(WEBKIT2GTK_LIBS)
 
 test_ephy_bookmarks_SOURCES = \
        ephy-bookmarks-test.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]