GNOME.org
 

[epiphany] build: Use pkg-config CFLAGS appropriately

commit 63a36591266ee2131e01f5f0551950f592afc8ef
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Aug 29 13:35:41 2016 -0500

    build: Use pkg-config CFLAGS appropriately
    
    These are actually flags for the preprocessor, so they correspond to
    Automake CPPFLAGS. I knew this; not sure what I was thinking to do it
    wrong everywhere.

 embed/Makefile.am               |   16 +++++++-------
 embed/web-extension/Makefile.am |   14 ++++++------
 lib/Makefile.am                 |   37 ++++++++++++++++-----------------
 lib/egg/Makefile.am             |    6 ++--
 lib/history/Makefile.am         |    6 ++--
 lib/widgets/Makefile.am         |   18 ++++++++--------
 src/Makefile.am                 |   43 ++++++++++++++++++++++++++------------
 src/bookmarks/Makefile.am       |   20 +++++++++---------
 8 files changed, 87 insertions(+), 73 deletions(-)
---
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 6d4e6f6..62bb1c9 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -49,13 +49,6 @@ nodist_libephyembed_la_SOURCES = \
        $(BUILT_SOURCES)
 
 libephyembed_la_CFLAGS = \
-       $(GDK_CFLAGS)           \
-       $(GIO_CFLAGS)           \
-       $(GLIB_CFLAGS)          \
-       $(GTK_CFLAGS)           \
-       $(LIBSECRET_CFLAGS)     \
-       $(LIBSOUP_CFLAGS)       \
-       $(WEBKIT2GTK_CFLAGS)    \
        $(WARN_CFLAGS)
 
 libephyembed_la_CPPFLAGS = \
@@ -67,7 +60,14 @@ libephyembed_la_CPPFLAGS = \
        -I$(top_srcdir)/lib/history             \
        -I$(top_srcdir)/lib/widgets             \
        -DPKGDATADIR=\"$(pkgdatadir)\"          \
-       -DEPHY_WEB_EXTENSIONS_DIR=\"$(pkglibdir)/web-extensions\"
+       -DEPHY_WEB_EXTENSIONS_DIR=\"$(pkglibdir)/web-extensions\"       \
+       $(GDK_CFLAGS)                           \
+       $(GIO_CFLAGS)                           \
+       $(GLIB_CFLAGS)                          \
+       $(GTK_CFLAGS)                           \
+       $(LIBSECRET_CFLAGS)                     \
+       $(LIBSOUP_CFLAGS)                       \
+       $(WEBKIT2GTK_CFLAGS)
 
 libephyembed_la_LDFLAGS = \
        $(WARN_LDFLAGS)
diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
index ec4940e..d0c2560 100644
--- a/embed/web-extension/Makefile.am
+++ b/embed/web-extension/Makefile.am
@@ -19,15 +19,15 @@ libephywebextension_la_SOURCES = \
        ephy-web-overview-model.c
 
 libephywebextension_la_CPPFLAGS = \
-       -I$(top_srcdir)/lib
+       -I$(top_srcdir)/lib     \
+       $(GIO_CFLAGS)           \
+       $(GLIB_CFLAGS)          \
+       $(GTK_CFLAGS)           \
+       $(LIBSECRET_CFLAGS)     \
+       $(LIBSOUP_CFLAGS)       \
+       $(WEBKIT2GTK_WEB_EXTENSION_CFLAGS)
 
 libephywebextension_la_CFLAGS = \
-       $(GIO_CFLAGS)                                   \
-       $(GLIB_CFLAGS)                                  \
-       $(GTK_CFLAGS)                                   \
-       $(LIBSECRET_CFLAGS)                             \
-       $(LIBSOUP_CFLAGS)                               \
-       $(WEBKIT2GTK_WEB_EXTENSION_CFLAGS)              \
        $(WARN_CFLAGS)
 
 libephywebextension_la_LDFLAGS = \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7153cc6..547aeb1 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -73,21 +73,20 @@ libephymisc_la_CPPFLAGS = \
        -DTOP_SRC_DATADIR=\"$(top_srcdir)/data\"        \
        -I$(top_builddir)/lib                           \
        -I$(top_srcdir)/lib/egg                         \
-       $(AM_CPPFLAGS)
+       $(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)
 
 libephymisc_la_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)    \
        $(WARN_CFLAGS)
 
 libephymisc_la_LDFLAGS = \
@@ -115,18 +114,18 @@ ephy_profile_migrator_SOURCES = \
        ephy-profile-migrator.c
 
 ephy_profile_migrator_CFLAGS = \
