GNOME.org
 

[gnome-software] build: Don't indirect libgnomesoftware.a through GS_PRIVATE_LIBS

commit 7dc08fbb8f87d14ad6912ff326e4b64fd11e4466
Author: Iain Lane <iain orangesquash org uk>
Date:   Wed Mar 8 14:30:42 2017 +0000

    build: Don't indirect libgnomesoftware.a through GS_PRIVATE_LIBS
    
    This breaks automake's dependency tracking, and means that things are
    built before libgnomesoftware.a, breaking the build.
    
    Also put gdk-pixbuf in GS_PRIVATE_LIBS; it's in CFLAGS and we need
    gdk_pixbuf_error_quark at least.

 configure.ac                   |    3 ++-
 lib/Makefile.am                |    3 ++-
 plugins/dpkg/Makefile.am       |    2 +-
 plugins/dummy/Makefile.am      |    2 +-
 plugins/epiphany/Makefile.am   |    2 +-
 plugins/flatpak/Makefile.am    |    2 +-
 plugins/fwupd/Makefile.am      |    2 +-
 plugins/modalias/Makefile.am   |    2 +-
 plugins/packagekit/Makefile.am |    2 +-
 plugins/repos/Makefile.am      |    2 +-
 src/Makefile.am                |    1 +
 11 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c472bf9..afce63f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -447,6 +447,7 @@ AC_SUBST(GS_PLUGIN_LIBS)
 
 # common cflags used by the private library
 GS_PRIVATE_CFLAGS="$GS_PLUGIN_CFLAGS"
+GS_PRIVATE_CFLAGS="$GS_PRIVATE_CFLAGS $GDK_PIXBUF_CFLAGS"
 GS_PRIVATE_CFLAGS="$GS_PRIVATE_CFLAGS $JSON_GLIB_CFLAGS"
 GS_PRIVATE_CFLAGS="$GS_PRIVATE_CFLAGS $POLKIT_CFLAGS"
 GS_PRIVATE_CFLAGS="$GS_PRIVATE_CFLAGS $LIBSECRET_CFLAGS"
@@ -455,7 +456,7 @@ AC_SUBST(GS_PRIVATE_CFLAGS)
 
 # common libraries used by the private library
 GS_PRIVATE_LIBS="$GS_PLUGIN_LIBS"
-GS_PRIVATE_LIBS="$GS_PRIVATE_LIBS \$(top_builddir)/lib/libgnomesoftware.a"
+GS_PRIVATE_LIBS="$GS_PRIVATE_LIBS $GDK_PIXBUF_LIBS"
 GS_PRIVATE_LIBS="$GS_PRIVATE_LIBS $JSON_GLIB_LIBS"
 GS_PRIVATE_LIBS="$GS_PRIVATE_LIBS $POLKIT_LIBS"
 GS_PRIVATE_LIBS="$GS_PRIVATE_LIBS $LIBSECRET_LIBS"
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3015624..0a1bad1 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -69,6 +69,7 @@ gnome_software_cmd_SOURCES =                          \
        gs-cmd.c
 
 gnome_software_cmd_LDADD =                             \
+       libgnomesoftware.a                              \
        $(GS_PRIVATE_LIBS)
 
 gnome_software_cmd_CFLAGS =                            \
@@ -91,7 +92,7 @@ TESTS_ENVIRONMENT =                                   \
 if ENABLE_TESTS
 check_PROGRAMS = gs-self-test
 gs_self_test_SOURCES = gs-self-test.c
-gs_self_test_LDADD = $(GS_PRIVATE_LIBS)
+gs_self_test_LDADD = libgnomesoftware.a $(GS_PRIVATE_LIBS)
 gs_self_test_CFLAGS = $(GS_PRIVATE_CFLAGS)
 TESTS = gs-self-test
 endif
diff --git a/plugins/dpkg/Makefile.am b/plugins/dpkg/Makefile.am
index 3fc2b88..c9719a1 100644
--- a/plugins/dpkg/Makefile.am
+++ b/plugins/dpkg/Makefile.am
@@ -14,7 +14,7 @@ libgs_plugin_dpkg_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 if ENABLE_TESTS
 check_PROGRAMS = gs-self-test
 gs_self_test_SOURCES = gs-self-test.c
-gs_self_test_LDADD = $(GS_PRIVATE_LIBS)
+gs_self_test_LDADD = $(top_builddir)/lib/libgnomesoftware.a $(GS_PRIVATE_LIBS)
 gs_self_test_CFLAGS = $(GS_PRIVATE_CFLAGS)
 TESTS = gs-self-test
 endif
diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
index b031673..9a6af42 100644
--- a/plugins/dummy/Makefile.am
+++ b/plugins/dummy/Makefile.am
@@ -16,7 +16,7 @@ libgs_plugin_dummy_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 if ENABLE_TESTS
 check_PROGRAMS = gs-self-test
 gs_self_test_SOURCES = gs-self-test.c
-gs_self_test_LDADD = $(GS_PRIVATE_LIBS)
+gs_self_test_LDADD = $(top_builddir)/lib/libgnomesoftware.a $(GS_PRIVATE_LIBS)
 gs_self_test_CFLAGS = $(GS_PRIVATE_CFLAGS)
 TESTS = gs-self-test
 endif
