From 8bbba73d73e8cdabd473160a88c20994663eb885 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Fri, 6 Jan 2017 19:37:36 +0000 Subject: [PATCH] try to fix soname.h again now make in install-exec-hook so we are certain libvips.la has been built --- TODO | 4 ---- libvips/Makefile.am | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/TODO b/TODO index a7bd4ade..715f4c8f 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,3 @@ -- vipsdisp-tiny makes stripes if the image is not tagged correctly - - is one of the colourspace functions not reading format? - - not sure about utf8 error messages on win - strange: diff --git a/libvips/Makefile.am b/libvips/Makefile.am index 9f3f91fd..3823b451 100644 --- a/libvips/Makefile.am +++ b/libvips/Makefile.am @@ -64,13 +64,11 @@ EXTRA_DIST = \ CLEANFILES = -all-local: - while [ ! -f libvips.la ]; do sleep 1; done; sleep 1; \ +install-exec-hook: echo '/* This file is autogenerated, do not edit. */' > soname.h && \ source libvips.la && \ echo "#define VIPS_SONAME \"$$dlname\"" >> soname.h && \ - ( cmp -s soname.h include/vips/soname.h || \ - cp soname.h include/vips ) && \ + cp soname.h $(DESTDIR)$(pkgincludedir) && \ rm soname.h -include $(INTROSPECTION_MAKEFILE)