mirror of
https://gitlab.gnome.org/GNOME/gimp.git
synced 2025-10-06 01:12:40 +02:00
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.
This commit is contained in:
@@ -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) \
|
||||
|
@@ -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) \
|
||||
|
@@ -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) \
|
||||
|
@@ -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) \
|
||||
|
@@ -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) \
|
||||
|
@@ -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) \
|
||||
|
@@ -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) \
|
||||
|
Reference in New Issue
Block a user