-       $(GLIB_CFLAGS)          \
-       $(GTK_CFLAGS)           \
-       $(LIBSECRET_CFLAGS)     \
-       $(LIBSOUP_CFLAGS)       \
-       $(WEBKIT2GTK_CFLAGS)    \
        $(WARN_CFLAGS)
 
 ephy_profile_migrator_CPPFLAGS = \
        -I$(top_builddir)/lib           \
        -I$(srcdir)/history             \
        -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-       -DLOCALEDIR=\"$(localedir)\"
+       -DLOCALEDIR=\"$(localedir)\"    \
+       $(GLIB_CFLAGS)                  \
+       $(GTK_CFLAGS)                   \
+       $(LIBSECRET_CFLAGS)             \
+       $(LIBSOUP_CFLAGS)               \
+       $(WEBKIT2GTK_CFLAGS)
 
 ephy_profile_migrator_LDADD = \
        libephymisc.la          \
diff --git a/lib/egg/Makefile.am b/lib/egg/Makefile.am
index 1cadf46..f56b24e 100644
--- a/lib/egg/Makefile.am
+++ b/lib/egg/Makefile.am
@@ -4,9 +4,9 @@ libegg_la_SOURCES = \
        eggtreemultidnd.c       \
        eggtreemultidnd.h
 
-libegg_la_CFLAGS = $(GTK_CFLAGS)
-
-libegg_la_CPPFLAGS = -DG_LOG_DOMAIN=\""Egg"\"
+libegg_la_CPPFLAGS = \
+       -DG_LOG_DOMAIN=\""Egg"\"        \
+       $(GTK_CFLAGS)
 
 libegg_la_LIBADD = $(GTK_LIBS)
 
diff --git a/lib/history/Makefile.am b/lib/history/Makefile.am
index f69e659..ef0dce0 100644
--- a/lib/history/Makefile.am
+++ b/lib/history/Makefile.am
@@ -14,14 +14,14 @@ nodist_libephyhistory_la_SOURCES = \
        $(BUILT_SOURCES)
 
 libephyhistory_la_CFLAGS = \
-       $(GLIB_CFLAGS)          \
-       $(GIO_CFLAGS)           \
        $(WARN_CFLAGS)
 
 libephyhistory_la_CPPFLAGS = \
        -I$(top_builddir)/lib           \
        -I$(top_builddir)/lib/history   \
-       -I$(top_srcdir)/lib
+       -I$(top_srcdir)/lib             \
+       $(GLIB_CFLAGS)                  \
+       $(GIO_CFLAGS)
 
 libephyhistory_la_LDFLAGS = \
        $(WARN_LDFLAGS)
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index 4a008b7..378953e 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -84,14 +84,6 @@ libephywidgets_la_SOURCES = \
        nautilus-floating-bar.h
 
 libephywidgets_la_CFLAGS = \
-       $(GCR_CFLAGS)           \
-       $(GDK_CFLAGS)           \
-       $(GDK_PIXBUF_CFLAGS)    \
-       $(GIO_CFLAGS)           \
-       $(GLIB_CFLAGS)          \
-       $(GTK_CFLAGS)           \
-       $(LIBSOUP_CFLAGS)       \
-       $(WEBKIT2GTK_CFLAGS)    \
        $(WARN_CFLAGS)
 
 libephywidgets_la_CPPFLAGS = \
@@ -101,7 +93,15 @@ libephywidgets_la_CPPFLAGS = \
        -I$(top_srcdir)/lib             \
        -I$(top_srcdir)/lib/egg         \
        -I$(top_srcdir)/lib/history     \
