GNOME.org
 

[gnome-builder] build: fix git builds when srcdir != builddir

commit 6faa1d0ffe49ee222a11ec5514975447d1861627
Author: Christian Hergert <chergert redhat com>
Date:   Tue Mar 1 03:04:10 2016 -0800

    build: fix git builds when srcdir != builddir
    
    distcheck passed fine, but there are a few things that were still broken
    when building out of tree from a git checkout like:
    
     NO_CONFIGURE=1 ./autogen.sh
     mkdir ../build && cd ../build
     ../gnome-builder/configure --prefix=/foo

 contrib/tmpl/Makefile.am                  |    7 +++++--
 libide/Makefile.am                        |   11 ++++++++---
 plugins/autotools/Makefile.am             |    1 +
 plugins/build-tools/Makefile.am           |    1 +
 plugins/c-pack/Makefile.am                |    1 +
 plugins/clang/Makefile.am                 |    1 +
 plugins/command-bar/Makefile.am           |    1 +
 plugins/comment-code/Makefile.am          |    1 +
 plugins/create-project/Makefile.am        |    1 +
 plugins/ctags/Makefile.am                 |    1 +
 plugins/devhelp/Makefile.am               |    1 +
 plugins/file-search/Makefile.am           |    1 +
 plugins/gcc/Makefile.am                   |    3 ++-
 plugins/gettext/Makefile.am               |    1 +
 plugins/git/Makefile.am                   |    1 +
 plugins/gnome-code-assistance/Makefile.am |    1 +
 plugins/html-completion/Makefile.am       |    1 +
 plugins/mingw/Makefile.am                 |    1 +
 plugins/project-tree/Makefile.am          |    1 +
 plugins/python-pack/Makefile.am           |    1 +
 plugins/support/Makefile.am               |    1 +
 plugins/symbol-tree/Makefile.am           |    1 +
 plugins/sysmon/Makefile.am                |    1 +
 plugins/terminal/Makefile.am              |    1 +
 plugins/vala-pack/Makefile.am             |    1 +
 plugins/xdg-app/Makefile.am               |    1 +
 plugins/xml-pack/Makefile.am              |    1 +
 27 files changed, 39 insertions(+), 6 deletions(-)
---
diff --git a/contrib/tmpl/Makefile.am b/contrib/tmpl/Makefile.am
index 70afec9..fcc3c83 100644
--- a/contrib/tmpl/Makefile.am
+++ b/contrib/tmpl/Makefile.am
@@ -36,8 +36,6 @@ libtemplate_glib_1_0_la_SOURCES = \
        tmpl-condition-node.c \
        tmpl-condition-node.h \
        tmpl-debug.h \
-       tmpl-enums.c \
-       tmpl-enums.h \
        tmpl-error.c \
        tmpl-expr-eval.c \
        tmpl-expr-node.c \
@@ -73,6 +71,11 @@ libtemplate_glib_1_0_la_SOURCES = \
        tmpl-util.c \
        $(NULL)
 
+nodist_libtemplate_glib_1_0_la_SOURCES = \
+       tmpl-enums.c \
+       tmpl-enums.h \
+       $(NULL)
+
 glib_enum_h = tmpl-enums.h
 glib_enum_c = tmpl-enums.c
 glib_enum_headers = \
diff --git a/libide/Makefile.am b/libide/Makefile.am
index af028a8..c6e5c93 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -7,7 +7,9 @@ pkglibdir = $(libdir)/gnome-builder
 pkglib_LTLIBRARIES = libide-1.0.la
 
 headersdir = $(includedir)/gnome-builder- VERSION@/libide
-nobase_headers_DATA = $(libide_1_0_la_public_headers)
+nobase_headers_DATA = \
+       $(libide_1_0_la_public_headers) \
+       $(builddir)/ide-enums.h
 
 libide_1_0_la_public_headers = \
        directory/ide-directory-build-system.h \
@@ -49,7 +51,6 @@ libide_1_0_la_public_headers = \
        ide-diagnostic.h \
        ide-diagnostician.h \
        ide-diagnostics.h \
-       ide-enums.h \
        ide-environment-editor-row.h \
        ide-environment-editor.h \
        ide-environment-variable.h \
