GNOME.org
 

[gnome-software] trivial: Specify the common plugin libraries in one place

commit 6b1978877ceb7dff9a061c3c7855c9b1098aed47
Author: Richard Hughes <richard hughsie com>
Date:   Tue Mar 7 09:42:27 2017 +0000

    trivial: Specify the common plugin libraries in one place

 configure.ac            |   23 ++++++++
 src/plugins/Makefile.am |  132 +++++++++++++++++++++-------------------------
 2 files changed, 83 insertions(+), 72 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ccb35cc..7bbaa3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -444,6 +444,29 @@ AM_CONDITIONAL(HAVE_EXTERNAL_APPSTREAM, test "x$enable_external_appstream" = "xy
 
 GLIB_TESTS
 
+# common path used by all plugins
+AC_SUBST(GS_PLUGIN_DIR, "\$(libdir)/gs-plugins-\${GS_PLUGIN_API_VERSION}")
+
+# common flags used by all plugins
+GS_PLUGIN_CFLAGS=""
+GS_PLUGIN_CFLAGS="$GS_PLUGIN_CFLAGS -I\$(top_srcdir)/src"
+GS_PLUGIN_CFLAGS="$GS_PLUGIN_CFLAGS -DI_KNOW_THE_GNOME_SOFTWARE_API_IS_SUBJECT_TO_CHANGE"
+GS_PLUGIN_CFLAGS="$GS_PLUGIN_CFLAGS $APPSTREAM_CFLAGS"
+GS_PLUGIN_CFLAGS="$GS_PLUGIN_CFLAGS $GLIB_CFLAGS"
+GS_PLUGIN_CFLAGS="$GS_PLUGIN_CFLAGS $GTK_CFLAGS"
+GS_PLUGIN_CFLAGS="$GS_PLUGIN_CFLAGS $SOUP_CFLAGS"
+GS_PLUGIN_CFLAGS="$GS_PLUGIN_CFLAGS $WARN_CFLAGS"
+GS_PLUGIN_CFLAGS="$GS_PLUGIN_CFLAGS $PIE_CFLAGS"
+AC_SUBST(GS_PLUGIN_CFLAGS)
+
+# common libraries used by all plugins
+GS_PLUGIN_LIBS="$LIBM"
+GS_PLUGIN_LIBS="$GS_PLUGIN_LIBS $APPSTREAM_LIBS"
+GS_PLUGIN_LIBS="$GS_PLUGIN_LIBS $GLIB_LIBS"
+GS_PLUGIN_LIBS="$GS_PLUGIN_LIBS $GTK_LIBS"
+GS_PLUGIN_LIBS="$GS_PLUGIN_LIBS $SOUP_LIBS"
+AC_SUBST(GS_PLUGIN_LIBS)
+
 dnl ---------------------------------------------------------------------------
 dnl - Makefiles, etc.
 dnl ---------------------------------------------------------------------------
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 6853865..011677d 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -2,38 +2,16 @@
 AUTOMAKE_OPTIONS = 1.7
 
 AM_CPPFLAGS =                                          \
-       $(APPSTREAM_CFLAGS)                             \
-       $(GLIB_CFLAGS)                                  \
-       $(GTK_CFLAGS)                                   \
-       $(SQLITE_CFLAGS)                                \
-       $(PACKAGEKIT_CFLAGS)                            \
-       $(SOUP_CFLAGS)                                  \
-       $(SQLITE_CFLAGS)                                \
-       $(FWUPD_CFLAGS)                                 \
-       $(JSON_GLIB_CFLAGS)                             \
-       $(LIMBA_CFLAGS)                                 \
-       $(GUDEV_CFLAGS)                                 \
-       $(OSTREE_CFLAGS)                                \
-       $(FLATPAK_CFLAGS)                               \
-       $(RPM_CFLAGS)                                   \
-       $(OAUTH_CFLAGS)                                 \
-       $(SNAP_CFLAGS)                                  \
-       $(PIE_CFLAGS)                                   \
-       -DI_KNOW_THE_GNOME_SOFTWARE_API_IS_SUBJECT_TO_CHANGE    \
        -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE  \
-       -DBINDIR=\"$(bindir)\"                          \
        -DDATADIR=\"$(datadir)\"                        \
        -DG_LOG_DOMAIN=\"GsPlugin\"                     \
-       -DLIBDIR=\""$(libdir)"\"                        \
        -DLIBEXECDIR=\""$(libexecdir)"\"                \
        -DLOCALSTATEDIR=\""$(localstatedir)"\"          \
        -DLOCALEDIR=\""$(localedir)"\"                  \
-       -DSBINDIR=\"$(sbindir)\"                        \
        -DSYSCONFDIR=\""$(sysconfdir)"\"                \
-       -DTESTDATADIR=\""$(top_srcdir)/data/tests"\"    \
-       -I$(top_srcdir)/src
+       -DTESTDATADIR=\""$(top_srcdir)/data/tests"\"
 
-plugindir = $(libdir)/gs-plugins-${GS_PLUGIN_API_VERSION}
+plugindir = $(GS_PLUGIN_DIR)
 plugin_LTLIBRARIES =                                   \
        libgs_plugin_appstream.la                       \
        libgs_plugin_key-colors.la                      \
@@ -127,24 +105,24 @@ endif
 libgs_plugin_dummy_la_SOURCES = gs-plugin-dummy.c
 libgs_plugin_dummy_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_dummy_la_LDFLAGS = -module -avoid-version
-libgs_plugin_dummy_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_dummy_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
 libgs_plugin_dpkg_la_SOURCES = gs-plugin-dpkg.c
 libgs_plugin_dpkg_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_dpkg_la_LDFLAGS = -module -avoid-version
-libgs_plugin_dpkg_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_dpkg_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
 libgs_plugin_generic_updates_la_SOURCES = gs-plugin-generic-updates.c
 libgs_plugin_generic_updates_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_generic_updates_la_LDFLAGS = -module -avoid-version
-libgs_plugin_generic_updates_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_generic_updates_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
 if HAVE_EXTERNAL_APPSTREAM
 libgs_plugin_external_appstream_la_SOURCES =           \
        gs-plugin-external-appstream.c
-libgs_plugin_external_appstream_la_LIBADD = $(GS_PLUGIN_LIBS) $(SOUP_LIBS)
+libgs_plugin_external_appstream_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_external_appstream_la_LDFLAGS = -module -avoid-version
-libgs_plugin_external_appstream_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS) $(SOUP_CFLAGS)
+libgs_plugin_external_appstream_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(SOUP_CFLAGS)
 
 gnome_software_install_appstream_SOURCES = gs-install-appstream.c
 gnome_software_install_appstream_LDADD = $(GLIB_LIBS) $(APPSTREAM_LIBS)