-       -I$(top_srcdir)/libgd
+       -I$(top_srcdir)/libgd           \
+       $(GCR_CFLAGS)                   \
+       $(GDK_CFLAGS)                   \
+       $(GDK_PIXBUF_CFLAGS)            \
+       $(GIO_CFLAGS)                   \
+       $(GLIB_CFLAGS)                  \
+       $(GTK_CFLAGS)                   \
+       $(LIBSOUP_CFLAGS)               \
+       $(WEBKIT2GTK_CFLAGS)
 
 libephywidgets_la_LDFLAGS = \
        $(WARN_LDFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 3eb19fd..8b0f85b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,18 +75,18 @@ libephymain_la_CPPFLAGS = \
        -I$(top_srcdir)/lib/widgets     \
        -I$(top_srcdir)/src/bookmarks   \
        -DLOCALEDIR=\"$(localedir)\"    \
-       -DPKGDATADIR=\"$(pkgdatadir)\"
+       -DPKGDATADIR=\"$(pkgdatadir)\"  \
+       $(GDK_CFLAGS)                   \
+       $(GIO_CFLAGS)                   \
+       $(GLIB_CFLAGS)                  \
+       $(GTK_CFLAGS)                   \
+       $(LIBNOTIFY_CFLAGS)             \
+       $(LIBSECRET_CFLAGS)             \
+       $(LIBSOUP_CFLAGS)               \
+       $(LIBXML_CFLAGS)                \
+       $(WEBKIT2GTK_CFLAGS)
 
 libephymain_la_CFLAGS = \
-       $(GDK_CFLAGS)           \
-       $(GIO_CFLAGS)           \
-       $(GLIB_CFLAGS)          \
-       $(GTK_CFLAGS)           \
-       $(LIBNOTIFY_CFLAGS)     \
-       $(LIBSECRET_CFLAGS)     \
-       $(LIBSOUP_CFLAGS)       \
-       $(LIBXML_CFLAGS)        \
-       $(WEBKIT2GTK_CFLAGS)    \
        $(WARN_CFLAGS)
 
 libephymain_la_LDFLAGS = \
@@ -162,7 +162,13 @@ epiphany_CPPFLAGS = \
        -I$(top_builddir)/lib/widgets   \
        -I$(top_srcdir)/src/bookmarks   \
        -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-       -DLOCALEDIR=\"$(localedir)\"
+       -DLOCALEDIR=\"$(localedir)\"    \
+       $(GLIB_CFLAGS)                  \
+       $(GTK_CFLAGS)                   \
+       $(LIBNOTIFY_CFLAGS)             \
+       $(LIBXML_CFLAGS)                \
+       $(X11_CFLAGS)                   \
+       $(WEBKIT2GTK_CFLAGS)
 
 epiphany_LDADD = \
        libephymain.la          \
@@ -170,7 +176,8 @@ epiphany_LDADD = \
        $(GTK_LIBS)             \
        $(LIBNOTIFY_LIBS)       \
        $(LIBXML_LIBS)          \
-       $(X11_LIBS)
+       $(X11_LIBS)             \
+       $(WEBKIT2GTK_LIBS)
 
 epiphany_LDFLAGS = \
        -dlopen self    \
@@ -194,7 +201,14 @@ epiphany_search_provider_CPPFLAGS = \
        -I$(top_srcdir)/lib/history     \
        -I$(top_srcdir)/src/bookmarks   \
        -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-       -DLOCALEDIR=\"$(localedir)\"
+       -DLOCALEDIR=\"$(localedir)\"    \
+       $(GIO_CFLAGS)                   \
+       $(GLIB_CFLAGS)                  \
+       $(GTK_CFLAGS)                   \
+       $(LIBSECRET_CFLAGS)             \
+       $(LIBSOUP_CFLAGS)               \
+       $(LIBXML_CFLAGS)                \
+       $(WEBKIT2GTK_CFLAGS)
 
 epiphany_search_provider_LDADD = \
        libephymain.la          \
@@ -203,7 +217,8 @@ epiphany_search_provider_LDADD = \
        $(GTK_LIBS)             \
        $(LIBSECRET_LIBS)       \
        $(LIBSOUP_LIBS)         \
-       $(LIBXML_LIBS)
+       $(LIBXML_LIBS)          \
+       $(WEBKIT2GTK_LIBS)
 
 epiphany_search_provider_LDFLAGS = \
        -dlopen self    \
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 90899f9..bc8661d 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -92,15 +92,6 @@ stamp-ephy-bookmarks-type-builtins.h: Makefile $(TYPES_H_FILES)
        && 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)    \
        $(WARN_CFLAGS)
 
 libephybookmarks_la_CPPFLAGS = \
@@ -112,7 +103,16 @@ libephybookmarks_la_CPPFLAGS = \
        -I$(top_srcdir)/lib/widgets     \
        -I$(top_srcdir)/lib/history     \
        -I$(top_srcdir)/lib/egg         \
-       -DPKGDATADIR=\"$(pkgdatadir)\"
+       -DPKGDATADIR=\"$(pkgdatadir)\"  \
+       $(AVAHI_CLIENT_CFLAGS)          \
+       $(AVAHI_GOBJECT_CFLAGS)         \
+       $(GDK_CFLAGS)                   \
+       $(GIO_CFLAGS)                   \
+       $(GLIB_CFLAGS)                  \
+       $(GTK_CFLAGS)                   \
+       $(LIBXML_CFLAGS)                \
+       $(LIBXSLT_CFLAGS)               \
+       $(WEBKIT2GTK_CFLAGS)
 
 libephybookmarks_la_LDFLAGS = \
        $(WARN_LDFLAGS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]