procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 17:33:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

Use EXTRA_foo_DEPENDENCIES for adding .def files

Browse source 
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:
Daniel Sabo 2014-03-15 14:18:45 -07:00
parent ebc53672cb
commit b54b59c9e8
7 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libgimp/Makefile.am
View file

@ -377,7 +377,7 @@ libgimp_@GIMP_API_VERSION@_la_LDFLAGS = \
$(libgimp_export_symbols) \ $(libgimp_export_symbols) \
$(framework_cocoa) $(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 = \ libgimp_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimpconfig) \ $(libgimpconfig) \
@ -394,7 +394,7 @@ libgimpui_@GIMP_API_VERSION@_la_LDFLAGS = \
$(libgimpui_export_symbols) \ $(libgimpui_export_symbols) \
$(framework_cocoa) $(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 = \ libgimpui_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimp) \ $(libgimp) \

2
libgimpbase/Makefile.am
View file

@ -162,7 +162,7 @@ libgimpbase_@GIMP_API_VERSION@_la_LDFLAGS = \
$(libgimpbase_export_symbols) \ $(libgimpbase_export_symbols) \
$(framework_cocoa) $(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 = \ libgimpbase_@GIMP_API_VERSION@_la_LIBADD = \
$(GIO_LIBS) \ $(GIO_LIBS) \

2
libgimpcolor/Makefile.am
View file

@ -108,7 +108,7 @@ libgimpcolor_@GIMP_API_VERSION@_la_LDFLAGS = \
$(no_undefined) \ $(no_undefined) \
$(libgimpcolor_export_symbols) $(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 = \ libgimpcolor_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimpbase) \ $(libgimpbase) \

2
libgimpconfig/Makefile.am
View file

@ -110,7 +110,7 @@ libgimpconfig_@GIMP_API_VERSION@_la_LDFLAGS = \
$(no_undefined) \ $(no_undefined) \
$(libgimpconfig_export_symbols) $(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 = \ libgimpconfig_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimpbase) \ $(libgimpbase) \

2
libgimpmath/Makefile.am
View file

@ -80,7 +80,7 @@ libgimpmath_@GIMP_API_VERSION@_la_LDFLAGS = \
$(no_undefined) \ $(no_undefined) \
$(libgimpmath_export_symbols) $(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 = \ libgimpmath_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimpbase) \ $(libgimpbase) \

2
libgimpmodule/Makefile.am
View file

@ -71,7 +71,7 @@ libgimpmodule_@GIMP_API_VERSION@_la_LDFLAGS = \
$(no_undefined) \ $(no_undefined) \
$(libgimpmodule_export_symbols) $(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 = \ libgimpmodule_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimpbase) \ $(libgimpbase) \

2
libgimpwidgets/Makefile.am
View file

@ -260,7 +260,7 @@ libgimpwidgets_@GIMP_API_VERSION@_la_LDFLAGS = \
$(no_undefined) \ $(no_undefined) \
$(libgimpwidgets_export_symbols) $(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 = \ libgimpwidgets_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimpbase) \ $(libgimpbase) \