@@ -155,17 +133,17 @@ endif
 libgs_plugin_key_colors_la_SOURCES = gs-plugin-key-colors.c
 libgs_plugin_key_colors_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_key_colors_la_LDFLAGS = -module -avoid-version
-libgs_plugin_key_colors_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_key_colors_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
 if HAVE_SHELL_EXTENSIONS
 libgs_plugin_shell_extensions_la_SOURCES = gs-plugin-shell-extensions.c
 libgs_plugin_shell_extensions_la_LIBADD = $(GS_PLUGIN_LIBS) $(JSON_GLIB_LIBS)
 libgs_plugin_shell_extensions_la_LDFLAGS = -module -avoid-version
-libgs_plugin_shell_extensions_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_shell_extensions_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(JSON_GLIB_CFLAGS)
 endif
 
 libgs_plugin_fedora_distro_upgrades_la_SOURCES = gs-plugin-fedora-distro-upgrades.c
-libgs_plugin_fedora_distro_upgrades_la_LIBADD = $(GS_PLUGIN_LIBS) $(JSON_GLIB_LIBS) $(SOUP_LIBS)
+libgs_plugin_fedora_distro_upgrades_la_LIBADD = $(GS_PLUGIN_LIBS) $(JSON_GLIB_LIBS)
 libgs_plugin_fedora_distro_upgrades_la_LDFLAGS = -module -avoid-version
 libgs_plugin_fedora_distro_upgrades_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(JSON_GLIB_CFLAGS) $(WARN_CFLAGS)
 
