[gimp] Use EXTRA_foo_DEPENDENCIES for adding .def files



commit b54b59c9e8f6d9a524ec8d2bed11acde8f1695df
Author: Daniel Sabo <DanielSabo gmail com>
Date:   Sat Mar 15 14:18:45 2014 -0700

    Use EXTRA_foo_DEPENDENCIES for adding .def files
    
    The foo_DEPENDENCIES rule replaces the default dependencies, where
    EXTRA_foo_DEPENDENCIES just appends to it. This was causing libgimp
    and libgimpui to build out of order.

 libgimp/Makefile.am        |    4 ++--
 libgimpbase/Makefile.am    |    2 +-
 libgimpcolor/Makefile.am   |    2 +-
 libgimpconfig/Makefile.am  |    2 +-
 libgimpmath/Makefile.am    |    2 +-
 libgimpmodule/Makefile.am  |    2 +-
 libgimpwidgets/Makefile.am |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index 8e780bd..f7c9964 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -377,7 +377,7 @@ libgimp_ GIMP_API_VERSION@_la_LDFLAGS = \
        $(libgimp_export_symbols)               \
        $(framework_cocoa)
 
-libgimp_ GIMP_API_VERSION@_la_DEPENDENCIES = $(gimp_def)
+EXTRA_libgimp_ GIMP_API_VERSION@_la_DEPENDENCIES = $(gimp_def)
 
 libgimp_ GIMP_API_VERSION@_la_LIBADD = \
        $(libgimpconfig)        \
@@ -394,7 +394,7 @@ libgimpui_ GIMP_API_VERSION@_la_LDFLAGS = \
        $(libgimpui_export_symbols)             \
        $(framework_cocoa)
 
-libgimpui_ GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpui_def)
+EXTRA_libgimpui_ GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpui_def)
 
 libgimpui_ GIMP_API_VERSION@_la_LIBADD = \
        $(libgimp)              \
diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am
index ffc8b3e..4908cc6 100644
--- a/libgimpbase/Makefile.am
+++ b/libgimpbase/Makefile.am
@@ -162,7 +162,7 @@ libgimpbase_ GIMP_API_VERSION@_la_LDFLAGS = \
        $(libgimpbase_export_symbols)           \
        $(framework_cocoa)
 
-libgimpbase_ GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpbase_def)
+EXTRA_libgimpbase_ GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpbase_def)
 
 libgimpbase_ GIMP_API_VERSION@_la_LIBADD = \
        $(GIO_LIBS)     \
diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am
index 4a8a279..0bb71df 100644
--- a/libgimpcolor/Makefile.am
+++ b/libgimpcolor/Makefile.am
@@ -108,7 +108,7 @@ libgimpcolor_ GIMP_API_VERSION@_la_LDFLAGS = \
        $(no_undefined)                         \
        $(libgimpcolor_export_symbols)
 
-libgimpcolor_ GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpcolor_def)
+EXTRA_libgimpcolor_ GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpcolor_def)
 
 libgimpcolor_ GIMP_API_VERSION@_la_LIBADD = \
        $(libgimpbase)          \
diff --git a/libgimpconfig/Makefile.am b/libgimpconfig/Makefile.am
index 696ffbb..a6f2f43 100644
--- a/libgimpconfig/Makefile.am
+++ b/libgimpconfig/Makefile.am
@@ -110,7 +110,7 @@ libgimpconfig_ GIMP_API_VERSION@_la_LDFLAGS = \
        $(no_undefined)                         \
        $(libgimpconfig_export_symbols)
 
-libgimpconfig_ GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpconfig_def)
+EXTRA_libgimpconfig_ GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpconfig_def)
 
 libgimpconfig_ GIMP_API_VERSION@_la_LIBADD = \
        $(libgimpbase)  \
diff --git a/libgimpmath/Makefile.am b/libgimpmath/Makefile.am
index fa60eb2..81db81d 100644
--- a/libgimpmath/Makefile.am
+++ b/libgimpmath/Makefile.am
@@ -80,7 +80,7 @@ libgimpmath_ GIMP_API_VERSION@_la_LDFLAGS = \
        $(no_undefined)                         \
        $(libgimpmath_export_symbols)
 
-libgimpmath_ GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpmath_def)
+EXTRA_libgimpmath_ GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpmath_def)
 
 libgimpmath_ GIMP_API_VERSION@_la_LIBADD = \
        $(libgimpbase)  \
diff --git a/libgimpmodule/Makefile.am b/libgimpmodule/Makefile.am
index 9b4d4d9..a76526b 100644
--- a/libgimpmodule/Makefile.am
+++ b/libgimpmodule/Makefile.am
@@ -71,7 +71,7 @@ libgimpmodule_ GIMP_API_VERSION@_la_LDFLAGS = \
        $(no_undefined)                         \
        $(libgimpmodule_export_symbols)
 
-libgimpmodule_ GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpmodule_def)
+EXTRA_libgimpmodule_ GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpmodule_def)
 
 libgimpmodule_ GIMP_API_VERSION@_la_LIBADD = \
        $(libgimpbase)                  \
diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am
index fc93196..f76b1f5 100644
--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -260,7 +260,7 @@ libgimpwidgets_ GIMP_API_VERSION@_la_LDFLAGS = \
        $(no_undefined)                         \
        $(libgimpwidgets_export_symbols)
 
-libgimpwidgets_ GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpwidgets_def)
+EXTRA_libgimpwidgets_ GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpwidgets_def)
 
 libgimpwidgets_ GIMP_API_VERSION@_la_LIBADD = \
        $(libgimpbase)          \


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