Fixed minor link and install issues.

cooperative-computing-lab · Dec 4, 2014 · ed527f6 · ed527f6
1 parent e177cda
commit ed527f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/makeflow/src/Makefile b/makeflow/src/Makefile
@@ -13,7 +13,9 @@ TARGETS = $(PROGRAMS)
 
 all: $(TARGETS)
 
-$(PROGRAMS): $(OBJECTS) $(EXTERNAL_DEPENDENCIES)
+makeflow makeflow_viz makeflow_analyze: $(OBJECTS) $(EXTERNAL_DEPENDENCIES)
+
+makeflow_linker: makeflow_linker.o $(EXTERNAL_DEPENDENCIES)
 
 lexer_test: dag.o visitors.o makeflow_common.o lexer_test.o $(EXTERNAL_DEPENDENCIES)
 

diff --git a/resource_monitor/src/Makefile b/resource_monitor/src/Makefile
@@ -60,7 +60,7 @@ install: all
 	cp $(SCRIPTS) $(CCTOOLS_INSTALL_DIR)/bin/
 	mkdir -p $(CCTOOLS_INSTALL_DIR)/lib
 	cp $(LIBRARIES) $(CCTOOLS_INSTALL_DIR)/lib/
-	cp resource_monitor_visualizer_static $(CCTOOLS_INSTALL_DIR)/lib
+	cp -r resource_monitor_visualizer_static $(CCTOOLS_INSTALL_DIR)/lib
 
 test: all