@@ -173,34 +151,34 @@ if HAVE_GUDEV
 libgs_plugin_modalias_la_SOURCES = gs-plugin-modalias.c
 libgs_plugin_modalias_la_LIBADD = $(GS_PLUGIN_LIBS) $(GUDEV_LIBS)
 libgs_plugin_modalias_la_LDFLAGS = -module -avoid-version
-libgs_plugin_modalias_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_modalias_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(GUDEV_CFLAGS)
 endif
 
 libgs_plugin_provenance_la_SOURCES = gs-plugin-provenance.c
 libgs_plugin_provenance_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_provenance_la_LDFLAGS = -module -avoid-version
-libgs_plugin_provenance_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_provenance_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
 libgs_plugin_provenance_license_la_SOURCES = gs-plugin-provenance-license.c
 libgs_plugin_provenance_license_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_provenance_license_la_LDFLAGS = -module -avoid-version
-libgs_plugin_provenance_license_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_provenance_license_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
 libgs_plugin_fedora_tagger_usage_la_SOURCES = gs-plugin-fedora-tagger-usage.c
-libgs_plugin_fedora_tagger_usage_la_LIBADD = $(GS_PLUGIN_LIBS) $(SOUP_LIBS) $(SQLITE_LIBS)
+libgs_plugin_fedora_tagger_usage_la_LIBADD = $(GS_PLUGIN_LIBS) $(SQLITE_LIBS)
 libgs_plugin_fedora_tagger_usage_la_LDFLAGS = -module -avoid-version
-libgs_plugin_fedora_tagger_usage_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_fedora_tagger_usage_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(SQLITE_CFLAGS)
 
 appdata_in_files += org.gnome.Software.Plugin.Epiphany.metainfo.xml.in
 libgs_plugin_epiphany_la_SOURCES = gs-plugin-epiphany.c
-libgs_plugin_epiphany_la_LIBADD = $(GS_PLUGIN_LIBS) $(SOUP_LIBS)
+libgs_plugin_epiphany_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_epiphany_la_LDFLAGS = -module -avoid-version
-libgs_plugin_epiphany_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_epiphany_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
 libgs_plugin_icons_la_SOURCES = gs-plugin-icons.c
-libgs_plugin_icons_la_LIBADD = $(GS_PLUGIN_LIBS) $(SOUP_LIBS)
+libgs_plugin_icons_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_icons_la_LDFLAGS = -module -avoid-version
-libgs_plugin_icons_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_icons_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
 libgs_plugin_appstream_la_SOURCES =                    \
        gs-appstream.c                                  \
@@ -208,14 +186,14 @@ libgs_plugin_appstream_la_SOURCES =                       \
        gs-plugin-appstream.c
 libgs_plugin_appstream_la_LIBADD = $(GS_PLUGIN_LIBS) $(APPSTREAM_LIBS)
 libgs_plugin_appstream_la_LDFLAGS = -module -avoid-version
-libgs_plugin_appstream_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_appstream_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
 if HAVE_LIMBA
 appdata_in_files += org.gnome.Software.Plugin.Limba.metainfo.xml.in
 libgs_plugin_limba_la_SOURCES = gs-plugin-limba.c
 libgs_plugin_limba_la_LIBADD = $(GS_PLUGIN_LIBS) $(LIMBA_LIBS)
 libgs_plugin_limba_la_LDFLAGS = -module -avoid-version
-libgs_plugin_limba_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_limba_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(LIMBA_CFLAGS)
 endif
 
 if HAVE_FLATPAK
