GNOME.org
 

[gitg] List internal vapi dependencies as sources

commit abafcb9cd66d84a40d26a4549453702311b9198f
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Sun Jan 5 19:36:14 2014 +0100

    List internal vapi dependencies as sources
    
    This should solve the dependency issue breaking parallel build.
    Instead of specifying dependencies on in-project libraries using --pkg,
    we now directly specify the corresponding .vapi in sources, which makes
    it properly depend.

 Makefile.am               |    4 ++++
 configure.ac              |    2 --
 gitg/Makefile.am          |    6 +++---
 libgitg-ext/Makefile.am   |    5 ++---
 plugins/diff/Makefile.am  |    3 ++-
 plugins/files/Makefile.am |    3 ++-
 tests/Makefile.am         |    6 +++---
 tests/libgitg/Makefile.am |    5 ++---
 8 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d500913..2c5845a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,6 +87,10 @@ SCALABLE_ICONS    =
 gsettings_SCHEMAS =
 TESTS             =
 
+GITG_PLUGIN_VAPISOURCES =                      \
+       libgitg-ext/libgitg-ext-1.0.vapi        \
+       libgitg/libgitg-1.0.vapi
+
 include libgitg/Makefile.am
 include libgitg-ext/Makefile.am
 include plugins/Makefile.am
diff --git a/configure.ac b/configure.ac
index 5bc7efc..264e878 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,8 +225,6 @@ AC_SUBST(GITG_PLUGIN_LIBTOOL_FLAGS)
 
 GITG_PLUGIN_VALAFLAGS="                                \
        --pkg Ggit-1.0                          \
-       --pkg libgitg-ext-1.0                   \
-       --pkg libgitg-1.0                       \
        --pkg gio-2.0                           \
        --pkg gtk+-3.0                          \
        --pkg gtksourceview-3.0                 \
diff --git a/gitg/Makefile.am b/gitg/Makefile.am
index 049333f..c23634a 100644
--- a/gitg/Makefile.am
+++ b/gitg/Makefile.am
@@ -18,8 +18,6 @@ gitg_gitg_VALAFLAGS =                                         \
        $(GITG_VALAFLAGS)                                       \
        --pkg config                                            \
        --pkg Ggit-1.0                                          \
-       --pkg libgitg-1.0                                       \
-       --pkg libgitg-ext-1.0                                   \
        --pkg gtk+-3.0                                          \
        --pkg gio-2.0                                           \
        --pkg libpeas-1.0                                       \
@@ -68,7 +66,9 @@ gitg_gitg_VALASOURCES =                                               \
        gitg/history/gitg-history-paned.vala                    \
        gitg/commit/gitg-commit.vala                            \
        gitg/commit/gitg-commit-paned.vala                      \
-       gitg/commit/gitg-commit-dialog.vala
+       gitg/commit/gitg-commit-dialog.vala                     \
+       libgitg/libgitg-1.0.vapi                                \
+       libgitg-ext/libgitg-ext-1.0.vapi
 
 gitg_gitg_SOURCES =                                            \
        $(gitg_gitg_VALASOURCES)                                \
diff --git a/libgitg-ext/Makefile.am b/libgitg-ext/Makefile.am
index 3d1455e..2d3190b 100644
--- a/libgitg-ext/Makefile.am
+++ b/libgitg-ext/Makefile.am
@@ -14,7 +14,6 @@ libgitg_ext_libgitg_ext_1_0_la_CFLAGS =               \
 
 libgitg_ext_libgitg_ext_1_0_la_VALAPKGS =      \
        --pkg Ggit-1.0                          \
-       --pkg libgitg-1.0                       \
        --pkg gio-2.0                           \
        --pkg gtk+-3.0                          \
        --pkg libsoup-2.4                       \
@@ -25,7 +24,6 @@ libgitg_ext_libgitg_ext_1_0_la_VALAFLAGS =            \
        $(libgitg_ext_libgitg_ext_1_0_la_VALAPKGS)      \
        --basedir $(top_srcdir)                         \
        --vapidir $(top_srcdir)/vapi                    \
-       --vapidir $(top_builddir)/libgitg               \
        --gir GitgExt-1.0.gir                           \
        --vapi libgitg-ext/libgitg-ext-1.0.vapi         \
        --girdir $(top_builddir)/libgitg                \
@@ -55,7 +53,8 @@ libgitg_ext_libgitg_ext_1_0_la_VALASOURCES =          \
        libgitg-ext/gitg-ext-history-panel.vala         \
        libgitg-ext/gitg-ext-command-line.vala          \
        libgitg-ext/gitg-ext-preferences.vala           \
-       libgitg-ext/gitg-ext-ui.vala
+       libgitg-ext/gitg-ext-ui.vala                    \
+       libgitg/libgitg-1.0.vapi
 
 libgitg_ext_libgitg_ext_1_0_la_SOURCES =               \
        $(libgitg_ext_libgitg_ext_1_0_la_VALASOURCES)   \
