Changes to fix tests in dials.lbl.gov environment, added

Makefile_DIALS which still needs to be merged into m4/Makefile.m4 added a local copy of tif_sprint.c to fix a linking problem
dials · Jul 12, 2021 · 34e8625 · 34e8625
1 parent 94eadad
commit 34e8625
Show file tree

Hide file tree

Showing 8 changed files with 3,721 additions and 41 deletions.
diff --git a/Makefile b/Makefile
@@ -1329,8 +1329,10 @@ $(PY2CIFRW):	build_py2cifrw
 	$(DOWNLOAD) $(PY2CIFRWURL)
 	tar -xvf $(PY2CIFRW).tar.gz
 	-rm $(PY2CIFRW).tar.gz
-	(cd $(PY2CIFRW); PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python; export PYTHONPATH; \
+	(cd $(PY2CIFRW); \
+        PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python:$(PY2CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
 	mkdir -p $(PY2CIFRW_PREFIX)/lib/python/site-packages; \
+	mkdir -p $(PY2CIFRW_PREFIX)/lib64/python/site-packages; \
 	$(PYTHON2) setup.py install --prefix= --home=$(PY2CIFRW_PREFIX) )
 
 #
@@ -1344,8 +1346,10 @@ $(PY2PLY):	build_py2ply
 	$(DOWNLOAD) $(PY2PLYURL)
 	tar -xvf $(PY2PLY).tar.gz
 	-rm $(PY2PLY).tar.gz
-	(cd $(PY2PLY); PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python; export PYTHONPATH; \
+	(cd $(PY2PLY); \
+	PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python:$(PY2CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
 	mkdir -p $(PY2CIFRW_PREFIX)/lib/python/site-packages; \
+	mkdir -p $(PY2CIFRW_PREFIX)/lib64/python/site-packages; \
 	$(PYTHON2) setup.py install --prefix= --home=$(PY2CIFRW_PREFIX) )
 endif
 
@@ -1361,8 +1365,10 @@ $(PY3CIFRW):    build_py3cifrw
 	$(DOWNLOAD) $(PY3CIFRWURL)
 	tar -xvf $(PY3CIFRW).tar.gz
 	-rm $(PY3CIFRW).tar.gz
-	(cd $(PY3CIFRW); PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python; export PYTHONPATH; \
+	(cd $(PY3CIFRW); \
+	PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
 	mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \
+	mkdir -p $(PY3CIFRW_PREFIX)/lib64/python/site-packages; \
 	$(PYTHON3) setup.py install --prefix= --home=$(PY3CIFRW_PREFIX) )
 
 #
@@ -1376,16 +1382,18 @@ $(PY3PLY):      build_py3ply
 	$(DOWNLOAD) $(PY3PLYURL)
 	tar -xvf $(PY3PLY).tar.gz
 	-rm $(PY3PLY).tar.gz
-	(cd $(PY3PLY); PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python; export PYTHONPATH; \
+	(cd $(PY3PLY); \
+	PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
 	mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \
+	mkdir -p $(PY3CIFRW_PREFIX)/lib64/python/site-packages; \
 	$(PYTHON3) setup.py install --prefix= --home=$(PY3CIFRW_PREFIX) )
 endif
 
 
 #
 # NUWEB
 #
-ifneq ($(NUWEB_DEP),')
+ifneq ($(NUWEB_DEP),'')
 $(NUWEB_DEP):
 	-rm -rf $(NUWEB_DEP)
 	-rm -rf $(NUWEB_DEP).tar.gz
@@ -1504,7 +1512,7 @@ ifneq ($(MSYS2),yes)
 	rm lz4.o h5zlz4.o)
 else
 	git clone $(LZ4_URL)
-	(cd $(LZ4); mkdir build; cd build; cmake .. -G ''MSYS Makefiles' -DENABLE_LZ4_PLUGIN="yes"; make all; cp plugins/* $(SOLIB))
+	(cd $(LZ4); mkdir build; cd build; cmake .. -G 'MSYS Makefiles' -DENABLE_LZ4_PLUGIN="yes"; make all; cp plugins/* $(SOLIB))
 endif 
 	touch $(LZ4)
 endif
@@ -1715,6 +1723,7 @@ $(PY2CBF)/xmas/readmarheader.py \
 $(PY2CBF)/xmas/xmasheaders.py   \
 $(PY2CBF)/xmas/xmas_cif_template.cif : $(NUWEB_DEP) $(NUWEB_DEP2) $(PY2CBF)/pycbf.w
 	(cd $(PY2CBF); $(NUWEB) pycbf.w )
+	touch $(PY2CBF)/py2setup_py.m4
 
 $(PY2CBF)/_py2cbf.$(PY2CBFEXT):	$(PY2CBF)  shared \
 	$(PY2CBF)/py2setup.py                    \
@@ -1784,6 +1793,7 @@ $(PY3CBF)/xmas/readmarheader.py \
 $(PY3CBF)/xmas/xmasheaders.py   \
 $(PY3CBF)/xmas/xmas_cif_template.cif: $(NUWEB_DEP) $(NUWEB_DEP2) $(PY3CBF)/pycbf.w
 	(cd $(PY3CBF); $(NUWEB) pycbf.w )
+	touch $(PY3CBF)/py3setup_py.m4
 
 
 $(PY3CBF)/_pycbf.$(PY3CBFEXT):	$(PY3CBF)  shared \
@@ -2048,7 +2058,7 @@ $(BIN)/sequence_match: $(LIB)/libcbf.a $(EXAMPLES)/sequence_match.c $(LIB)/libim
 #
 # tiff2cbf example program
 #
-$(BIN)/tiff2cbf: $(LIB)/libcbf.a $(EXAMPLES)/tiff2cbf.c \
+$(BIN)/tiff2cbf: $(LIB)/libcbf.a $(EXAMPLES)/tiff2cbf.c $(EXAMPLES)/tif_sprint.c \
 	$(GOPTLIB)	$(GOPTINC) $(TIFF)
 	mkdir -p $(BIN)
 	$(CC) $(CFLAGS) $(LDFLAGS) $(MISCFLAG) $(CBF_REGEXFLAG) $(INCLUDES) $(WARNINGS) \

diff --git a/Makefile_DIALS b/Makefile_DIALS
diff --git a/Makefile_LINUX b/Makefile_LINUX
@@ -1325,8 +1325,10 @@ $(PY2CIFRW):	build_py2cifrw
 	$(DOWNLOAD) $(PY2CIFRWURL)
 	tar -xvf $(PY2CIFRW).tar.gz
 	-rm $(PY2CIFRW).tar.gz
-	(cd $(PY2CIFRW); PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python; export PYTHONPATH; \
+	(cd $(PY2CIFRW); \
+        PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python:$(PY2CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
 	mkdir -p $(PY2CIFRW_PREFIX)/lib/python/site-packages; \
+	mkdir -p $(PY2CIFRW_PREFIX)/lib64/python/site-packages; \
 	$(PYTHON2) setup.py install --prefix= --home=$(PY2CIFRW_PREFIX) )
 
 #
@@ -1340,8 +1342,10 @@ $(PY2PLY):	build_py2ply
 	$(DOWNLOAD) $(PY2PLYURL)
 	tar -xvf $(PY2PLY).tar.gz
 	-rm $(PY2PLY).tar.gz
-	(cd $(PY2PLY); PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python; export PYTHONPATH; \
+	(cd $(PY2PLY); \
+	PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python:$(PY2CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
 	mkdir -p $(PY2CIFRW_PREFIX)/lib/python/site-packages; \
+	mkdir -p $(PY2CIFRW_PREFIX)/lib64/python/site-packages; \
 	$(PYTHON2) setup.py install --prefix= --home=$(PY2CIFRW_PREFIX) )
 endif
 
@@ -1357,8 +1361,10 @@ $(PY3CIFRW):    build_py3cifrw
 	$(DOWNLOAD) $(PY3CIFRWURL)
 	tar -xvf $(PY3CIFRW).tar.gz
 	-rm $(PY3CIFRW).tar.gz
-	(cd $(PY3CIFRW); PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python; export PYTHONPATH; \
+	(cd $(PY3CIFRW); \
+	PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
 	mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \
+	mkdir -p $(PY3CIFRW_PREFIX)/lib64/python/site-packages; \
 	$(PYTHON3) setup.py install --prefix= --home=$(PY3CIFRW_PREFIX) )
 
 #
@@ -1372,16 +1378,18 @@ $(PY3PLY):      build_py3ply
 	$(DOWNLOAD) $(PY3PLYURL)
 	tar -xvf $(PY3PLY).tar.gz
 	-rm $(PY3PLY).tar.gz
-	(cd $(PY3PLY); PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python; export PYTHONPATH; \
+	(cd $(PY3PLY); \
+	PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
 	mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \
+	mkdir -p $(PY3CIFRW_PREFIX)/lib64/python/site-packages; \
 	$(PYTHON3) setup.py install --prefix= --home=$(PY3CIFRW_PREFIX) )
 endif
 
 
 #
 # NUWEB
 #
-ifneq ($(NUWEB_DEP),')
+ifneq ($(NUWEB_DEP),'')
 $(NUWEB_DEP):
 	-rm -rf $(NUWEB_DEP)
 	-rm -rf $(NUWEB_DEP).tar.gz
@@ -1500,7 +1508,7 @@ ifneq ($(MSYS2),yes)
 	rm lz4.o h5zlz4.o)
 else
 	git clone $(LZ4_URL)
-	(cd $(LZ4); mkdir build; cd build; cmake .. -G ''MSYS Makefiles' -DENABLE_LZ4_PLUGIN="yes"; make all; cp plugins/* $(SOLIB))
+	(cd $(LZ4); mkdir build; cd build; cmake .. -G 'MSYS Makefiles' -DENABLE_LZ4_PLUGIN="yes"; make all; cp plugins/* $(SOLIB))
 endif 
 	touch $(LZ4)
 endif
@@ -1711,6 +1719,7 @@ $(PY2CBF)/xmas/readmarheader.py \
 $(PY2CBF)/xmas/xmasheaders.py   \
 $(PY2CBF)/xmas/xmas_cif_template.cif : $(NUWEB_DEP) $(NUWEB_DEP2) $(PY2CBF)/pycbf.w
 	(cd $(PY2CBF); $(NUWEB) pycbf.w )
+	touch $(PY2CBF)/py2setup_py.m4
 
 $(PY2CBF)/_py2cbf.$(PY2CBFEXT):	$(PY2CBF)  shared \
 	$(PY2CBF)/py2setup.py                    \
@@ -1780,6 +1789,7 @@ $(PY3CBF)/xmas/readmarheader.py \
 $(PY3CBF)/xmas/xmasheaders.py   \
 $(PY3CBF)/xmas/xmas_cif_template.cif: $(NUWEB_DEP) $(NUWEB_DEP2) $(PY3CBF)/pycbf.w
 	(cd $(PY3CBF); $(NUWEB) pycbf.w )
+	touch $(PY3CBF)/py3setup_py.m4
 
 
 $(PY3CBF)/_pycbf.$(PY3CBFEXT):	$(PY3CBF)  shared \
@@ -2044,7 +2054,7 @@ $(BIN)/sequence_match: $(LIB)/libcbf.a $(EXAMPLES)/sequence_match.c $(LIB)/libim
 #
 # tiff2cbf example program
 #
-$(BIN)/tiff2cbf: $(LIB)/libcbf.a $(EXAMPLES)/tiff2cbf.c \
+$(BIN)/tiff2cbf: $(LIB)/libcbf.a $(EXAMPLES)/tiff2cbf.c $(EXAMPLES)/tif_sprint.c \
 	$(GOPTLIB)	$(GOPTINC) $(TIFF)
 	mkdir -p $(BIN)
 	$(CC) $(CFLAGS) $(LDFLAGS) $(MISCFLAG) $(CBF_REGEXFLAG) $(INCLUDES) $(WARNINGS) \

diff --git a/Makefile_MINGW b/Makefile_MINGW
@@ -1336,8 +1336,10 @@ $(PY2CIFRW):	build_py2cifrw
 	$(DOWNLOAD) $(PY2CIFRWURL)
 	tar -xvf $(PY2CIFRW).tar.gz
 	-rm $(PY2CIFRW).tar.gz
-	(cd $(PY2CIFRW); PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python; export PYTHONPATH; \
+	(cd $(PY2CIFRW); \
+        PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python:$(PY2CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
 	mkdir -p $(PY2CIFRW_PREFIX)/lib/python/site-packages; \
+	mkdir -p $(PY2CIFRW_PREFIX)/lib64/python/site-packages; \
 	$(PYTHON2) setup.py install --prefix= --home=$(PY2CIFRW_PREFIX) )
 
 #
@@ -1351,8 +1353,10 @@ $(PY2PLY):	build_py2ply
 	$(DOWNLOAD) $(PY2PLYURL)
 	tar -xvf $(PY2PLY).tar.gz
 	-rm $(PY2PLY).tar.gz
-	(cd $(PY2PLY); PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python; export PYTHONPATH; \
+	(cd $(PY2PLY); \
+	PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python:$(PY2CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
 	mkdir -p $(PY2CIFRW_PREFIX)/lib/python/site-packages; \
+	mkdir -p $(PY2CIFRW_PREFIX)/lib64/python/site-packages; \
 	$(PYTHON2) setup.py install --prefix= --home=$(PY2CIFRW_PREFIX) )
 endif
 
@@ -1368,8 +1372,10 @@ $(PY3CIFRW):    build_py3cifrw
 	$(DOWNLOAD) $(PY3CIFRWURL)
 	tar -xvf $(PY3CIFRW).tar.gz
 	-rm $(PY3CIFRW).tar.gz
-	(cd $(PY3CIFRW); PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python; export PYTHONPATH; \
+	(cd $(PY3CIFRW); \
+	PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
 	mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \
+	mkdir -p $(PY3CIFRW_PREFIX)/lib64/python/site-packages; \
 	$(PYTHON3) setup.py install --prefix= --home=$(PY3CIFRW_PREFIX) )
 
 #
@@ -1383,16 +1389,18 @@ $(PY3PLY):      build_py3ply
 	$(DOWNLOAD) $(PY3PLYURL)
 	tar -xvf $(PY3PLY).tar.gz
 	-rm $(PY3PLY).tar.gz
-	(cd $(PY3PLY); PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python; export PYTHONPATH; \
+	(cd $(PY3PLY); \
+	PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
 	mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \
+	mkdir -p $(PY3CIFRW_PREFIX)/lib64/python/site-packages; \
 	$(PYTHON3) setup.py install --prefix= --home=$(PY3CIFRW_PREFIX) )
 endif
 
 
 #
 # NUWEB
 #
-ifneq ($(NUWEB_DEP),')
+ifneq ($(NUWEB_DEP),'')
 $(NUWEB_DEP):
 	-rm -rf $(NUWEB_DEP)
 	-rm -rf $(NUWEB_DEP).tar.gz
@@ -1511,7 +1519,7 @@ ifneq ($(MSYS2),yes)
 	rm lz4.o h5zlz4.o)
 else
 	git clone $(LZ4_URL)
-	(cd $(LZ4); mkdir build; cd build; cmake .. -G ''MSYS Makefiles' -DENABLE_LZ4_PLUGIN="yes"; make all; cp plugins/* $(SOLIB))
+	(cd $(LZ4); mkdir build; cd build; cmake .. -G 'MSYS Makefiles' -DENABLE_LZ4_PLUGIN="yes"; make all; cp plugins/* $(SOLIB))
 endif 
 	touch $(LZ4)
 endif
@@ -1722,6 +1730,7 @@ $(PY2CBF)/xmas/readmarheader.py \
 $(PY2CBF)/xmas/xmasheaders.py   \
 $(PY2CBF)/xmas/xmas_cif_template.cif : $(NUWEB_DEP) $(NUWEB_DEP2) $(PY2CBF)/pycbf.w
 	(cd $(PY2CBF); $(NUWEB) pycbf.w )
+	touch $(PY2CBF)/py2setup_py.m4
 
 $(PY2CBF)/_py2cbf.$(PY2CBFEXT):	$(PY2CBF)  shared \
 	$(PY2CBF)/py2setup.py                    \
@@ -1791,6 +1800,7 @@ $(PY3CBF)/xmas/readmarheader.py \
 $(PY3CBF)/xmas/xmasheaders.py   \
 $(PY3CBF)/xmas/xmas_cif_template.cif: $(NUWEB_DEP) $(NUWEB_DEP2) $(PY3CBF)/pycbf.w
 	(cd $(PY3CBF); $(NUWEB) pycbf.w )
+	touch $(PY3CBF)/py3setup_py.m4
 
 
 $(PY3CBF)/_pycbf.$(PY3CBFEXT):	$(PY3CBF)  shared \
@@ -2055,7 +2065,7 @@ $(BIN)/sequence_match: $(LIB)/libcbf.a $(EXAMPLES)/sequence_match.c $(LIB)/libim
 #
 # tiff2cbf example program
 #
-$(BIN)/tiff2cbf: $(LIB)/libcbf.a $(EXAMPLES)/tiff2cbf.c \
+$(BIN)/tiff2cbf: $(LIB)/libcbf.a $(EXAMPLES)/tiff2cbf.c $(EXAMPLES)/tif_sprint.c \
 	$(GOPTLIB)	$(GOPTINC) $(TIFF)
 	mkdir -p $(BIN)
 	$(CC) $(CFLAGS) $(LDFLAGS) $(MISCFLAG) $(CBF_REGEXFLAG) $(INCLUDES) $(WARNINGS) \

diff --git a/Makefile_MSYS2 b/Makefile_MSYS2
@@ -1324,8 +1324,10 @@ $(PY2CIFRW):	build_py2cifrw
 	$(DOWNLOAD) $(PY2CIFRWURL)
 	tar -xvf $(PY2CIFRW).tar.gz
 	-rm $(PY2CIFRW).tar.gz
-	(cd $(PY2CIFRW); PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python; export PYTHONPATH; \
+	(cd $(PY2CIFRW); \
+        PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python:$(PY2CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
 	mkdir -p $(PY2CIFRW_PREFIX)/lib/python/site-packages; \
+	mkdir -p $(PY2CIFRW_PREFIX)/lib64/python/site-packages; \
 	$(PYTHON2) setup.py install --prefix= --home=$(PY2CIFRW_PREFIX) )
 
 #
@@ -1339,8 +1341,10 @@ $(PY2PLY):	build_py2ply
 	$(DOWNLOAD) $(PY2PLYURL)
 	tar -xvf $(PY2PLY).tar.gz
 	-rm $(PY2PLY).tar.gz
-	(cd $(PY2PLY); PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python; export PYTHONPATH; \
+	(cd $(PY2PLY); \
+	PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python:$(PY2CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
 	mkdir -p $(PY2CIFRW_PREFIX)/lib/python/site-packages; \
+	mkdir -p $(PY2CIFRW_PREFIX)/lib64/python/site-packages; \
 	$(PYTHON2) setup.py install --prefix= --home=$(PY2CIFRW_PREFIX) )
 endif
 
@@ -1356,8 +1360,10 @@ $(PY3CIFRW):    build_py3cifrw
 	$(DOWNLOAD) $(PY3CIFRWURL)
 	tar -xvf $(PY3CIFRW).tar.gz
 	-rm $(PY3CIFRW).tar.gz
-	(cd $(PY3CIFRW); PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python; export PYTHONPATH; \
+	(cd $(PY3CIFRW); \
+	PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
 	mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \
+	mkdir -p $(PY3CIFRW_PREFIX)/lib64/python/site-packages; \
 	$(PYTHON3) setup.py install --prefix= --home=$(PY3CIFRW_PREFIX) )
 
 #
@@ -1371,16 +1377,18 @@ $(PY3PLY):      build_py3ply
 	$(DOWNLOAD) $(PY3PLYURL)
 	tar -xvf $(PY3PLY).tar.gz
 	-rm $(PY3PLY).tar.gz
-	(cd $(PY3PLY); PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python; export PYTHONPATH; \
+	(cd $(PY3PLY); \
+	PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
 	mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \
+	mkdir -p $(PY3CIFRW_PREFIX)/lib64/python/site-packages; \
 	$(PYTHON3) setup.py install --prefix= --home=$(PY3CIFRW_PREFIX) )
 endif
 
 
 #
 # NUWEB
 #
-ifneq ($(NUWEB_DEP),')
+ifneq ($(NUWEB_DEP),'')
 $(NUWEB_DEP):
 	-rm -rf $(NUWEB_DEP)
 	-rm -rf $(NUWEB_DEP).tar.gz
@@ -1499,7 +1507,7 @@ ifneq ($(MSYS2),yes)
 	rm lz4.o h5zlz4.o)
 else
 	git clone $(LZ4_URL)
-	(cd $(LZ4); mkdir build; cd build; cmake .. -G ''MSYS Makefiles' -DENABLE_LZ4_PLUGIN="yes"; make all; cp plugins/* $(SOLIB))
+	(cd $(LZ4); mkdir build; cd build; cmake .. -G 'MSYS Makefiles' -DENABLE_LZ4_PLUGIN="yes"; make all; cp plugins/* $(SOLIB))
 endif 
 	touch $(LZ4)
 endif
@@ -1710,6 +1718,7 @@ $(PY2CBF)/xmas/readmarheader.py \
 $(PY2CBF)/xmas/xmasheaders.py   \
 $(PY2CBF)/xmas/xmas_cif_template.cif : $(NUWEB_DEP) $(NUWEB_DEP2) $(PY2CBF)/pycbf.w
 	(cd $(PY2CBF); $(NUWEB) pycbf.w )
+	touch $(PY2CBF)/py2setup_py.m4
 
 $(PY2CBF)/_py2cbf.$(PY2CBFEXT):	$(PY2CBF)  shared \
 	$(PY2CBF)/py2setup.py                    \
@@ -1779,6 +1788,7 @@ $(PY3CBF)/xmas/readmarheader.py \
 $(PY3CBF)/xmas/xmasheaders.py   \
 $(PY3CBF)/xmas/xmas_cif_template.cif: $(NUWEB_DEP) $(NUWEB_DEP2) $(PY3CBF)/pycbf.w
 	(cd $(PY3CBF); $(NUWEB) pycbf.w )
+	touch $(PY3CBF)/py3setup_py.m4
 
 
 $(PY3CBF)/_pycbf.$(PY3CBFEXT):	$(PY3CBF)  shared \
@@ -2043,7 +2053,7 @@ $(BIN)/sequence_match: $(LIB)/libcbf.a $(EXAMPLES)/sequence_match.c $(LIB)/libim
 #
 # tiff2cbf example program
 #
-$(BIN)/tiff2cbf: $(LIB)/libcbf.a $(EXAMPLES)/tiff2cbf.c \
+$(BIN)/tiff2cbf: $(LIB)/libcbf.a $(EXAMPLES)/tiff2cbf.c $(EXAMPLES)/tif_sprint.c \
 	$(GOPTLIB)	$(GOPTINC) $(TIFF)
 	mkdir -p $(BIN)
 	$(CC) $(CFLAGS) $(LDFLAGS) $(MISCFLAG) $(CBF_REGEXFLAG) $(INCLUDES) $(WARNINGS) \