@@ -230,14 +208,14 @@ libgs_plugin_flatpak_la_SOURCES =                 \
        gs-plugin-flatpak.c
 libgs_plugin_flatpak_la_LIBADD = $(GS_PLUGIN_LIBS) $(FLATPAK_LIBS)
 libgs_plugin_flatpak_la_LDFLAGS = -module -avoid-version
-libgs_plugin_flatpak_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_flatpak_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(FLATPAK_CFLAGS)
 endif
 
 if HAVE_OSTREE
 libgs_plugin_ostree_la_SOURCES = gs-plugin-ostree.c
 libgs_plugin_ostree_la_LIBADD = $(GS_PLUGIN_LIBS) $(OSTREE_LIBS)
 libgs_plugin_ostree_la_LDFLAGS = -module -avoid-version
-libgs_plugin_ostree_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_ostree_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(OSTREE_CFLAGS)
 endif
 
 if HAVE_ODRS
@@ -245,14 +223,14 @@ appdata_in_files += org.gnome.Software.Plugin.Odrs.metainfo.xml.in
 libgs_plugin_odrs_la_SOURCES = gs-plugin-odrs.c
 libgs_plugin_odrs_la_LIBADD = $(GS_PLUGIN_LIBS) $(JSON_GLIB_LIBS)
 libgs_plugin_odrs_la_LDFLAGS = -module -avoid-version
-libgs_plugin_odrs_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_odrs_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(JSON_GLIB_CFLAGS)
 endif
 
 if HAVE_RPM
 libgs_plugin_rpm_la_SOURCES = gs-plugin-rpm.c
 libgs_plugin_rpm_la_LIBADD = $(GS_PLUGIN_LIBS) $(RPM_LIBS)
 libgs_plugin_rpm_la_LDFLAGS = -module -avoid-version
-libgs_plugin_rpm_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_rpm_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(RPM_CFLAGS)
 endif
 
 if HAVE_STEAM
@@ -260,13 +238,13 @@ appdata_in_files += org.gnome.Software.Plugin.Steam.metainfo.xml.in
 libgs_plugin_steam_la_SOURCES = gs-plugin-steam.c
 libgs_plugin_steam_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_steam_la_LDFLAGS = -module -avoid-version
-libgs_plugin_steam_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_steam_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 endif
 
 libgs_plugin_repos_la_SOURCES = gs-plugin-repos.c
 libgs_plugin_repos_la_LIBADD = $(GS_PLUGIN_LIBS) $(RPM_LIBS)
 libgs_plugin_repos_la_LDFLAGS = -module -avoid-version
-libgs_plugin_repos_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_repos_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
 libgs_plugin_desktop_categories_la_SOURCES =           \
        gs-plugin-desktop-categories.c                  \
@@ -274,7 +252,7 @@ libgs_plugin_desktop_categories_la_SOURCES =                \
        gs-desktop-common.h
 libgs_plugin_desktop_categories_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_desktop_categories_la_LDFLAGS = -module -avoid-version
-libgs_plugin_desktop_categories_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_desktop_categories_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
 libgs_plugin_desktop_menu_path_la_SOURCES =            \
        gs-plugin-desktop-menu-path.c                   \
@@ -282,29 +260,37 @@ libgs_plugin_desktop_menu_path_la_SOURCES =               \
        gs-desktop-common.h
 libgs_plugin_desktop_menu_path_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_desktop_menu_path_la_LDFLAGS = -module -avoid-version
-libgs_plugin_desktop_menu_path_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_desktop_menu_path_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
 libgs_plugin_hardcoded_blacklist_la_SOURCES = gs-plugin-hardcoded-blacklist.c
 libgs_plugin_hardcoded_blacklist_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_hardcoded_blacklist_la_LDFLAGS = -module -avoid-version
-libgs_plugin_hardcoded_blacklist_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_hardcoded_blacklist_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
 libgs_plugin_hardcoded_popular_la_SOURCES = gs-plugin-hardcoded-popular.c
 libgs_plugin_hardcoded_popular_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_hardcoded_popular_la_LDFLAGS = -module -avoid-version
