Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
BUG: Fix Makefile dependencies broken by cellprofiler rules refactor
  • Loading branch information
pan14001 committed Mar 27, 2017
1 parent e6aaa19 commit 9aac973
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Makefile
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9aac973

Please sign in to comment.