diff options
| author | Badlop <badlop@process-one.net> | 2010-05-28 00:48:04 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2010-05-28 00:51:25 +0200 |
| commit | 1777ecd15a06155d78ed76df672c59b29c83805d (patch) | |
| tree | b75883704a95c148ac20cafc2eb1656169a882d0 /src | |
| parent | remove the silly loop that isnt needed, this speeds up all requests by 100 mi... (diff) | |
Makefile with optional ejabberd_debug.erl compilation (EJAB-1242)
Only compile and install ejabberd_debug.erl when running:
make ejabberd_debug=true
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 5 | ||||
| -rw-r--r-- | src/ejabberd_app.erl | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 496d101bc..dd728ce02 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -37,8 +37,10 @@ ifdef debug EFLAGS+=+debug_info +export_all endif +DEBUGTOOLS = ejabberd_debug.erl ifdef ejabberd_debug EFLAGS+=-Dejabberd_debug + SOURCES+=$(DEBUGTOOLS) endif ifeq (@hipe@, true) @@ -69,7 +71,8 @@ SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @mod_proxy65@ @eldap@ @pam@ @web@ str ERLSHLIBS = expat_erl.so ERLBEHAVS = cyrsasl.erl gen_mod.erl p1_fsm.erl SOURCES_ALL = $(wildcard *.erl) -SOURCES = $(filter-out $(ERLBEHAVS),$(SOURCES_ALL)) +SOURCES_MISC = $(ERLBEHAVS) $(DEBUGTOOLS) +SOURCES += $(filter-out $(SOURCES_MISC),$(SOURCES_ALL)) ERLBEHAVBEAMS = $(ERLBEHAVS:.erl=.beam) BEAMS = $(SOURCES:.erl=.beam) diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl index 7d40c64c4..7a54fcc37 100644 --- a/src/ejabberd_app.erl +++ b/src/ejabberd_app.erl @@ -85,7 +85,7 @@ prep_stop(State) -> stop(_State) -> ?INFO_MSG("ejabberd ~s is stopped in the node ~p", [?VERSION, node()]), delete_pid_file(), - ejabberd_debug:stop(), + %%ejabberd_debug:stop(), ok. |