From 9aac97319dbfad7572b6b343ef1d78638bba251a Mon Sep 17 00:00:00 2001 From: Pariksheet Nanda Date: Mon, 27 Mar 2017 07:33:38 -0400 Subject: [PATCH] BUG: Fix Makefile dependencies broken by cellprofiler rules refactor --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9273431..948d698 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,8 @@ SOURCES_cellprofiler_common := $(SOURCES_cellprofiler_filelist) \ $(SOURCES_cellprofiler_img) SOURCES_cellprofiler_gui := $(SOURCES_cellprofiler_common) \ $(SOURCES_cellprofiler_pipe) -SOURCES_cellprofiler_batch := $(SOURCES_cellprofiler_common) +SOURCES_cellprofiler_batch := $(SOURCES_cellprofiler_common) \ + $(SOURCES_cellprofiler_pipe) TARGETS_cellprofiler_batch := results/cellprofiler/Batch_data.h5 SOURCES_cellprofiler_commands := $(TARGETS_cellprofiler_batch) TARGETS_cellprofiler_commands := results/cellprofiler/batch_commands.sh @@ -103,11 +104,11 @@ $(call singleton,$(TARGETS_cellprofiler)) : $(SOURCES_cellprofiler_headless) $(TARGETS_cellprofiler_commands) : $(SOURCES_cellprofiler_commands) $(TIME) $(CELLPROFILER) $(CELLPROFILER_OPTS_HEADLESS) --get-batch-commands=$< | sed 's#^CellProfiler#$(CELLPROFILER)#' | sort -nk 8 > $@ -$(TARGETS_cellprofiler_batch) : $(SOURCES_cellprofiler) +$(TARGETS_cellprofiler_batch) : $(SOURCES_cellprofiler_batch) $(TIME) $(CELLPROFILER) $(CELLPROFILER_OPTS_BATCH) .PHONY : gui-cp -gui-cp : $(SOURCES_cellprofiler) ## Interactively run CellProfiler. +gui-cp : $(SOURCES_cellprofiler_gui) ## Interactively run CellProfiler. $(CELLPROFILER) $(CELLPROFILER_OPTS_GUI) .PHONY : gui-cpa