From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= Date: Thu, 16 Apr 2020 13:05:40 +0200 Subject: trailing spaces --- Makefile | 66 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/Makefile b/Makefile index caa5fc5..ec0b388 100644 --- a/Makefile +++ b/Makefile @@ -591,7 +591,7 @@ CFLAGS = -g -O3 -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing LDFLAGS = F90C = gfortran F90FLAGS = -g -fno-range-check -F90LDFLAGS = +F90LDFLAGS = SOCFLAGS = -fPIC SOLDFLAGS = -shared -Wl,-rpath,$(CBF_PREFIX)/lib JAVAINCLUDES = -I$(JDKDIR)/include -I$(JDKDIR)/include/linux @@ -751,8 +751,8 @@ F90SOURCE = $(SRC)/fcb_atol_wcnt.f90 \ $(SRC)/fcb_read_line.f90 \ $(SRC)/fcb_read_xds_i2.f90 \ $(SRC)/fcb_skip_whitespace.f90 - - + + # # Header files # @@ -854,7 +854,7 @@ default: @echo ' ' @echo ' The current value :' @echo ' ' - @echo ' $(CBF_PREFIX) ' + @echo ' $(CBF_PREFIX) ' @echo ' ' @echo ' To compile the CBF library and example programs type:' @echo ' ' @@ -877,16 +877,16 @@ default: @echo ' ' @echo ' make javatests' @echo ' ' - @echo ' The tests assume that several data files are in the directories' + @echo ' The tests assume that several data files are in the directories' @echo ' $(DATADIRI) and $(DATADIRO)' @echo ' ' - @echo ' Alternatively tests can be run comparing MD5 signatures only by' + @echo ' Alternatively tests can be run comparing MD5 signatures only by' @echo ' ' @echo ' make tests_sigs_only' @echo ' ' @echo ' These signature only tests save space and download time by' @echo ' assuming that input data files and the output signatures' - @echo ' are in the directories' + @echo ' are in the directories' @echo ' $(DATADIRI) and $(DATADIRS)' @echo ' ' @echo ' These directory can be obtained from' @@ -1013,7 +1013,7 @@ Makefile_LINUX_64: $(M4)/Makefile.m4 Makefile_LINUX_gcc42: $(M4)/Makefile.m4 -cp Makefile_LINUX_gcc42 Makefile_LINUX_gcc42_old - m4 -P $(PYCIFRWDEF) -Dcbf_system=LINUX_gcc42 $(M4)/Makefile.m4 > Makefile_LINUX_gcc42.tmp + m4 -P $(PYCIFRWDEF) -Dcbf_system=LINUX_gcc42 $(M4)/Makefile.m4 > Makefile_LINUX_gcc42.tmp mv Makefile_LINUX_gcc42.tmp Makefile_LINUX_gcc42 Makefile_LINUX_gcc42_DMALLOC: $(M4)/Makefile.m4 @@ -1056,11 +1056,11 @@ Makefile_IRIX_gcc: $(M4)/Makefile.m4 m4 -P $(PYCIFRWDEF) -Dcbf_system=IRIX_gcc $(M4)/Makefile.m4 > Makefile_IRIX_gcc.tmp mv Makefile_IRIX_gcc.tmp Makefile_IRIX_gcc - + Makefile: $(M4)/Makefile.m4 -cp Makefile Makefile_old m4 -P $(PYCIFRWDEF) -Dcbf_system=default $(M4)/Makefile.m4 > Makefile.tmp - mv Makefile.tmp Makefile + mv Makefile.tmp Makefile cbflib.ini: $(M4)/Makefile.m4 echo "$(LDPREFIX)" > cbflib.ini @@ -1257,7 +1257,7 @@ $(PLY): build_ply $(DOWNLOAD) $(PLYURL) tar -xvf $(PLY).tar.gz -rm $(PLY).tar.gz - (cd $(PLY); $(PYTHON) setup.py install --user ) + (cd $(PLY); $(PYTHON) setup.py install --user ) endif # @@ -1331,7 +1331,7 @@ ifneq ($(CBFLIB_DONT_USE_LZ4),yes) # # LZ4 # -build_lz4: $(M4)/Makefile.m4 +build_lz4: $(M4)/Makefile.m4 touch build_lz4 $(LZ4): $(HDF5) build_lz4 mkdir -p $(SOLIB) @@ -1344,7 +1344,7 @@ $(LZ4): $(HDF5) build_lz4 $(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(LZ4src)/lz4.c -o lz4.o; \ $(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(LZ4src)/h5zlz4.c -o h5zlz4.o; \ $(CC) -shared lz4.o h5zlz4.o -o $(SOLIB)/libh5zlz4.so; \ - rm lz4.o h5zlz4.o) + rm lz4.o h5zlz4.o) touch $(LZ4) endif @@ -1353,7 +1353,7 @@ ifneq ($(CBFLIB_DONT_USE_BSHUF),yes) # # BSHUF # -build_BSHUF: $(M4)/Makefile.m4 +build_BSHUF: $(M4)/Makefile.m4 touch build_BSHUF $(BSHUF): $(HDF5) build_BSHUF $(LZ4dep) mkdir -p $(SOLIB) @@ -1398,7 +1398,7 @@ $(CBF_PREFIX)/bin: $(CBF_PREFIX) $(CBF_PREFIX)/include: $(CBF_PREFIX) mkdir -p $(CBF_PREFIX)/include - + $(CBF_PREFIX)/include/cbflib: $(CBF_PREFIX)/include mkdir -p $(CBF_PREFIX)/include/cbflib @@ -1488,7 +1488,7 @@ ifneq ($(RANLIB),) $(RANLIB) $@ endif rm img.o - + $(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) -rm -f $@ mkdir -p $(SOLIB) @@ -1541,7 +1541,7 @@ $(PYCBF)/_pycbf.$(PYCBFEXT): $(PYCBF) shared \ $(PYCBF)/cbfgenericwrappers.i \ $(PYCBF)/cbfgoniometerwrappers.i -cp $(SOLIB)/*.so $(LIB) - (cd $(PYCBF); $(PYTHON) $(SETUP_PY) build $(PYCBFBOPT); cp build/lib*/_pycbf.$(PYCBFEXT) .) + (cd $(PYCBF); $(PYTHON) $(SETUP_PY) build $(PYCBFBOPT); cp build/lib*/_pycbf.$(PYCBFEXT) .) $(PYCBF)/pycbfinstall: (cd $(PYCBF); $(PYTHON) $(INSTALLSETUP_PY) install $(PYCBFIOPT) --prefix=$(CBF_PREFIX)) @@ -1562,7 +1562,7 @@ $(PYCBF)/setup_MINGW.py: m4/setup_py.m4 $(LIB)/_pycbf.$(PYCBFEXT): $(PYCBF)/_pycbf.$(PYCBFEXT) mkdir -p $(LIB) cp $(PYCBF)/_pycbf.$(PYCBFEXT) $(LIB)/_pycbf.$(PYCBFEXT) - + $(PYCBF)/pycbf.pdf: $(PYCBF)/pycbf.w (cd $(PYCBF); \ $(NUWEB) pycbf; \ @@ -1570,7 +1570,7 @@ $(PYCBF)/pycbf.pdf: $(PYCBF)/pycbf.w $(NUWEB) pycbf; \ latex pycbf; \ dvipdfm pycbf ) - + $(PYCBF)/CBFlib.txt: $(DOC)/CBFlib.html links -dump $(DOC)/CBFlib.html > $(PYCBF)/CBFlib.txt @@ -1706,7 +1706,7 @@ $(BIN)/cif2cbf: $(LIB)/libcbf.a $(EXAMPLES)/cif2cbf.c $(LIB)/libimg.a \ # cbf2nexus example program # $(BIN)/cbf2nexus: $(LIB)/libcbf.a $(EXAMPLES)/cbf2nexus.c \ - $(GOPTLIB) $(GOPTINC) + $(GOPTLIB) $(GOPTINC) mkdir -p $(BIN) $(CC) $(CFLAGS) $(LDFLAGS) $(MISCFLAG) $(CBF_REGEXFLAG) $(INCLUDES) $(WARNINGS) \ $(EXAMPLES)/cbf2nexus.c $(GOPTLIB) -L$(LIB) \ @@ -1716,12 +1716,12 @@ $(BIN)/cbf2nexus: $(LIB)/libcbf.a $(EXAMPLES)/cbf2nexus.c \ # minicbf2nexus example program # $(BIN)/minicbf2nexus: $(LIB)/libcbf.a $(EXAMPLES)/minicbf2nexus.c $(LIB)/libimg.a \ - $(GOPTLIB) $(GOPTINC) + $(GOPTLIB) $(GOPTINC) mkdir -p $(BIN) $(CC) $(CFLAGS) $(LDFLAGS) $(MISCFLAG) $(CBF_REGEXFLAG) $(INCLUDES) $(WARNINGS) \ $(EXAMPLES)/minicbf2nexus.c $(GOPTLIB) -L$(LIB) \ -lcbf $(REGEX_LIBS_STATIC) $(HDF5LIBS_LOCAL) $(EXTRALIBS) $(HDF5LIBS_SYSTEM) -limg -o $@ - + # # nexus2cbf example program # @@ -1869,7 +1869,7 @@ $(BIN)/ctestcbf: $(EXAMPLES)/testcbf.c $(LIB)/libcbf.a $(BIN)/testcbf.class: $(EXAMPLES)/testcbf.java $(JCBF)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so mkdir -p $(BIN) $(JAVAC) -cp $(JCBF)/cbflib-$(VERSION).jar -d $(BIN) $(EXAMPLES)/testcbf.java - + ifneq ($(CBF_USE_ULP),) # # testulp test program @@ -1896,7 +1896,7 @@ $(BIN)/testalloc: $(LIB)/libcbf.a $(EXAMPLES)/testalloc.c $(EXAMPLES)/unittest.h mkdir -p $(BIN) $(CC) $(CFLAGS) $(LDFLAGS) $(MISCFLAG) $(CBF_REGEXFLAG) $(INCLUDES) $(WARNINGS) $(EXAMPLES)/testalloc.c -L$(LIB) $(LIB)/libcbf.a $(EXTRALIBS) -o $@.tmp mv $@.tmp $@ - + # # test_cbf_airy_disk test program # @@ -1936,7 +1936,7 @@ $(DATADIRS): $(M4)/Makefile.m4 -(cd ..; rm CBFlib_$(VERSION)_Data_Files_Output_Sigs_Only.tar.gz) -# Input Data Files +# Input Data Files TESTINPUT_BASIC = example.mar2300 DATADIRI_INPUT_BASIC = $(DATADIRI)/example.mar2300 @@ -2038,7 +2038,7 @@ DATADIRO_OUTPUT_SIGNATURES = $(DATADIRO)/adscconverted_flat_orig.cbf$(SEXT) \ $(DATADIRO)/minicbf_orig.h5$(SEXT) - + # Output Data File Signatures TESTOUTPUTSIGS = adscconverted_flat_orig.cbf$(SEXT) \ @@ -2070,7 +2070,7 @@ DATADIRS_OUTPUT_SIGNATURES = $(DATADIRS)/adscconverted_flat_orig.cbf$(SEXT) \ $(DATADIRS)/XRD1621_I4encbC100_orig.cbf$(SEXT) \ $(DATADIRS)/minicbf_orig.h5$(SEXT) -# Fetch Input Data Files +# Fetch Input Data Files $(TESTINPUT_BASIC): $(DATADIRI) $(DATADIRI_INPUT_BASIC) cp $(DATADIRI)/$@ $@ @@ -2156,7 +2156,7 @@ restore_sigs_only: $(NEWTESTOUTPUT) $(DATADIRS) $(SIGNATURE) < XRD1621_I4encbC100.cbf > $(DATADIRS)/XRD1621_I4encbC100_orig.cbf$(SEXT) $(SIGNATURE) < $(MINICBF_TEST)/minicbf.h5 > $(DATADIRS)/minicbf_orig.h5$(SEXT) restore_signatures: restore_output restore_sigs_only - + # # Basic Tests # @@ -2433,7 +2433,7 @@ endif cif2cbf_encp.cbf img2cif_canonical.cif img2cif_packed.cif 9ins.cbf - + pycbftests: $(PYCBF)/_pycbf.$(PYCBFEXT) $(BIN)/cbf_standardize_numbers ($(RTLPEXPORTS) cd $(PYCBF); $(PYTHON) pycbf_test1.py) ($(RTLPEXPORTS) cd $(PYCBF); $(PYTHON) pycbf_test2.py) @@ -2546,7 +2546,7 @@ empty: @-rm -f $(TESTOUTPUT) *$(SEXT) @-rm -rf $(SOLIB) @-rm -rf $(JCBF) - @-rm -f $(SRC)/cbf_wrap.c + @-rm -f $(SRC)/cbf_wrap.c @-rm -rf $(REGEX) @-rm -rf $(REGEX)_install @-rm -rf $(TIFF) @@ -2569,12 +2569,12 @@ empty: @-rm -f testfile.h5 @-rm -f hit-20140306005258847.cbf ./.undosymlinks - + # # Remove temporary files # -clean: - @-rm -f core +clean: + @-rm -f core @-rm -f *.o @-rm -f *.u #