diff --git a/plugins/epiphany/Makefile.am b/plugins/epiphany/Makefile.am
index 6a42427..a8b7903 100644
--- a/plugins/epiphany/Makefile.am
+++ b/plugins/epiphany/Makefile.am
@@ -24,7 +24,7 @@ CLEANFILES = $(appdata_DATA)
 if ENABLE_TESTS
 check_PROGRAMS = gs-self-test
 gs_self_test_SOURCES = gs-self-test.c
-gs_self_test_LDADD = $(GS_PRIVATE_LIBS)
+gs_self_test_LDADD = $(top_builddir)/lib/libgnomesoftware.a $(GS_PRIVATE_LIBS)
 gs_self_test_CFLAGS = $(GS_PRIVATE_CFLAGS)
 TESTS = gs-self-test
 endif
diff --git a/plugins/flatpak/Makefile.am b/plugins/flatpak/Makefile.am
index 23640d0..e8d5cc2 100644
--- a/plugins/flatpak/Makefile.am
+++ b/plugins/flatpak/Makefile.am
@@ -32,7 +32,7 @@ CLEANFILES = $(appdata_DATA)
 if ENABLE_TESTS
 check_PROGRAMS = gs-self-test
 gs_self_test_SOURCES = gs-self-test.c
-gs_self_test_LDADD = $(GS_PRIVATE_LIBS)
+gs_self_test_LDADD = $(top_builddir)/lib/libgnomesoftware.a $(GS_PRIVATE_LIBS)
 gs_self_test_CFLAGS = $(GS_PRIVATE_CFLAGS)
 TESTS = gs-self-test
 
diff --git a/plugins/fwupd/Makefile.am b/plugins/fwupd/Makefile.am
index 09a8920..921eed2 100644
--- a/plugins/fwupd/Makefile.am
+++ b/plugins/fwupd/Makefile.am
@@ -24,7 +24,7 @@ CLEANFILES = $(appdata_DATA)
 if ENABLE_TESTS
 check_PROGRAMS = gs-self-test
 gs_self_test_SOURCES = gs-self-test.c
-gs_self_test_LDADD = $(GS_PRIVATE_LIBS)
+gs_self_test_LDADD = $(top_builddir)/lib/libgnomesoftware.a $(GS_PRIVATE_LIBS)
 gs_self_test_CFLAGS = $(GS_PRIVATE_CFLAGS)
 TESTS = gs-self-test
 endif
diff --git a/plugins/modalias/Makefile.am b/plugins/modalias/Makefile.am
index 4d9a5fd..fb14092 100644
--- a/plugins/modalias/Makefile.am
+++ b/plugins/modalias/Makefile.am
@@ -15,7 +15,7 @@ libgs_plugin_modalias_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(GUDEV_CFLAGS)
 if ENABLE_TESTS
 check_PROGRAMS = gs-self-test
 gs_self_test_SOURCES = gs-self-test.c
-gs_self_test_LDADD = $(GS_PRIVATE_LIBS)
+gs_self_test_LDADD = $(top_builddir)/lib/libgnomesoftware.a $(GS_PRIVATE_LIBS)
 gs_self_test_CFLAGS = $(GS_PRIVATE_CFLAGS)
 TESTS = gs-self-test
 endif
diff --git a/plugins/packagekit/Makefile.am b/plugins/packagekit/Makefile.am
index c4bc97f..f453202 100644
--- a/plugins/packagekit/Makefile.am
+++ b/plugins/packagekit/Makefile.am
@@ -93,7 +93,7 @@ libgs_plugin_packagekit_proxy_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(PACKAGEKIT_CFLAG
 if ENABLE_TESTS
 check_PROGRAMS = gs-self-test
 gs_self_test_SOURCES = gs-self-test.c gs-markdown.c
-gs_self_test_LDADD = $(GS_PRIVATE_LIBS)
+gs_self_test_LDADD = $(top_builddir)/lib/libgnomesoftware.a $(GS_PRIVATE_LIBS)
 gs_self_test_CFLAGS = $(GS_PRIVATE_CFLAGS)
 TESTS = gs-self-test
 endif
diff --git a/plugins/repos/Makefile.am b/plugins/repos/Makefile.am
index bf4b1d8..11ae544 100644
--- a/plugins/repos/Makefile.am
+++ b/plugins/repos/Makefile.am
@@ -14,7 +14,7 @@ libgs_plugin_repos_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 if ENABLE_TESTS
 check_PROGRAMS = gs-self-test
 gs_self_test_SOURCES = gs-self-test.c
-gs_self_test_LDADD = $(GS_PRIVATE_LIBS)
+gs_self_test_LDADD = $(top_builddir)/lib/libgnomesoftware.a $(GS_PRIVATE_LIBS)
 gs_self_test_CFLAGS = $(GS_PRIVATE_CFLAGS)
 TESTS = gs-self-test
 endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 8feafa6..228ac64 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -190,6 +190,7 @@ nodist_gnome_software_SOURCES =                             \
        gs-shell-search-provider-generated.h
 
 gnome_software_LDADD =                                 \
+       $(top_builddir)/lib/libgnomesoftware.a          \
        $(GS_PRIVATE_LIBS)                              \
        $(GTKSPELL_LIBS)                                \
        $(PACKAGEKIT_LIBS)                              \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]