[libchamplain] build: Fix srcdir != builddir



commit cf985ac8299beb8927af3193cc1e390ea71e7ccb
Author: Colin Walters <walters verbum org>
Date:   Thu Aug 29 16:40:56 2013 -0400

    build: Fix srcdir != builddir
    
    gnome-ostree does builds directly from git with srcdir != builddir.
    Thus champlain-version.h will be in $(builddir); we should not
    explicitly prefix it with $(srcdir).
    
    Omit it from enum and introspection scanning too.

 champlain/Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index 7817db5..b1723aa 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -11,7 +11,7 @@ endif
 
 libchamplain_headers_public =                          \
        $(memphis_headers)                              \
-       $(srcdir)/champlain-version.h                   \
+       champlain-version.h                             \
        $(srcdir)/champlain.h                           \
        $(srcdir)/champlain-defines.h                   \
        $(srcdir)/champlain-point.h                     \
@@ -107,7 +107,7 @@ include $(top_srcdir)/build/Makefile.am.marshal
 # glib-mkenums rules
 glib_enum_h = champlain-enum-types.h
 glib_enum_c = champlain-enum-types.c
-glib_enum_headers = $(libchamplain_headers_public)
+glib_enum_headers = $(filter-out $(srcdir)/champlain-version.h,$(libchamplain_headers_public))
 include $(top_srcdir)/build/Makefile.am.enums
 
 libchamplain_headers_built =   \
@@ -162,7 +162,7 @@ INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --warn-all
 INTROSPECTION_COMPILER_ARGS =
 introspection_sources = \
-       $(libchamplain_headers_public)  \
+       $(filter-out $(srcdir)/champlain-version.h,$(libchamplain_headers_public))      \
        $(libchamplain_sources)
 if ENABLE_MEMPHIS
 memphis_gir_include = Memphis-0.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]