-libgs_plugin_hardcoded_popular_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_hardcoded_popular_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
 libgs_plugin_hardcoded_featured_la_SOURCES = gs-plugin-hardcoded-featured.c
 libgs_plugin_hardcoded_featured_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_hardcoded_featured_la_LDFLAGS = -module -avoid-version
-libgs_plugin_hardcoded_featured_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_hardcoded_featured_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
 if HAVE_UBUNTU_REVIEWS
 libgs_plugin_ubuntu_reviews_la_SOURCES =               \
        gs-plugin-ubuntu-reviews.c
-libgs_plugin_ubuntu_reviews_la_LIBADD = $(GS_PLUGIN_LIBS) $(SOUP_LIBS) $(JSON_GLIB_LIBS) $(SQLITE_LIBS) 
$(OAUTH_LIBS)
+libgs_plugin_ubuntu_reviews_la_LIBADD =                        \
+       $(GS_PLUGIN_LIBS)                               \
+       $(JSON_GLIB_LIBS)                               \
+       $(SQLITE_LIBS)                                  \
+       $(OAUTH_LIBS)
 libgs_plugin_ubuntu_reviews_la_LDFLAGS = -module -avoid-version
-libgs_plugin_ubuntu_reviews_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_ubuntu_reviews_la_CFLAGS =                        \
+       $(GS_PLUGIN_CFLAGS)                             \
+       $(JSON_GLIB_CFLAGS)                             \
+       $(OAUTH_CFLAGS)                                 \
+       $(SQLITE_CFLAGS)
 endif
 
 libgs_plugin_packagekit_la_SOURCES =                   \
@@ -313,7 +299,7 @@ libgs_plugin_packagekit_la_SOURCES =                        \
        packagekit-common.h
 libgs_plugin_packagekit_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_packagekit_la_LDFLAGS = -module -avoid-version
-libgs_plugin_packagekit_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_packagekit_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(PACKAGEKIT_CFLAGS)
 
 libgs_plugin_packagekit_refine_la_SOURCES =            \
        gs-plugin-packagekit-refine.c                   \
@@ -323,7 +309,7 @@ libgs_plugin_packagekit_refine_la_SOURCES =         \
        packagekit-common.h
 libgs_plugin_packagekit_refine_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_packagekit_refine_la_LDFLAGS = -module -avoid-version
-libgs_plugin_packagekit_refine_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_packagekit_refine_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(PACKAGEKIT_CFLAGS)
 
 libgs_plugin_packagekit_refresh_la_SOURCES =           \
        gs-plugin-packagekit-refresh.c                  \
@@ -331,7 +317,7 @@ libgs_plugin_packagekit_refresh_la_SOURCES =                \
        packagekit-common.h
 libgs_plugin_packagekit_refresh_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_packagekit_refresh_la_LDFLAGS = -module -avoid-version
-libgs_plugin_packagekit_refresh_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_packagekit_refresh_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(PACKAGEKIT_CFLAGS)
 
 libgs_plugin_packagekit_local_la_SOURCES =             \
        gs-plugin-packagekit-local.c                    \
@@ -339,7 +325,7 @@ libgs_plugin_packagekit_local_la_SOURCES =          \
        packagekit-common.h
 libgs_plugin_packagekit_local_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_packagekit_local_la_LDFLAGS = -module -avoid-version
-libgs_plugin_packagekit_local_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_packagekit_local_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(PACKAGEKIT_CFLAGS)
 
 libgs_plugin_systemd_updates_la_SOURCES =              \
        gs-plugin-systemd-updates.c                     \
@@ -347,33 +333,33 @@ libgs_plugin_systemd_updates_la_SOURCES =         \
        packagekit-common.h
 libgs_plugin_systemd_updates_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_systemd_updates_la_LDFLAGS = -module -avoid-version
