KAZOO-4362: replace lots of finds with just globbing

regner · Jan 26, 2016 · 4cd17fa · 4cd17fa
1 parent 8b3e47f
commit 4cd17fa
Show file tree

Hide file tree

Showing 38 changed files with 80 additions and 80 deletions.
diff --git a/applications/acdc/Makefile b/applications/acdc/Makefile
@@ -1,8 +1,8 @@
 ROOT = ../..
 PROJECT = acdc
 
-EBINS = $(shell find $(ROOT)/core/whistle_apps-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/whistle_couch-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/whistle_apps-*/ebin) \
+	$(wildcard $(ROOT)/core/whistle_couch-*/ebin)
 
 all: compile
 

diff --git a/applications/blackhole/Makefile b/applications/blackhole/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = blackhole
 
-EBINS = $(shell find $(ROOT)/core/whistle_apps-* -maxdepth 2 -name ebin) \
+EBINS = $(wildcard $(ROOT)/core/whistle_apps-*/ebin) \
 	$(shell find $(ROOT)/deps/rabbitmq_erlang_client-* -name ebin)
 
 all: compile

diff --git a/applications/call_inspector/Makefile b/applications/call_inspector/Makefile
@@ -1,8 +1,8 @@
 ROOT = ../..
 PROJECT = call_inspector
 
-TEST_EBINS = $(shell find $(ROOT)/deps/mochiweb-* -maxdepth 2 -name ebin) \
-             $(shell find $(ROOT)/deps/ejson-* -maxdepth 2 -name ebin)
+TEST_EBINS = $(wildcard $(ROOT)/deps/mochiweb-*/ebin) \
+             $(wildcard $(ROOT)/deps/ejson-*/ebin)
 
 all: compile
 

diff --git a/applications/callflow/Makefile b/applications/callflow/Makefile
@@ -1,9 +1,9 @@
 ROOT = ../..
 PROJECT = callflow
 
-EBINS = $(shell find $(ROOT)/core/whistle_apps-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/whistle_number_manager-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/kazoo_documents-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/whistle_apps-*/ebin) \
+	$(wildcard $(ROOT)/core/whistle_number_manager-*/ebin) \
+	$(wildcard $(ROOT)/core/kazoo_documents-*/ebin)
 
 all: compile
 

diff --git a/applications/camper/Makefile b/applications/camper/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = camper
 
-EBINS = $(shell find $(ROOT)/core/whistle_apps-* -maxdepth 2 -name ebin) \
+EBINS = $(wildcard $(ROOT)/core/whistle_apps-*/ebin) \
 	$(shell find $(ROOT)/deps/rabbitmq_erlang_client-* -name ebin)
 
 all: compile

diff --git a/applications/cccp/Makefile b/applications/cccp/Makefile
@@ -1,8 +1,8 @@
 ROOT = ../..
 PROJECT = cccp
 
-EBINS = $(shell find $(ROOT)/core/whistle_apps-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/whistle_number_manager-* -maxdepth 2 -name ebin) \
+EBINS = $(wildcard $(ROOT)/core/whistle_apps-*/ebin) \
+	$(wildcard $(ROOT)/core/whistle_number_manager-*/ebin) \
 	$(shell find $(ROOT)/deps/rabbitmq_erlang_client-* -name ebin)
 
 all: compile

diff --git a/applications/crossbar/Makefile b/applications/crossbar/Makefile
@@ -1,14 +1,14 @@
 ROOT = ../..
 PROJECT = crossbar
 
-EBINS = $(shell find $(ROOT)/core/whistle_number_manager-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/whistle_couch-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/whistle_transactions-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/braintree-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/kazoo_oauth-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/kazoo_bindings-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/deps/cowboy-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/deps/ejson-* -maxdepth 2 -name ebin) \
+EBINS = $(wildcard $(ROOT)/core/whistle_number_manager-*/ebin) \
+	$(wildcard $(ROOT)/core/whistle_couch-*/ebin) \
+	$(wildcard $(ROOT)/core/whistle_transactions-*/ebin) \
+	$(wildcard $(ROOT)/core/braintree-*/ebin) \
+	$(wildcard $(ROOT)/core/kazoo_oauth-*/ebin) \
+	$(wildcard $(ROOT)/core/kazoo_bindings-*/ebin) \
+	$(wildcard $(ROOT)/deps/cowboy-*/ebin) \
+	$(wildcard $(ROOT)/deps/ejson-*/ebin) \
 	$(shell find $(ROOT)/deps/rabbitmq_erlang_client-* -name ebin)
 
 all: compile