@@ -206,7 +207,6 @@ libide_1_0_la_public_sources = \
        ide-diagnostic.c \
        ide-diagnostician.c \
        ide-diagnostics.c \
-       ide-enums.c \
        ide-environment-editor-row.c \
        ide-environment-editor.c \
        ide-environment-variable.c \
@@ -445,6 +445,7 @@ libide_1_0_la_includes = \
        -I$(top_srcdir)/contrib/search \
        -I$(top_srcdir)/contrib/tmpl \
        -I$(top_srcdir)/contrib/xml \
+       -I$(top_builddir)/contrib/tmpl \
        -I$(top_builddir)/data/icons/hicolor \
        -I$(srcdir) \
        -I$(srcdir)/doap \
@@ -557,6 +558,8 @@ glib_resources_namespace = ide
 include $(top_srcdir)/build/autotools/Makefile.am.gresources
 
 nodist_libide_1_0_la_SOURCES = \
+       ide-enums.h \
+       ide-enums.c \
        resources/ide-resources.c \
        resources/ide-resources.h \
        $(NULL)
@@ -575,6 +578,8 @@ INTROSPECTION_COMPILER_ARGS = \
 introspection_sources = \
        $(libide_1_0_la_public_sources) \
        $(libide_1_0_la_public_headers) \
+       ide-enums.h \
+       ide-enums.c \
        $(NULL)
 
 Ide-1.0.gir: libide-1.0.la
diff --git a/plugins/autotools/Makefile.am b/plugins/autotools/Makefile.am
index acc7693..9e880a3 100644
--- a/plugins/autotools/Makefile.am
+++ b/plugins/autotools/Makefile.am
@@ -24,6 +24,7 @@ libautotools_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/contrib/egg \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        $(NULL)
 
 libautotools_plugin_la_LDFLAGS = \