diff --git a/plugins/diff/Makefile.am b/plugins/diff/Makefile.am
index b25c97e..377de92 100644
--- a/plugins/diff/Makefile.am
+++ b/plugins/diff/Makefile.am
@@ -26,7 +26,8 @@ plugins_diff_libdiff_la_VALASOURCES =                                 \
 
 plugins_diff_libdiff_la_SOURCES =                                      \
        $(plugins_diff_libdiff_la_VALASOURCES)                          \
-       plugins/diff/gitg-diff-resources.c
+       plugins/diff/gitg-diff-resources.c                              \
+       $(GITG_PLUGIN_VAPISOURCES)
 
 plugins_diff_libdiff_resources_deps = $(call GRESDEPS,plugins/diff/resources/resources.xml)
 plugins/diff/gitg-diff-resources.c: $(plugins_diff_libdiff_resources_deps)
diff --git a/plugins/files/Makefile.am b/plugins/files/Makefile.am
index 83f2c28..5c09726 100644
--- a/plugins/files/Makefile.am
+++ b/plugins/files/Makefile.am
@@ -23,7 +23,8 @@ plugins_files_libfiles_la_VALAFLAGS = $(GITG_PLUGIN_VALAFLAGS)
 
 plugins_files_libfiles_la_VALASOURCES =                                        \
        plugins/files/gitg-files.vala                                   \
-       plugins/files/gitg-files-tree-store.vala
+       plugins/files/gitg-files-tree-store.vala                        \
+       $(GITG_PLUGIN_VAPISOURCES)
 
 plugins_files_libfiles_la_SOURCES =                                    \
        $(plugins_files_libfiles_la_VALASOURCES)                        \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index db937cc..1516e91 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,21 +21,21 @@ TESTS_DEMO_PROGS =                  \
        tests/repository-list-box       \
        tests/progress-bin
 
-tests_diff_view_SOURCES = tests/diff-view.vala
+tests_diff_view_SOURCES = tests/diff-view.vala $(GITG_PLUGIN_VAPISOURCES)
 tests_diff_view_VALAFLAGS = $(tests_common_valaflags)
 tests_diff_view_CFLAGS = $(tests_common_cflags)
 tests_diff_view_LDFLAGS = $(tests_common_ldflags)
 tests_diff_view_CPPFLAGS = $(tests_common_cppflags)
 tests_diff_view_LDADD = libgitg/libgitg-1.0.la
 
-tests_repository_list_box_SOURCES = tests/repository-list-box.vala
+tests_repository_list_box_SOURCES = tests/repository-list-box.vala $(GITG_PLUGIN_VAPISOURCES)
 tests_repository_list_box_VALAFLAGS = $(tests_common_valaflags)
 tests_repository_list_box_CFLAGS = $(tests_common_cflags)
 tests_repository_list_box_LDFLAGS = $(tests_common_ldflags)
 tests_repository_list_box_CPPFLAGS = $(tests_common_cppflags)
 tests_repository_list_box_LDADD = libgitg/libgitg-1.0.la
 
-tests_progress_bin_SOURCES = tests/progress-bin.vala
+tests_progress_bin_SOURCES = tests/progress-bin.vala $(GITG_PLUGIN_VAPISOURCES)
 tests_progress_bin_VALAFLAGS = $(tests_common_valaflags)
 tests_progress_bin_CFLAGS = $(tests_common_cflags)
 tests_progress_bin_LDFLAGS = $(tests_common_ldflags)
diff --git a/tests/libgitg/Makefile.am b/tests/libgitg/Makefile.am
index f91ae80..1c484ed 100644
--- a/tests/libgitg/Makefile.am
+++ b/tests/libgitg/Makefile.am
@@ -13,7 +13,6 @@ tests_libgitg_test_libgitg_VALAFLAGS =                \
        --pkg posix                             \
        --pkg gitg-assert                       \
        --pkg Ggit-1.0                          \
-       --pkg libgitg-1.0                       \
        --pkg gio-2.0                           \
        --pkg gtk+-3.0                          \
        --pkg gee-0.8                           \
@@ -23,7 +22,6 @@ tests_libgitg_test_libgitg_VALAFLAGS =                \
        $(GITG_VALAFLAGS)                       \
        --vapidir $(top_srcdir)/tests/libgitg   \
        --vapidir $(top_srcdir)/vapi            \
-       --vapidir $(top_builddir)/libgitg       \
        --disable-warnings
 
 tests_libgitg_test_libgitg_CFLAGS =            \
@@ -46,7 +44,8 @@ tests_libgitg_test_libgitg_SOURCES =          \
        tests/libgitg/test-stage.vala           \
        tests/libgitg/test-date.vala            \
        tests/libgitg/test-commit.vala          \
-       tests/libgitg/test-encoding.vala
+       tests/libgitg/test-encoding.vala        \
+       $(GITG_PLUGIN_VAPISOURCES)
 
 GITIGNOREFILES +=                                              \
        $(tests_libgitg_test_libgitg_SOURCES:%.vala=%.c)        \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]