diff --git a/applications/doodle/Makefile b/applications/doodle/Makefile
@@ -1,8 +1,8 @@
 ROOT = ../..
 PROJECT = doodle
 
-EBINS = $(shell find $(ROOT)/core/whistle_apps-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/whistle_number_manager-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/whistle_apps-*/ebin) \
+	$(wildcard $(ROOT)/core/whistle_number_manager-*/ebin)
 
 all: compile
 

diff --git a/applications/dth/Makefile b/applications/dth/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = dth
 
-EBINS = $(shell find $(ROOT)/deps/detergent-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/deps/detergent-*/ebin)
 
 all: compile
 

diff --git a/applications/ecallmgr/Makefile b/applications/ecallmgr/Makefile
@@ -1,8 +1,8 @@
 ROOT = ../..
 PROJECT = ecallmgr
 
-EBINS = $(shell find $(ROOT)/core/kazoo_documents-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/deps/nksip-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/kazoo_documents-*/ebin) \
+	$(wildcard $(ROOT)/deps/nksip-*/ebin)
 
 all: compile
 

diff --git a/applications/fax/Makefile b/applications/fax/Makefile
@@ -1,10 +1,10 @@
 ROOT = ../..
 PROJECT = fax
 
-EBINS = $(shell find $(ROOT)/core/kazoo_oauth-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/deps/gen_smtp-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/deps/escalus-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/deps/exml-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/kazoo_oauth-*/ebin) \
+	$(wildcard $(ROOT)/deps/gen_smtp-*/ebin) \
+	$(wildcard $(ROOT)/deps/escalus-*/ebin) \
+	$(wildcard $(ROOT)/deps/exml-*/ebin)
 
 all: compile
 

diff --git a/applications/frontier/Makefile b/applications/frontier/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = frontier
 
-EBINS = $(shell find $(ROOT)/core/whistle_apps-* -maxdepth 2 -name ebin) \
+EBINS = $(wildcard $(ROOT)/core/whistle_apps-*/ebin) \
 	$(shell find $(ROOT)/deps/rabbitmq_erlang_client-* -name ebin)
 
 all: compile

diff --git a/applications/hangups/Makefile b/applications/hangups/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = hangups
 
-EBINS = $(shell find $(ROOT)/deps/folsom-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/deps/folsom-*/ebin)
 
 all: compile
 

diff --git a/applications/jonny5/Makefile b/applications/jonny5/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = jonny5
 
-EBINS = $(shell find $(ROOT)/core/whistle_apps-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/whistle_apps-*/ebin)
 
 all: compile
 

diff --git a/applications/konami/Makefile b/applications/konami/Makefile
@@ -1,8 +1,8 @@
 ROOT = ../..
 PROJECT = konami
 
-EBINS = $(shell find $(ROOT)/core/whistle_apps-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/deps/nksip-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/whistle_apps-*/ebin) \
+	$(wildcard $(ROOT)/deps/nksip-*/ebin)
 
 all: compile
 

diff --git a/applications/omnipresence/Makefile b/applications/omnipresence/Makefile
@@ -1,9 +1,9 @@
 ROOT = ../..
 PROJECT = omnipresence
 
-EBINS = $(shell find $(ROOT)/core/kazoo_etsmgr-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/whistle_apps-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/deps/nksip-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/kazoo_etsmgr-*/ebin) \
+	$(wildcard $(ROOT)/core/whistle_apps-*/ebin) \
+	$(wildcard $(ROOT)/deps/nksip-*/ebin)
 
 all: compile
 

diff --git a/applications/pusher/Makefile b/applications/pusher/Makefile
@@ -2,7 +2,7 @@ ROOT = ../..
 PROJECT = pusher
 
 EBINS = lib/apns/ebin lib/gcm/ebin \
-	$(shell find $(ROOT)/deps/nksip-* -maxdepth 2 -name ebin)
+	$(wildcard $(ROOT)/deps/nksip-*/ebin)
 
 COMPILE_MOAR = compile-lib
 CLEAN_MOAR = clean-lib

diff --git a/applications/pusher/lib/apns/Makefile b/applications/pusher/lib/apns/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../../../..
 PROJECT = apns
 