diff --git a/plugins/build-tools/Makefile.am b/plugins/build-tools/Makefile.am
index a0c9fb7..a5c0e51 100644
--- a/plugins/build-tools/Makefile.am
+++ b/plugins/build-tools/Makefile.am
@@ -37,6 +37,7 @@ libbuild_tools_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        $(OPTIMIZE_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        -I$(top_srcdir)/contrib/egg \
        $(NULL)
 
diff --git a/plugins/c-pack/Makefile.am b/plugins/c-pack/Makefile.am
index f039860..bacc8f6 100644
--- a/plugins/c-pack/Makefile.am
+++ b/plugins/c-pack/Makefile.am
@@ -19,6 +19,7 @@ libc_pack_plugin_la_SOURCES = \
 libc_pack_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        $(NULL)
 
 libc_pack_plugin_la_LDFLAGS = \
diff --git a/plugins/clang/Makefile.am b/plugins/clang/Makefile.am
index 5b2976b..d1095c9 100644
--- a/plugins/clang/Makefile.am
+++ b/plugins/clang/Makefile.am
@@ -36,6 +36,7 @@ libclang_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        $(CLANG_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        -I$(top_srcdir)/contrib/egg \
        $(NULL)
 
diff --git a/plugins/command-bar/Makefile.am b/plugins/command-bar/Makefile.am
index 20bc6fa..571c607 100644
--- a/plugins/command-bar/Makefile.am
+++ b/plugins/command-bar/Makefile.am
@@ -36,6 +36,7 @@ libcommand_bar_la_SOURCES = \
 
 libcommand_bar_la_CFLAGS = \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        -I$(top_srcdir)/libide/editor \
        -I$(top_srcdir)/libide/util \
        -I$(top_srcdir)/contrib/egg \
diff --git a/plugins/comment-code/Makefile.am b/plugins/comment-code/Makefile.am
index e928ef9..6bbfac5 100644
--- a/plugins/comment-code/Makefile.am
+++ b/plugins/comment-code/Makefile.am
@@ -23,6 +23,7 @@ libcomment_code_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        $(OPTIMIZE_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        $(NULL)
 
 libcomment_code_plugin_la_LDFLAGS = \
diff --git a/plugins/create-project/Makefile.am b/plugins/create-project/Makefile.am
index f840f31..630cf56 100644
--- a/plugins/create-project/Makefile.am
+++ b/plugins/create-project/Makefile.am
@@ -23,6 +23,7 @@ libcreate_project_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        $(OPTIMIZE_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        -I$(top_srcdir)/contrib/egg \
        $(NULL)
 
diff --git a/plugins/ctags/Makefile.am b/plugins/ctags/Makefile.am
index 6001121..e6ffaf7 100644
--- a/plugins/ctags/Makefile.am
+++ b/plugins/ctags/Makefile.am
@@ -29,6 +29,7 @@ libctags_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/contrib/egg \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        -I$(top_srcdir)/libide/util \
        $(NULL)
 
diff --git a/plugins/devhelp/Makefile.am b/plugins/devhelp/Makefile.am
index 9065c3c..4705b12 100644
--- a/plugins/devhelp/Makefile.am
+++ b/plugins/devhelp/Makefile.am
@@ -34,6 +34,7 @@ libdevhelp_plugin_la_CFLAGS = \
        $(DEVHELP_CFLAGS) \
        $(OPTIMIZE_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        $(NULL)
 
 libdevhelp_plugin_la_LIBADD = $(DEVHELP_LIBS)
diff --git a/plugins/file-search/Makefile.am b/plugins/file-search/Makefile.am
index c17e1c0..070f516 100644
--- a/plugins/file-search/Makefile.am
+++ b/plugins/file-search/Makefile.am
@@ -16,6 +16,7 @@ libfile_search_la_SOURCES = \
 libfile_search_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        -I$(top_srcdir)/contrib/search \
        $(NULL)
 
diff --git a/plugins/gcc/Makefile.am b/plugins/gcc/Makefile.am
index c0458d0..c1fccfe 100644
--- a/plugins/gcc/Makefile.am
+++ b/plugins/gcc/Makefile.am
@@ -14,7 +14,8 @@ libgcc_plugin_la_SOURCES = \
 libgcc_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/contrib/egg \
-       -I$(top_srcdir)/libide
+       -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide
 
 libgcc_plugin_la_LDFLAGS = \
        $(OPTIMIZE_LDFLAGS) \
diff --git a/plugins/gettext/Makefile.am b/plugins/gettext/Makefile.am
index 8fd97f0..02bed26 100644
--- a/plugins/gettext/Makefile.am
+++ b/plugins/gettext/Makefile.am
@@ -16,6 +16,7 @@ libgettext_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        $(GETTEXT_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        -I$(top_srcdir)/contrib/egg \
        $(NULL)
 
diff --git a/plugins/git/Makefile.am b/plugins/git/Makefile.am
index 5468df0..ecb515f 100644
--- a/plugins/git/Makefile.am
+++ b/plugins/git/Makefile.am
@@ -34,6 +34,7 @@ libgit_plugin_la_CFLAGS = \
        $(GIT_CFLAGS) \
        $(OPTIMIZE_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        -I$(top_srcdir)/contrib/egg \
        $(NULL)
 
diff --git a/plugins/gnome-code-assistance/Makefile.am b/plugins/gnome-code-assistance/Makefile.am
index 52d4c89..4ba4a69 100644
--- a/plugins/gnome-code-assistance/Makefile.am
+++ b/plugins/gnome-code-assistance/Makefile.am
@@ -23,6 +23,7 @@ libgnome_code_assistance_plugin_la_SOURCES = \
 libgnome_code_assistance_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        $(NULL)
 
 libgnome_code_assistance_plugin_la_LDFLAGS = \
diff --git a/plugins/html-completion/Makefile.am b/plugins/html-completion/Makefile.am
index eaf553e..3705250 100644
--- a/plugins/html-completion/Makefile.am
+++ b/plugins/html-completion/Makefile.am
@@ -16,6 +16,7 @@ libhtml_completion_plugin_la_CFLAGS = \
        $(OPTIMIZE_CFLAGS) \
        -I$(top_srcdir)/contrib/search \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        $(NULL)
 
 libhtml_completion_plugin_la_LDFLAGS = \
diff --git a/plugins/mingw/Makefile.am b/plugins/mingw/Makefile.am
index 84aa9a4..4d78aa3 100644
--- a/plugins/mingw/Makefile.am
+++ b/plugins/mingw/Makefile.am
@@ -17,6 +17,7 @@ libmingw_plugin_la_SOURCES = \
 libmingw_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        $(NULL)
 
 libmingw_plugin_la_LDFLAGS = \
diff --git a/plugins/project-tree/Makefile.am b/plugins/project-tree/Makefile.am
index b3bdc85..4fba022 100644
--- a/plugins/project-tree/Makefile.am
+++ b/plugins/project-tree/Makefile.am
@@ -39,6 +39,7 @@ libproject_tree_plugin_la_CFLAGS = \
        $(OPTIMIZE_CFLAGS) \
        $(DEBUG_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        $(NULL)
 
 libproject_tree_plugin_la_LIBADD =
diff --git a/plugins/python-pack/Makefile.am b/plugins/python-pack/Makefile.am
index 16f6f65..7ce0dda 100644
--- a/plugins/python-pack/Makefile.am
+++ b/plugins/python-pack/Makefile.am
@@ -17,6 +17,7 @@ libpython_pack_plugin_la_SOURCES = \
 libpython_pack_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        $(NULL)
 
 libpython_pack_plugin_la_LDFLAGS = \
diff --git a/plugins/support/Makefile.am b/plugins/support/Makefile.am
index c227ed9..7c9b0ec 100644
--- a/plugins/support/Makefile.am
+++ b/plugins/support/Makefile.am
@@ -25,6 +25,7 @@ libsupport_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        $(OPTIMIZE_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        -I$(top_srcdir)/contrib/egg \
        $(NULL)
 
diff --git a/plugins/symbol-tree/Makefile.am b/plugins/symbol-tree/Makefile.am
index 02a12a6..6155560 100644
--- a/plugins/symbol-tree/Makefile.am
+++ b/plugins/symbol-tree/Makefile.am
@@ -26,6 +26,7 @@ libsymbol_tree_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        $(OPTIMIZE_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        -I$(top_srcdir)/contrib/egg \
        $(NULL)
 
diff --git a/plugins/sysmon/Makefile.am b/plugins/sysmon/Makefile.am
index e7cd6de..d3f0f54 100644
--- a/plugins/sysmon/Makefile.am
+++ b/plugins/sysmon/Makefile.am
@@ -24,6 +24,7 @@ nodist_libsysmon_la_SOURCES = \
 libsysmon_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        -I$(top_srcdir)/contrib/egg \
        -I$(top_srcdir)/contrib/rg \
        $(NULL)
diff --git a/plugins/terminal/Makefile.am b/plugins/terminal/Makefile.am
index d35dfe0..a9da69d 100644
--- a/plugins/terminal/Makefile.am
+++ b/plugins/terminal/Makefile.am
@@ -32,6 +32,7 @@ libterminal_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        $(TERMINAL_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        -I$(top_srcdir)/contrib/egg \
        $(NULL)
 
diff --git a/plugins/vala-pack/Makefile.am b/plugins/vala-pack/Makefile.am
index 86baaa9..5da31ca 100644
--- a/plugins/vala-pack/Makefile.am
+++ b/plugins/vala-pack/Makefile.am
@@ -88,6 +88,7 @@ libvala_pack_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        $(VALA_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        -I$(top_srcdir)/contrib/egg \
        -I$(top_srcdir)/contrib/tmpl \
        -Wno-deprecated-declarations \
diff --git a/plugins/xdg-app/Makefile.am b/plugins/xdg-app/Makefile.am
index 4300f6b..dadda63 100644
--- a/plugins/xdg-app/Makefile.am
+++ b/plugins/xdg-app/Makefile.am
@@ -22,6 +22,7 @@ libxdg_app_plugin_la_CFLAGS = \
        $(XDG_APP_CFLAGS) \
        $(OPTIMIZE_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        $(NULL)
 
 libxdg_app_plugin_la_LIBADD = $(XDG_APP_LIBS)
diff --git a/plugins/xml-pack/Makefile.am b/plugins/xml-pack/Makefile.am
index b8d1a17..398f0e7 100644
--- a/plugins/xml-pack/Makefile.am
+++ b/plugins/xml-pack/Makefile.am
@@ -19,6 +19,7 @@ libxml_pack_plugin_la_SOURCES = \
 libxml_pack_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/libide \
+       -I$(top_builddir)/libide \
        -I$(top_srcdir)/contrib/egg \
        -I$(top_srcdir)/contrib/xml \
        $(NULL)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]