diff options
Diffstat (limited to '')
| -rw-r--r-- | include/ejabberd_http.hrl (renamed from src/web/ejabberd_http.hrl) | 0 | ||||
| -rw-r--r-- | include/ejabberd_web_admin.hrl (renamed from src/web/ejabberd_web_admin.hrl) | 0 | ||||
| -rw-r--r-- | include/http_bind.hrl (renamed from src/web/http_bind.hrl) | 0 | ||||
| -rw-r--r-- | src/ejabberd_http.erl (renamed from src/web/ejabberd_http.erl) | 1 | ||||
| -rw-r--r-- | src/ejabberd_http_bind.erl (renamed from src/web/ejabberd_http_bind.erl) | 1 | ||||
| -rw-r--r-- | src/ejabberd_http_poll.erl (renamed from src/web/ejabberd_http_poll.erl) | 1 | ||||
| -rw-r--r-- | src/ejabberd_web.erl (renamed from src/web/ejabberd_web.erl) | 1 | ||||
| -rw-r--r-- | src/ejabberd_web_admin.erl (renamed from src/web/ejabberd_web_admin.erl) | 1 | ||||
| -rw-r--r-- | src/mod_http_bind.erl (renamed from src/web/mod_http_bind.erl) | 1 | ||||
| -rw-r--r-- | src/mod_http_fileserver.erl (renamed from src/web/mod_http_fileserver.erl) | 1 | ||||
| -rw-r--r-- | src/mod_register_web.erl (renamed from src/web/mod_register_web.erl) | 1 | ||||
| -rw-r--r-- | src/web/Makefile.in | 37 | ||||
| -rw-r--r-- | src/web/Makefile.win32 | 33 |
13 files changed, 8 insertions, 70 deletions
diff --git a/src/web/ejabberd_http.hrl b/include/ejabberd_http.hrl index 542dc0cd..542dc0cd 100644 --- a/src/web/ejabberd_http.hrl +++ b/include/ejabberd_http.hrl diff --git a/src/web/ejabberd_web_admin.hrl b/include/ejabberd_web_admin.hrl index 6c939f9e..6c939f9e 100644 --- a/src/web/ejabberd_web_admin.hrl +++ b/include/ejabberd_web_admin.hrl diff --git a/src/web/http_bind.hrl b/include/http_bind.hrl index 2eac91e9..2eac91e9 100644 --- a/src/web/http_bind.hrl +++ b/include/http_bind.hrl diff --git a/src/web/ejabberd_http.erl b/src/ejabberd_http.erl index 25928c0a..26e827a7 100644 --- a/src/web/ejabberd_http.erl +++ b/src/ejabberd_http.erl @@ -36,6 +36,7 @@ -export([init/2]). -include("ejabberd.hrl"). +-include("logger.hrl"). -include("jlib.hrl"). diff --git a/src/web/ejabberd_http_bind.erl b/src/ejabberd_http_bind.erl index 91329167..976f706b 100644 --- a/src/web/ejabberd_http_bind.erl +++ b/src/ejabberd_http_bind.erl @@ -41,6 +41,7 @@ process_request/2]). -include("ejabberd.hrl"). +-include("logger.hrl"). -include("jlib.hrl"). diff --git a/src/web/ejabberd_http_poll.erl b/src/ejabberd_http_poll.erl index 7648f571..bc974da2 100644 --- a/src/web/ejabberd_http_poll.erl +++ b/src/ejabberd_http_poll.erl @@ -37,6 +37,7 @@ controlling_process/2, close/1, process/2]). -include("ejabberd.hrl"). +-include("logger.hrl"). -include("jlib.hrl"). diff --git a/src/web/ejabberd_web.erl b/src/ejabberd_web.erl index 8c7ccaf6..70f62de7 100644 --- a/src/web/ejabberd_web.erl +++ b/src/ejabberd_web.erl @@ -33,6 +33,7 @@ -export([make_xhtml/1, make_xhtml/2, error/1]). -include("ejabberd.hrl"). +-include("logger.hrl"). -include("jlib.hrl"). diff --git a/src/web/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl index 73c7ab52..de9142c1 100644 --- a/src/web/ejabberd_web_admin.erl +++ b/src/ejabberd_web_admin.erl @@ -36,6 +36,7 @@ term_to_id/1]). -include("ejabberd.hrl"). +-include("logger.hrl"). -include("jlib.hrl"). diff --git a/src/web/mod_http_bind.erl b/src/mod_http_bind.erl index 164c07d3..dcaa8a91 100644 --- a/src/web/mod_http_bind.erl +++ b/src/mod_http_bind.erl @@ -41,6 +41,7 @@ -export([start/2, stop/1, process/2]). -include("ejabberd.hrl"). +-include("logger.hrl"). -include("jlib.hrl"). diff --git a/src/web/mod_http_fileserver.erl b/src/mod_http_fileserver.erl index 98206a5f..f16256d4 100644 --- a/src/web/mod_http_fileserver.erl +++ b/src/mod_http_fileserver.erl @@ -48,6 +48,7 @@ -export([reopen_log/1]). -include("ejabberd.hrl"). +-include("logger.hrl"). -include("jlib.hrl"). diff --git a/src/web/mod_register_web.erl b/src/mod_register_web.erl index 0ccba994..841685a9 100644 --- a/src/web/mod_register_web.erl +++ b/src/mod_register_web.erl @@ -59,6 +59,7 @@ -export([start/2, stop/1, process/2]). -include("ejabberd.hrl"). +-include("logger.hrl"). -include("jlib.hrl"). diff --git a/src/web/Makefile.in b/src/web/Makefile.in deleted file mode 100644 index 151f4c47..00000000 --- a/src/web/Makefile.in +++ /dev/null @@ -1,37 +0,0 @@ -# $Id$ - -CC = @CC@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ - -ERLANG_CFLAGS = @ERLANG_CFLAGS@ -ERLANG_LIBS = @ERLANG_LIBS@ - -EFLAGS += -I .. -EFLAGS += -pz .. - -# make debug=true to compile Erlang module with debug informations. -ifdef debug - EFLAGS+=+debug_info -endif - -SOURCES = $(wildcard *.erl) -OUTDIR = .. -BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam)) - -all: $(BEAMS) - -$(OUTDIR)/%.beam: %.erl - @ERLC@ -W $(EFLAGS) -o $(OUTDIR) $< - -clean: - rm -f $(BEAMS) - -distclean: clean - rm -f Makefile - -TAGS: - etags *.erl - diff --git a/src/web/Makefile.win32 b/src/web/Makefile.win32 deleted file mode 100644 index 411d57ce..00000000 --- a/src/web/Makefile.win32 +++ /dev/null @@ -1,33 +0,0 @@ - -include ..\Makefile.inc - -EFLAGS = -I .. -pz .. - -OUTDIR = .. -BEAMS = ..\ejabberd_http.beam ..\ejabberd_http_bind.beam ..\ejabberd_http_poll.beam ..\ejabberd_web.beam ..\ejabberd_web_admin.beam ..\mod_http_bind.beam ..\mod_http_fileserver.beam - -ALL : $(BEAMS) - -CLEAN : - -@erase $(BEAMS) - -$(OUTDIR)\ejabberd_http.beam : ejabberd_http.erl - erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_http.erl - -$(OUTDIR)\ejabberd_web.beam : ejabberd_web.erl - erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_web.erl - -$(OUTDIR)\ejabberd_web_admin.beam : ejabberd_web_admin.erl - erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_web_admin.erl - -$(OUTDIR)\ejabberd_http_bind.beam : ejabberd_http_bind.erl - erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_http_bind.erl - -$(OUTDIR)\ejabberd_http_poll.beam : ejabberd_http_poll.erl - erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_http_poll.erl - -$(OUTDIR)\mod_http_bind.beam : mod_http_bind.erl - erlc -W $(EFLAGS) -o $(OUTDIR) mod_http_bind.erl - -$(OUTDIR)\mod_http_fileserver.beam : mod_http_fileserver.erl - erlc -W $(EFLAGS) -o $(OUTDIR) mod_http_fileserver.erl |