diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 14 | ||||
| -rw-r--r-- | src/itrans-stat.c (renamed from src/peakdetect.c) | 2 | ||||
| -rw-r--r-- | src/itrans-stat.h (renamed from src/peakdetect.h) | 0 | ||||
| -rw-r--r-- | src/itrans.c | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 6c3bfe5..c90b55e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ EXTRA_DIST = configure src/displaywindow.h src/trackball.h src/reflections.h src/control.h src/readpng.h src/mrc.h src/imagedisplay.h src/main.h \ data/displaywindow.ui src/peakdetect.h src/utils.h src/itrans.h src/qdrp.h src/ipr.h src/cache.h src/structure.h src/itrans-threshold.h \ - src/itrans-zaefferer.h src/itrans-lsq.h + src/itrans-zaefferer.h src/itrans-lsq.h src/itrans-stat.h SUBDIRS = src data diff --git a/Makefile.in b/Makefile.in index b8f3d6c..7347fa6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -155,7 +155,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ EXTRA_DIST = configure src/displaywindow.h src/trackball.h src/reflections.h src/control.h src/readpng.h src/mrc.h src/imagedisplay.h src/main.h \ data/displaywindow.ui src/peakdetect.h src/utils.h src/itrans.h src/qdrp.h src/ipr.h src/cache.h src/structure.h src/itrans-threshold.h \ - src/itrans-zaefferer.h src/itrans-lsq.h + src/itrans-zaefferer.h src/itrans-lsq.h src/itrans-stat.h SUBDIRS = src data all: config.h diff --git a/src/Makefile.am b/src/Makefile.am index dc66bc1..c7174e4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = dtr -dtr_SOURCES = main.c displaywindow.c trackball.c reflections.c readpng.c mrc.c imagedisplay.c utils.c itrans.c qdrp.c ipr.c peakdetect.c cache.c \ - structure.c itrans-threshold.c itrans-zaefferer.c itrans-lsq.c +dtr_SOURCES = main.c displaywindow.c trackball.c reflections.c readpng.c mrc.c imagedisplay.c utils.c itrans.c qdrp.c ipr.c cache.c \ + structure.c itrans-threshold.c itrans-zaefferer.c itrans-lsq.c itrans-stat.c dtr_LDADD = @LIBS@ @GTK_LIBS@ -lm @GTKGLEXT_LIBS@ -lgsl -lgslcblas AM_CFLAGS = -Wall -g @CFLAGS@ @GTK_CFLAGS@ @GTKGLEXT_CFLAGS@ AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" diff --git a/src/Makefile.in b/src/Makefile.in index a3cd9a9..d2c3512 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -50,10 +50,10 @@ PROGRAMS = $(bin_PROGRAMS) am_dtr_OBJECTS = main.$(OBJEXT) displaywindow.$(OBJEXT) \ trackball.$(OBJEXT) reflections.$(OBJEXT) readpng.$(OBJEXT) \ mrc.$(OBJEXT) imagedisplay.$(OBJEXT) utils.$(OBJEXT) \ - itrans.$(OBJEXT) qdrp.$(OBJEXT) ipr.$(OBJEXT) \ - peakdetect.$(OBJEXT) cache.$(OBJEXT) structure.$(OBJEXT) \ - itrans-threshold.$(OBJEXT) itrans-zaefferer.$(OBJEXT) \ - itrans-lsq.$(OBJEXT) + itrans.$(OBJEXT) qdrp.$(OBJEXT) ipr.$(OBJEXT) cache.$(OBJEXT) \ + structure.$(OBJEXT) itrans-threshold.$(OBJEXT) \ + itrans-zaefferer.$(OBJEXT) itrans-lsq.$(OBJEXT) \ + itrans-stat.$(OBJEXT) dtr_OBJECTS = $(am_dtr_OBJECTS) dtr_DEPENDENCIES = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -152,8 +152,8 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -dtr_SOURCES = main.c displaywindow.c trackball.c reflections.c readpng.c mrc.c imagedisplay.c utils.c itrans.c qdrp.c ipr.c peakdetect.c cache.c \ - structure.c itrans-threshold.c itrans-zaefferer.c itrans-lsq.c +dtr_SOURCES = main.c displaywindow.c trackball.c reflections.c readpng.c mrc.c imagedisplay.c utils.c itrans.c qdrp.c ipr.c cache.c \ + structure.c itrans-threshold.c itrans-zaefferer.c itrans-lsq.c itrans-stat.c dtr_LDADD = @LIBS@ @GTK_LIBS@ -lm @GTKGLEXT_LIBS@ -lgsl -lgslcblas AM_CFLAGS = -Wall -g @CFLAGS@ @GTK_CFLAGS@ @GTKGLEXT_CFLAGS@ @@ -229,12 +229,12 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagedisplay.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itrans-lsq.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itrans-stat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itrans-threshold.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itrans-zaefferer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itrans.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mrc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peakdetect.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qdrp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpng.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reflections.Po@am__quote@ diff --git a/src/peakdetect.c b/src/itrans-stat.c index 94c0c05..98988bf 100644 --- a/src/peakdetect.c +++ b/src/itrans-stat.c @@ -13,7 +13,7 @@ #include "control.h" #include "imagedisplay.h" #include "utils.h" -#include "peakdetect.h" +#include "itrans-stat.h" /* * Renormalise a gsl_matrix to 0->1 diff --git a/src/peakdetect.h b/src/itrans-stat.h index a7e0529..a7e0529 100644 --- a/src/peakdetect.h +++ b/src/itrans-stat.h diff --git a/src/itrans.c b/src/itrans.c index 1332bb8..cc5941b 100644 --- a/src/itrans.c +++ b/src/itrans.c @@ -23,7 +23,7 @@ #include "itrans-threshold.h" #include "itrans-zaefferer.h" #include "itrans-lsq.h" -#include "peakdetect.h" +#include "itrans-stat.h" static unsigned int itrans_peaksearch_iterative(int16_t *image, ControlContext *ctx, double tilt_degrees, ImageDisplay *imagedisplay) { |