[gimp] libgimp: fix the build.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] libgimp: fix the build.
- Date: Thu, 8 Aug 2019 14:43:53 +0000 (UTC)
commit 376552fbfcbf1749baf1f2d1a145eccbf2f74f14
Author: Jehan <jehan girinstud io>
Date: Thu Aug 8 16:40:02 2019 +0200
libgimp: fix the build.
Autotools were not able to recognize that libgimp-@GIMP_API_VERSION@.la
and ../libgimp/libgimp-@GIMP_API_VERSION@.la were the same dependency.
Hence with multi-thread builds, GI scanner was not waiting for the lib
to be totally built then failed randomly. Make the path recognizable,
and do the same for libgimpui.
For other libgimp*, I still need to keep a more complicated relative
path, but since libgimp/ is the last processed folder, AFAIK it won't
make problems.
libgimp/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index f388b4bc60..ed92a2c3cb 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -308,8 +308,8 @@ INTROSPECTION_COMPILER_ARGS = \
INTROSPECTION_SCANNER_ENV = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)"
CXXFLAGS="$(CXXFLAGS)"
Gimp-@GIMP_API_VERSION@.gir: \
- ../libgimp/libgimp-@GIMP_API_VERSION@.la \
- ../libgimp/libgimpui-@GIMP_API_VERSION@.la \
+ libgimp-@GIMP_API_VERSION@.la \
+ libgimpui-@GIMP_API_VERSION@.la \
../libgimpbase/libgimpbase-@GIMP_API_VERSION@.la \
../libgimpcolor/libgimpcolor-@GIMP_API_VERSION@.la \
../libgimpconfig/libgimpconfig-@GIMP_API_VERSION@.la \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]