-libgs_plugin_systemd_updates_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_systemd_updates_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(PACKAGEKIT_CFLAGS)
 
 if HAVE_FIRMWARE
 appdata_in_files += org.gnome.Software.Plugin.Fwupd.metainfo.xml.in
 libgs_plugin_fwupd_la_SOURCES = gs-plugin-fwupd.c
 libgs_plugin_fwupd_la_LIBADD = $(GS_PLUGIN_LIBS) $(FWUPD_LIBS)
 libgs_plugin_fwupd_la_LDFLAGS = -module -avoid-version
-libgs_plugin_fwupd_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_fwupd_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(FWUPD_CFLAGS)
 endif
 
 libgs_plugin_packagekit_history_la_SOURCES = gs-plugin-packagekit-history.c
 libgs_plugin_packagekit_history_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_packagekit_history_la_LDFLAGS = -module -avoid-version
-libgs_plugin_packagekit_history_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_packagekit_history_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(PACKAGEKIT_CFLAGS)
 
 libgs_plugin_packagekit_upgrade_la_SOURCES =           \
        gs-plugin-packagekit-upgrade.c                  \
        packagekit-common.c                             \
        packagekit-common.h
-libgs_plugin_packagekit_upgrade_la_LIBADD = $(GS_PLUGIN_LIBS)
+libgs_plugin_packagekit_upgrade_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_packagekit_upgrade_la_LDFLAGS = -module -avoid-version
-libgs_plugin_packagekit_upgrade_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_packagekit_upgrade_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(PACKAGEKIT_CFLAGS)
 
 libgs_plugin_packagekit_offline_la_SOURCES = gs-plugin-packagekit-offline.c
-libgs_plugin_packagekit_offline_la_LIBADD = $(GS_PLUGIN_LIBS)
+libgs_plugin_packagekit_offline_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_packagekit_offline_la_LDFLAGS = -module -avoid-version
-libgs_plugin_packagekit_offline_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_packagekit_offline_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(PACKAGEKIT_CFLAGS)
 
 libgs_plugin_packagekit_origin_la_SOURCES =            \
        gs-plugin-packagekit-origin.c                   \
@@ -381,12 +367,12 @@ libgs_plugin_packagekit_origin_la_SOURCES =               \
        packagekit-common.h
 libgs_plugin_packagekit_origin_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_packagekit_origin_la_LDFLAGS = -module -avoid-version
-libgs_plugin_packagekit_origin_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_packagekit_origin_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(PACKAGEKIT_CFLAGS)
 
 libgs_plugin_packagekit_proxy_la_SOURCES = gs-plugin-packagekit-proxy.c
 libgs_plugin_packagekit_proxy_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_packagekit_proxy_la_LDFLAGS = -module -avoid-version
-libgs_plugin_packagekit_proxy_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_packagekit_proxy_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(PACKAGEKIT_CFLAGS)
 
 if HAVE_SNAP
 appdata_in_files += org.gnome.Software.Plugin.Snap.metainfo.xml.in
@@ -400,17 +386,19 @@ libgs_plugin_snap_la_LIBADD =                             \
        $(SOUP_LIBS)                                    \
        $(JSON_GLIB_LIBS)
 libgs_plugin_snap_la_LDFLAGS = -module -avoid-version
-libgs_plugin_snap_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_snap_la_CFLAGS =                          \
+       $(GS_PLUGIN_CFLAGS)                             \
+       $(JSON_GLIB_CFLAGS)                             \
+       $(SNAP_CFLAGS)
 endif
 
 libgs_plugin_ubuntuone_la_SOURCES =                    \
        gs-plugin-ubuntuone.c
 libgs_plugin_ubuntuone_la_LIBADD =                     \
        $(GS_PLUGIN_LIBS)                               \
-       $(SOUP_LIBS)                                    \
        $(JSON_GLIB_LIBS)
 libgs_plugin_ubuntuone_la_LDFLAGS = -module -avoid-version
-libgs_plugin_ubuntuone_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_ubuntuone_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(JSON_GLIB_CFLAGS)
 
 # MetaInfo files
 %.metainfo.xml: %.metainfo.xml.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]