Merge branch '8.5'

jcupitt · jcupitt · commit 820c27969758 · 2017-08-30T14:59:16.000+01:00
diff --git a/ChangeLog b/ChangeLog
@@ -17,6 +17,7 @@
 
 29/8/17 started 8.5.9
 - make --fail stop jpeg read on any libjpeg warning, thanks @mceachen
+- don't build enumtypes so often, removing perl as a compile dependancy
 
 2/8/17 started 8.5.8
 - fix transparency detection in merge, thanks Haida
diff --git a/libvips/include/vips/Makefile.am b/libvips/include/vips/Makefile.am
@@ -72,11 +72,7 @@ vips_scan_headers = \
 	${top_srcdir}/libvips/include/vips/morphology.h \
 	${top_srcdir}/libvips/include/vips/draw.h \
 	${top_srcdir}/libvips/include/vips/basic.h \
-	${top_srcdir}/libvips/include/vips/version.h \
 	${top_srcdir}/libvips/include/vips/object.h
 
-enumtypes.h: $(vips_scan_headers) Makefile
-	glib-mkenums --template enumtemplate \
-		$(vips_scan_headers) > xgen-geth && \
-	( cmp -s xgen-geth enumtypes.h || cp xgen-geth enumtypes.h ) && \
-	rm -f xgen-geth 
+enumtypes.h: $(vips_scan_headers) Makefile.am
+	glib-mkenums --template enumtemplate $(vips_scan_headers) > enumtypes.h
diff --git a/libvips/iofuncs/Makefile.am b/libvips/iofuncs/Makefile.am
@@ -70,11 +70,7 @@ vips_scan_headers = \
 	${top_srcdir}/libvips/include/vips/morphology.h \
 	${top_srcdir}/libvips/include/vips/draw.h \
 	${top_srcdir}/libvips/include/vips/basic.h \
-	${top_srcdir}/libvips/include/vips/version.h \
 	${top_srcdir}/libvips/include/vips/object.h
 
-enumtypes.c: $(vips_scan_headers) Makefile
-	glib-mkenums --template enumtemplate \
-		$(vips_scan_headers) > xgen-getc && \
-	( cmp -s xgen-getc enumtypes.c || cp xgen-getc enumtypes.c ) && \
-	rm -f xgen-getc
+enumtypes.c: $(vips_scan_headers) Makefile.am
+	glib-mkenums --template enumtemplate $(vips_scan_headers) > enumtypes.c