-EBINS = $(shell find $(ROOT)/applications/pusher/lib/apns -maxdepth 2 -name ebin)
+EBINS = $(ROOT)/applications/pusher/lib/apns/ebin
 
 ERLC_OPTS += +warn_missing_spec +warn_unused_vars -Iinclude/
 

diff --git a/applications/stepswitch/Makefile b/applications/stepswitch/Makefile
@@ -1,8 +1,8 @@
 ROOT = ../..
 PROJECT = stepswitch
 
-EBINS = $(shell find $(ROOT)/core/whistle_number_manager-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/kazoo_sip-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/whistle_number_manager-*/ebin) \
+	$(wildcard $(ROOT)/core/kazoo_sip-*/ebin)
 
 all: compile
 

diff --git a/applications/trunkstore/Makefile b/applications/trunkstore/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = trunkstore
 
-EBINS = $(shell find $(ROOT)/core/whistle_number_manager-* -maxdepth 2 -name ebin) \
+EBINS = $(wildcard $(ROOT)/core/whistle_number_manager-*/ebin) \
 	$(shell find $(ROOT)/deps/rabbitmq_erlang_client-* -name ebin)
 
 all: compile

diff --git a/applications/webhooks/Makefile b/applications/webhooks/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = webhooks
 
-EBINS = $(shell find $(ROOT)/core/whistle_apps-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/whistle_apps-*/ebin)
 
 all: compile
 

diff --git a/core/braintree-1.0.0/Makefile b/core/braintree-1.0.0/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = braintree
 
-EBINS = $(shell find $(ROOT)/core/braintree-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/braintree-*/ebin)
 
 all: compile
 

diff --git a/core/kazoo_caches-1.0.0/Makefile b/core/kazoo_caches-1.0.0/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = kazoo_caches
 
-EBINS = $(shell find $(ROOT)/core/kazoo_caches-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/kazoo_caches-*/ebin)
 
 all: compile
 

diff --git a/core/kazoo_documents-1.0.0/Makefile b/core/kazoo_documents-1.0.0/Makefile
@@ -1,13 +1,13 @@
 ROOT = ../..
 PROJECT = kazoo_documents
 
-EBINS =	$(shell find $(ROOT)/core/kazoo_documents-* -maxdepth 2 -name ebin)
+EBINS =	$(wildcard $(ROOT)/core/kazoo_documents-*/ebin)
 
-TEST_EBINS = $(shell find $(ROOT)/applications/crossbar -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/whistle_couch-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/deps/cowboy-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/deps/ejson-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/deps/jesse-* -maxdepth 2 -name ebin)
+TEST_EBINS = $(ROOT)/applications/crossbar/ebin \
+	$(wildcard $(ROOT)/core/whistle_couch-*/ebin) \
+	$(wildcard $(ROOT)/deps/cowboy-*/ebin) \
+	$(wildcard $(ROOT)/deps/ejson-*/ebin) \
+	$(wildcard $(ROOT)/deps/jesse-*/ebin)
 
 all: compile
 

diff --git a/core/kazoo_ledgers-1.0.0/Makefile b/core/kazoo_ledgers-1.0.0/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = kazoo_ledgers
 
-EBINS = $(shell find $(ROOT)/core/kazoo_ledgers-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/kazoo_ledgers-*/ebin)
 
 all: compile
 

diff --git a/core/kazoo_sip-1.0.0/Makefile b/core/kazoo_sip-1.0.0/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = kazoo_sip
 
-EBINS = $(shell find $(ROOT)/core/whistle_number_manager-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/whistle_number_manager-*/ebin)
 
 all: compile
 

diff --git a/core/whistle-1.0.0/Makefile b/core/whistle-1.0.0/Makefile
@@ -3,9 +3,9 @@ PROJECT = whistle
 
 EBINS = $(shell find $(ROOT)/deps/rabbitmq_erlang_client-* -name ebin)
 
-TEST_EBINS = $(shell find $(ROOT)/deps/mochiweb-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/kazoo_web* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/deps/ejson-* -maxdepth 2 -name ebin)
+TEST_EBINS = $(wildcard $(ROOT)/deps/mochiweb-*/ebin) \
+	$(wildcard $(ROOT)/core/kazoo_web-*/ebin) \
+	$(wildcard $(ROOT)/deps/ejson-*/ebin)
 
 SOURCES = src/kazoo_transform.erl src/*.erl src/api/*.erl
 

diff --git a/core/whistle_apps-1.0.0/Makefile b/core/whistle_apps-1.0.0/Makefile
@@ -1,13 +1,13 @@
 ROOT = ../..
 PROJECT = whistle_apps
 
-EBINS = $(shell find $(ROOT)/core/whistle_apps-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/kazoo_caches-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/whistle_apps-*/ebin) \
+	$(wildcard $(ROOT)/core/kazoo_caches-*/ebin)
 
