diff options
| author | Thomas White <taw@physics.org> | 2010-09-07 11:39:38 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:26:57 +0100 |
| commit | c1966ec729b9afe609d6458c8ccc7d92a60bfb90 (patch) | |
| tree | ae8f70a7f10e3ecbbd8570e2dd04012fdfb8826a | |
| parent | 718543b4ecf6ba5aad7e4a0ce064c1055cafcc5d (diff) | |
Fix data and header targets
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | Makefile.in | 7 | ||||
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rw-r--r-- | data/Makefile.in | 5 |
4 files changed, 17 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 35c962e3..fa4f874b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,9 @@ EXTRA_DIST = configure src/cell.h src/hdf5-file.h src/image.h \ data/displaywindow.ui src/dirax.h src/peaks.h src/index.h \ src/filters.h src/diffraction-gpu.h src/cl-utils.h \ data/defs.h src/parameters-lcls.tmp \ - data/diffraction.cl data/sfac src/likelihood.h src/symmetry.h \ - src/povray.h src/index-priv.h src/geometry.h + data/diffraction.cl src/likelihood.h src/symmetry.h \ + src/povray.h src/index-priv.h src/geometry.h src/templates.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 diff --git a/Makefile.in b/Makefile.in index 84406a2f..2289e7c7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -202,8 +202,11 @@ EXTRA_DIST = configure src/cell.h src/hdf5-file.h src/image.h \ data/displaywindow.ui src/dirax.h src/peaks.h src/index.h \ src/filters.h src/diffraction-gpu.h src/cl-utils.h \ data/defs.h src/parameters-lcls.tmp \ - data/diffraction.cl data/sfac src/likelihood.h src/symmetry.h \ - src/povray.h src/index-priv.h src/geometry.h + data/diffraction.cl src/likelihood.h src/symmetry.h \ + src/povray.h src/index-priv.h src/geometry.h src/templates.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 all: config.h diff --git a/data/Makefile.am b/data/Makefile.am index afecb737..5a618b9e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,4 +2,6 @@ hdfseedir = $(datadir)/hdfsee hdfsee_DATA = displaywindow.ui crystfeldir = $(datadir)/crystfel -crystfel_DATA = sfac/* diffraction.cl defs.h +crystfel_DATA = diffraction.cl defs.h sfac/Ca.nff sfac/C.nff sfac/Fe.nff \ + sfac/H.nff sfac/Mg.nff sfac/N.nff sfac/O.nff sfac/P.nff \ + sfac/S.nff sfac/f0_WaasKirf.dat diff --git a/data/Makefile.in b/data/Makefile.in index 4cda8854..58641991 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -167,7 +167,10 @@ top_srcdir = @top_srcdir@ hdfseedir = $(datadir)/hdfsee hdfsee_DATA = displaywindow.ui crystfeldir = $(datadir)/crystfel -crystfel_DATA = sfac/* diffraction.cl defs.h +crystfel_DATA = diffraction.cl defs.h sfac/Ca.nff sfac/C.nff sfac/Fe.nff \ + sfac/H.nff sfac/Mg.nff sfac/N.nff sfac/O.nff sfac/P.nff \ + sfac/S.nff sfac/f0_WaasKirf.dat + all: all-am .SUFFIXES: |