GNOME.org
 

[gimp/gimp-2-10] */Makefile.am: add *marshal.h files to BUILT_SOURCES

commit efe72a8d56fed99cd78860184681c5ae17a63f25
Author: Ell <ell_se yahoo com>
Date:   Tue Jul 24 13:59:47 2018 -0400

    */Makefile.am: add *marshal.h files to BUILT_SOURCES
    
    In subdirs containing a generated foomarshal.h header, add the
    generated sources to BUILT_SOURCES, so that they're generated
    before the rest of the source files are built.  Otherwise, since
    there is no rule specifying the dependency between the rest of the
    source files and foomarshal.h, and since foomarshal.h is not
    checked into git (and hence doesn't exist when doing a clean
    build), compilation of the said source files may fail if they're
    built before foomarshal.h is generated.
    
    (cherry picked from commit a5102a7dba47ad340abf94f12fa0426111239552)

 app/core/Makefile.am       | 3 +++
 libgimp/Makefile.am        | 4 ++++
 libgimpwidgets/Makefile.am | 2 ++
 3 files changed, 9 insertions(+)
---
diff --git a/app/core/Makefile.am b/app/core/Makefile.am
index 5bd7fc0434..c9df9dfffb 100644
--- a/app/core/Makefile.am
+++ b/app/core/Makefile.am
@@ -474,6 +474,9 @@ libappcore_a_extra_sources = \
 
 libappcore_a_SOURCES = $(libappcore_a_built_sources) $(libappcore_a_sources)
 
+BUILT_SOURCES = \
+       $(libappcore_a_built_sources)
+
 EXTRA_DIST = \
        $(libappcore_a_extra_sources)
 
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index 1c2cdd348d..2891b8ad63 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -439,6 +439,10 @@ libgimpui_@GIMP_API_VERSION@_la_LIBADD = \
        $(GEXIV2_LIBS)          \
        $(RT_LIBS)
 
+BUILT_SOURCES = \
+       $(libgimp_built_sources) \
+       $(libgimpui_built_sources)
+
 EXTRA_DIST = \
        COPYING                         \
        gimp.def                        \
diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am
index 50ec2ab548..e9b0cacde2 100644
--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -296,6 +296,8 @@ libgimpwidgets_@GIMP_API_VERSION@_la_LIBADD = \
        $(libm)                 \
        $(libgdi32)
 
+BUILT_SOURCES = \
+       $(libgimpwidgets_built_sources)
 
 EXTRA_DIST = \
        gimpwidgets.def                 \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]