-TEST_EBINS = $(shell find $(ROOT)/core/whistle_number_manager-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/whistle_config-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/whistle_media-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/whistle_couch-* -maxdepth 2 -name ebin)
+TEST_EBINS = $(wildcard $(ROOT)/core/whistle_number_manager-*/ebin) \
+	$(wildcard $(ROOT)/core/whistle_config-*/ebin) \
+	$(wildcard $(ROOT)/core/whistle_media-*/ebin) \
+	$(wildcard $(ROOT)/core/whistle_couch-*/ebin)
 
 all: compile
 

diff --git a/core/whistle_couch-1.0.0/Makefile b/core/whistle_couch-1.0.0/Makefile
@@ -1,8 +1,8 @@
 ROOT = ../..
 PROJECT = whistle_couch
 
-EBINS = $(shell find $(ROOT)/core/whistle_number_manager-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/deps/couchbeam-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/whistle_number_manager-*/ebin) \
+	$(wildcard $(ROOT)/deps/couchbeam-*/ebin)
 
 SOURCES = src/wh_gen_changes.erl src/*.erl
 

diff --git a/core/whistle_number_manager-1.0.0/Makefile b/core/whistle_number_manager-1.0.0/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = whistle_number_manager
 
-EBINS = $(shell find $(ROOT)/core/whistle_number_manager-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/core/whistle_number_manager-*/ebin)
 
 all: compile
 

diff --git a/core/whistle_services-1.0.0/Makefile b/core/whistle_services-1.0.0/Makefile
@@ -1,9 +1,9 @@
 ROOT = ../..
 PROJECT = whistle_services
 
-TEST_EBINS = $(shell find $(ROOT)/core/whistle_couch-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/core/kazoo_documents-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/deps/ejson-* -maxdepth 2 -name ebin)
+TEST_EBINS = $(wildcard $(ROOT)/core/whistle_couch-*/ebin) \
+	$(wildcard $(ROOT)/core/kazoo_documents-*/ebin) \
+	$(wildcard $(ROOT)/deps/ejson-*/ebin)
 
 ELIBS = $(ERL_LIBS):$(subst $(eval) ,:,$(wildcard $(ROOT)/core))
 

diff --git a/deps/couchbeam-0.8.0/Makefile b/deps/couchbeam-0.8.0/Makefile
@@ -1,8 +1,8 @@
 ROOT = ../..
 PROJECT = couchbeam
 
-EBINS = $(shell find $(ROOT)/deps/couchbeam-* -maxdepth 2 -name ebin) \
-	$(shell find $(ROOT)/deps/ibrowse-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/deps/couchbeam-*/ebin) \
+	$(wildcard $(ROOT)/deps/ibrowse-*/ebin)
 
 all: compile
 

diff --git a/deps/cowboy-0.10.0/Makefile b/deps/cowboy-0.10.0/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = cowboy
 
-EBINS = $(shell find $(ROOT)/deps/cowlib-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/deps/cowlib-*/ebin)
 
 SOURCES = src/cowboy_middleware.erl src/cowboy_sub_protocol.erl src/*.erl
 

diff --git a/deps/detergent-0.2/Makefile b/deps/detergent-0.2/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = detergent
 
-EBINS = $(shell find $(ROOT)/deps/detergent-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/deps/detergent-*/ebin)
 
 all: compile
 

diff --git a/deps/erlydtl-0.9.4/Makefile b/deps/erlydtl-0.9.4/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = erlydtl
 
-EBINS = $(shell find $(ROOT)/deps/merl-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/deps/merl-*/ebin)
 
 COMPILE_MOAR = src/erlydtl_parser.erl
 CLEAN_MOAR = clean-parser

diff --git a/deps/gproc-0.2.12/Makefile b/deps/gproc-0.2.12/Makefile
@@ -1,7 +1,7 @@
 ROOT = ../..
 PROJECT = gproc
 
-EBINS = $(shell find $(ROOT)/deps/gen_leader-* -maxdepth 2 -name ebin)
+EBINS = $(wildcard $(ROOT)/deps/gen_leader-*/ebin)
 
 all: compile