3261: simplify Makefile

diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 240e820d0c8bf73035b584977ca2e5df9e999e2b..09c09cc1e60e7b9395eeac4c4c64b5a177861c60 100644 (file)
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -52,8 +52,6 @@ deepclean: clean
 
 CONFIG_RB = build_tools/config.rb
 
-LIST_GENERATED_FILES = build_tools/list_generated_files
-
 BUILD = build/.buildstamp
 
 BASE_DEPS = base/Dockerfile config.yml $(BASE_GENERATED)
@@ -84,26 +82,26 @@ BCBIO_NEXTGEN_DEPS = bcbio-nextgen/Dockerfile
 
 BASE_GENERATED = base/generated/arvados.tar.gz
 
-COMPUTE_GENERATED_IN   = $(shell ls compute/*.in)
-COMPUTE_GENERATED      = $(shell $(LIST_GENERATED_FILES) $(COMPUTE_GENERATED_IN))
+COMPUTE_GENERATED_IN   = compute/*.in
+COMPUTE_GENERATED      = compute/generated/*
 
-KEEP_GENERATED_IN      = $(shell ls keep/*.in)
-KEEP_GENERATED         = $(shell $(LIST_GENERATED_FILES) $(KEEP_GENERATED_IN))
+KEEP_GENERATED_IN      = keep/*.in
+KEEP_GENERATED         = keep/generated/*
 
-API_GENERATED_IN       = $(shell ls api/*.in)
-API_GENERATED          = $(shell $(LIST_GENERATED_FILES) $(API_GENERATED_IN))
+API_GENERATED_IN       = api/*.in
+API_GENERATED          = api/generated/*
 
-SHELL_GENERATED_IN     = $(shell ls shell/*.in)
-SHELL_GENERATED        = $(shell $(LIST_GENERATED_FILES) $(SHELL_GENERATED_IN))
+SHELL_GENERATED_IN     = shell/*.in
+SHELL_GENERATED        = shell/generated/*
 
-SLURM_GENERATED_IN     = $(shell ls slurm/*.in)
-SLURM_GENERATED        = $(shell $(LIST_GENERATED_FILES) $(SLURM_GENERATED_IN))
+SLURM_GENERATED_IN     = slurm/*.in
+SLURM_GENERATED        = slurm/generated/*
 
-WORKBENCH_GENERATED_IN = $(shell ls workbench/*.in)
-WORKBENCH_GENERATED    = $(shell $(LIST_GENERATED_FILES) $(WORKBENCH_GENERATED_IN))
+WORKBENCH_GENERATED_IN = workbench/*.in
+WORKBENCH_GENERATED    = workbench/generated/*
 
-SSO_GENERATED_IN       = $(shell ls sso/*.in)
-SSO_GENERATED          = $(shell $(LIST_GENERATED_FILES) $(SSO_GENERATED_IN))
+SSO_GENERATED_IN       = sso/*.in
+SSO_GENERATED          = sso/generated/*
 
 $(BUILD):
        mkdir -p build

diff --git a/docker/build_tools/list_generated_files b/docker/build_tools/list_generated_files
deleted file mode 100755 (executable)
index 170ee53..0000000
--- a/docker/build_tools/list_generated_files
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /usr/bin/env ruby
-
-# list_generated_files file1 file2...
-#
-# Prints a list of the "generated" files that correspond to the files
-# listed on the command line.
-#
-# e.g.:
-# list_generated_files keep/config.rb.in api/application.yml.in
-# -> keep/generated/config.rb api/generated/application.yml
-
-print ARGV.collect { |f|
-  File.join(File.dirname(f), "generated", File.basename(f, ".in"))
-}.join(" "), "\n"