diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/sfac/water-275K.dat | 38 |
5 files changed, 5 insertions, 42 deletions
diff --git a/Makefile.am b/Makefile.am index fa4f874b..541b02b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,4 +10,4 @@ EXTRA_DIST = configure src/cell.h src/hdf5-file.h src/image.h \ data/sfac/Ca.nff data/sfac/C.nff data/sfac/Fe.nff data/sfac/H.nff \ data/sfac/Mg.nff data/sfac/N.nff data/sfac/O.nff data/sfac/P.nff \ data/sfac/S.nff data/sfac/f0_WaasKirf.dat -SUBDIRS = src data +SUBDIRS = src data doc diff --git a/Makefile.in b/Makefile.in index 2289e7c7..2bc98a35 100644 --- a/Makefile.in +++ b/Makefile.in @@ -208,7 +208,7 @@ EXTRA_DIST = configure src/cell.h src/hdf5-file.h src/image.h \ data/sfac/Mg.nff data/sfac/N.nff data/sfac/O.nff data/sfac/P.nff \ data/sfac/S.nff data/sfac/f0_WaasKirf.dat -SUBDIRS = src data +SUBDIRS = src data doc all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -5819,7 +5819,7 @@ CFLAGS="$CFLAGS $LIBTIFF_CFLAGS -D_GNU_SOURCE" LIBS="$LIBS $HDF5_LIBS -lm -lz $GSL_LIBS $GTK_LIBS $OPENCL_LIBS -pthread" LIBS="$LIBS $LIBTIFF_LIBS" -ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile doc/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -6467,6 +6467,7 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} diff --git a/configure.ac b/configure.ac index 038ea7f8..a9daf78f 100644 --- a/configure.ac +++ b/configure.ac @@ -156,4 +156,4 @@ CFLAGS="$CFLAGS $LIBTIFF_CFLAGS -D_GNU_SOURCE" LIBS="$LIBS $HDF5_LIBS -lm -lz $GSL_LIBS $GTK_LIBS $OPENCL_LIBS -pthread" LIBS="$LIBS $LIBTIFF_LIBS" -AC_OUTPUT(Makefile src/Makefile data/Makefile) +AC_OUTPUT(Makefile src/Makefile data/Makefile doc/Makefile) diff --git a/data/sfac/water-275K.dat b/data/sfac/water-275K.dat deleted file mode 100644 index 64e646c8..00000000 --- a/data/sfac/water-275K.dat +++ /dev/null @@ -1,38 +0,0 @@ -0.00 0.00 0.00 -0.25 0.00 0.00 -0.50 0.00 0.00 -0.75 0.00 0.00 -1.00 0.00 0.00 -1.25 0.00 0.00 -1.50 0.00 0.00 -1.75 0.00 1.50 -2.00 0.00 0.80 -2.25 0.00 0.22 -2.50 0.15 0.17 -2.75 3.30 0.45 -3.00 1.10 1.30 -3.25 0.71 1.55 -3.50 0.75 1.25 -3.75 0.88 1.05 -4.00 1.02 1.02 -4.25 1.15 1.01 -4.50 1.20 0.99 -4.75 1.11 1.00 -5.00 1.00 1.00 -5.25 0.91 1.00 -5.50 0.84 0.99 -5.75 0.85 0.97 -6.00 0.93 0.95 -6.25 1.00 0.97 -6.50 1.07 0.99 -6.75 1.08 1.00 -7.00 1.06 1.04 -7.25 1.04 1.05 -7.50 1.00 1.03 -7.75 1.00 1.01 -8.00 1.00 1.00 -8.25 1.00 1.00 -8.50 1.00 1.00 -8.75 1.00 1.00 -9.00 1.00 1.00 -9.25 1.00 1.00 |