Skip to content

Commit

Permalink
KAZOO-4574: define ERL_LIBS in only one place
Browse files Browse the repository at this point in the history
  • Loading branch information
@fenollp
fenollp committed Feb 24, 2016
1 parent df18e97 commit 32feb9f
Show file tree
Hide file tree
Showing 68 changed files with 70 additions and 75 deletions.
2 changes: 1 addition & 1 deletion applications/acdc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = acdc

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/ananke/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = ananke

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/blackhole/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = blackhole

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/call_inspector/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ TEST_EBINS = $(wildcard $(ROOT)/deps/mochiweb-*/ebin) \

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/callflow/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = callflow

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/camper/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = camper

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/cccp/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = cccp

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/cdr/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = cdr

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/conference/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = conference

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/crossbar/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = crossbar

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/doodle/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = doodle

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/dth/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = dth

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/ecallmgr/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = ecallmgr

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/fax/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = fax

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/frontier/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = frontier

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/hangups/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = hangups

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/hotornot/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = hotornot

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/jonny5/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = jonny5

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/konami/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = konami

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
3 changes: 0 additions & 3 deletions applications/kz.mk
View file

This file was deleted.

2 changes: 1 addition & 1 deletion applications/media_mgr/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = media_mgr

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/milliwatt/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = milliwatt

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/notify/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = notify

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/omnipresence/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = omnipresence

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/pivot/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = pivot

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/pusher/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = pusher

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/registrar/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ all: compile
COMPILE_MOAR = priv/comp128.so
CLEAN_MOAR = clean-so

include ../kz.mk
include $(ROOT)/make/kz.mk


ERL_INCLUDES := $(wildcard $(shell dirname `which erl`)/../erts-*/include)
Expand Down
2 changes: 1 addition & 1 deletion applications/reorder/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = reorder

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/skel/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = skel

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/spyvsspy/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = spyvsspy

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/stats/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = stats

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/stepswitch/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = stepswitch

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/sysconf/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = sysconf

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/teletype/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = teletype

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/trunkstore/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = trunkstore

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion applications/webhooks/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = webhooks

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/amqp_cron/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ TEST_EBINS = $(ROOT)/core/amqp_leader/ebin

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/amqp_leader/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = amqp_leader

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/apns/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = apns

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/braintree/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = braintree

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/gcm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = gcm

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/kazoo_bindings/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = kazoo_bindings

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/kazoo_caches/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = kazoo_caches

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/kazoo_documents/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ TEST_EBINS = $(ROOT)/applications/crossbar/ebin

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/kazoo_etsmgr/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = kazoo_etsmgr

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/kazoo_ips/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = kazoo_ips

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/kazoo_ledgers/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = kazoo_ledgers

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/kazoo_modb/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = kazoo_modb

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/kazoo_oauth/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = kazoo_oauth

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/kazoo_sip/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = kazoo_sip

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/kazoo_token_buckets/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = kazoo_token_buckets

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/kazoo_translator/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = kazoo_translator

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/kazoo_web/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = kazoo_web

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/kazoo_xml/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = kazoo_xml

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
3 changes: 0 additions & 3 deletions core/kz.mk
View file

This file was deleted.

2 changes: 1 addition & 1 deletion core/webseq/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = webseq

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/whistle/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ GEN_OUT = src/kz_mime.erl

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk

clean-generated:
$(if $(wildcard src/kz_mime.erl), rm src/kz_mime.erl)
Expand Down
2 changes: 1 addition & 1 deletion core/whistle_amqp/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = whistle_amqp

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/whistle_apps/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = whistle_apps

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/whistle_config/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = whistle_config

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/whistle_couch/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ SOURCES = src/wh_gen_changes.erl src/*.erl

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/whistle_media/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = whistle_media

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/whistle_number_manager/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = whistle_number_manager

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/whistle_services/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = whistle_services

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/whistle_stats/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = whistle_stats

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
2 changes: 1 addition & 1 deletion core/whistle_transactions/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PROJECT = whistle_transactions

all: compile

include ../kz.mk
include $(ROOT)/make/kz.mk
Loading

0 comments on commit 32feb9f

Please sign in to comment.