mirror of
https://github.com/processone/ejabberd.git
synced 2024-09-27 14:30:55 +02:00
* src/*.hrl: Get back all ejabberd header files to their original
placement in src/ subdirectories (EJAB-696) * src/*/*.erl: Likewise * src/*/Makefile.in: Likewise * src/Makefile.in: Install header files in system include/ dir, reproducing the subdirectory structure of src/ SVN Revision: 1453
This commit is contained in:
parent
e0e7797e99
commit
970e9e0843
@ -1,5 +1,12 @@
|
|||||||
2008-07-16 Badlop <badlop@process-one.net>
|
2008-07-16 Badlop <badlop@process-one.net>
|
||||||
|
|
||||||
|
* src/*.hrl: Get back all ejabberd header files to their original
|
||||||
|
placement in src/ subdirectories (EJAB-696)
|
||||||
|
* src/*/*.erl: Likewise
|
||||||
|
* src/*/Makefile.in: Likewise
|
||||||
|
* src/Makefile.in: Install header files in system include/ dir,
|
||||||
|
reproducing the subdirectory structure of src/
|
||||||
|
|
||||||
* src/ejabberdctl.template: Update environment variable names
|
* src/ejabberdctl.template: Update environment variable names
|
||||||
|
|
||||||
2008-07-15 Badlop <badlop@process-one.net>
|
2008-07-15 Badlop <badlop@process-one.net>
|
||||||
|
@ -29,7 +29,6 @@ else
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
EFLAGS += @ERLANG_SSL39@
|
EFLAGS += @ERLANG_SSL39@
|
||||||
EFLAGS += -I ../include
|
|
||||||
|
|
||||||
# make debug=true to compile Erlang module with debug informations.
|
# make debug=true to compile Erlang module with debug informations.
|
||||||
ifdef debug
|
ifdef debug
|
||||||
@ -189,7 +188,15 @@ install: all
|
|||||||
#
|
#
|
||||||
# ejabberd header files
|
# ejabberd header files
|
||||||
install -d $(INCLUDEDIR)
|
install -d $(INCLUDEDIR)
|
||||||
install -m 644 ../include/*.hrl $(INCLUDEDIR)
|
install -m 644 *.hrl $(INCLUDEDIR)
|
||||||
|
install -d $(INCLUDEDIR)/eldap/
|
||||||
|
install -m 644 eldap/*.hrl $(INCLUDEDIR)/eldap/
|
||||||
|
install -d $(INCLUDEDIR)/mod_proxy65/
|
||||||
|
install -m 644 mod_proxy65/*.hrl $(INCLUDEDIR)/mod_proxy65/
|
||||||
|
install -d $(INCLUDEDIR)/mod_pubsub/
|
||||||
|
install -m 644 mod_pubsub/*.hrl $(INCLUDEDIR)/mod_pubsub/
|
||||||
|
install -d $(INCLUDEDIR)/web/
|
||||||
|
install -m 644 web/*.hrl $(INCLUDEDIR)/web/
|
||||||
#
|
#
|
||||||
# Binary C programs
|
# Binary C programs
|
||||||
install -d $(PBINDIR)
|
install -d $(PBINDIR)
|
||||||
|
@ -58,7 +58,7 @@
|
|||||||
]).
|
]).
|
||||||
|
|
||||||
-include("ejabberd.hrl").
|
-include("ejabberd.hrl").
|
||||||
-include("eldap.hrl").
|
-include("eldap/eldap.hrl").
|
||||||
|
|
||||||
-record(state, {host,
|
-record(state, {host,
|
||||||
eldap_id,
|
eldap_id,
|
||||||
|
@ -19,8 +19,9 @@ else
|
|||||||
DYNAMIC_LIB_CFLAGS = -fpic -shared
|
DYNAMIC_LIB_CFLAGS = -fpic -shared
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EFLAGS += -I ../../include
|
EFLAGS += -I ..
|
||||||
EFLAGS += -pz ..
|
EFLAGS += -pz ..
|
||||||
|
|
||||||
# make debug=true to compile Erlang module with debug informations.
|
# make debug=true to compile Erlang module with debug informations.
|
||||||
ifdef debug
|
ifdef debug
|
||||||
EFLAGS+=+debug_info
|
EFLAGS+=+debug_info
|
||||||
|
@ -9,8 +9,9 @@ LIBS = @LIBS@
|
|||||||
ERLANG_CFLAGS = @ERLANG_CFLAGS@
|
ERLANG_CFLAGS = @ERLANG_CFLAGS@
|
||||||
ERLANG_LIBS = @ERLANG_LIBS@
|
ERLANG_LIBS = @ERLANG_LIBS@
|
||||||
|
|
||||||
EFLAGS += -I ../../include
|
EFLAGS += -I ..
|
||||||
EFLAGS += -pz ..
|
EFLAGS += -pz ..
|
||||||
|
|
||||||
# make debug=true to compile Erlang module with debug informations.
|
# make debug=true to compile Erlang module with debug informations.
|
||||||
ifdef debug
|
ifdef debug
|
||||||
EFLAGS+=+debug_info
|
EFLAGS+=+debug_info
|
||||||
|
@ -16,7 +16,7 @@ else
|
|||||||
DYNAMIC_LIB_CFLAGS = -fpic -shared
|
DYNAMIC_LIB_CFLAGS = -fpic -shared
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EFLAGS += -I ../../include
|
EFLAGS += -I ..
|
||||||
EFLAGS += -pz ..
|
EFLAGS += -pz ..
|
||||||
|
|
||||||
# make debug=true to compile Erlang module with debug informations.
|
# make debug=true to compile Erlang module with debug informations.
|
||||||
|
@ -9,7 +9,7 @@ LIBS = @LIBS@
|
|||||||
ERLANG_CFLAGS = @ERLANG_CFLAGS@
|
ERLANG_CFLAGS = @ERLANG_CFLAGS@
|
||||||
ERLANG_LIBS = @ERLANG_LIBS@
|
ERLANG_LIBS = @ERLANG_LIBS@
|
||||||
|
|
||||||
EFLAGS += -I ../../include
|
EFLAGS += -I ..
|
||||||
EFLAGS += -pz ..
|
EFLAGS += -pz ..
|
||||||
|
|
||||||
# make debug=true to compile Erlang module with debug informations.
|
# make debug=true to compile Erlang module with debug informations.
|
||||||
|
@ -43,8 +43,8 @@
|
|||||||
|
|
||||||
-include("ejabberd.hrl").
|
-include("ejabberd.hrl").
|
||||||
-include("jlib.hrl").
|
-include("jlib.hrl").
|
||||||
-include("ejabberd_http.hrl").
|
-include("web/ejabberd_http.hrl").
|
||||||
-include("ejabberd_web_admin.hrl").
|
-include("web/ejabberd_web_admin.hrl").
|
||||||
|
|
||||||
-record(offline_msg, {us, timestamp, expire, from, to, packet}).
|
-record(offline_msg, {us, timestamp, expire, from, to, packet}).
|
||||||
|
|
||||||
|
@ -42,8 +42,8 @@
|
|||||||
|
|
||||||
-include("ejabberd.hrl").
|
-include("ejabberd.hrl").
|
||||||
-include("jlib.hrl").
|
-include("jlib.hrl").
|
||||||
-include("ejabberd_http.hrl").
|
-include("web/ejabberd_http.hrl").
|
||||||
-include("ejabberd_web_admin.hrl").
|
-include("web/ejabberd_web_admin.hrl").
|
||||||
|
|
||||||
-record(offline_msg, {user, timestamp, expire, from, to, packet}).
|
-record(offline_msg, {user, timestamp, expire, from, to, packet}).
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ LIBS = @LIBS@
|
|||||||
ERLANG_CFLAGS = @ERLANG_CFLAGS@
|
ERLANG_CFLAGS = @ERLANG_CFLAGS@
|
||||||
ERLANG_LIBS = @ERLANG_LIBS@
|
ERLANG_LIBS = @ERLANG_LIBS@
|
||||||
|
|
||||||
EFLAGS += -I ../../include
|
EFLAGS += -I ..
|
||||||
EFLAGS += -pz ..
|
EFLAGS += -pz ..
|
||||||
|
|
||||||
# make debug=true to compile Erlang module with debug informations.
|
# make debug=true to compile Erlang module with debug informations.
|
||||||
|
@ -9,7 +9,7 @@ LIBS = @LIBS@
|
|||||||
ERLANG_CFLAGS = @ERLANG_CFLAGS@
|
ERLANG_CFLAGS = @ERLANG_CFLAGS@
|
||||||
ERLANG_LIBS = @ERLANG_LIBS@
|
ERLANG_LIBS = @ERLANG_LIBS@
|
||||||
|
|
||||||
EFLAGS += -I ../../include
|
EFLAGS += -I ..
|
||||||
EFLAGS += -pz ..
|
EFLAGS += -pz ..
|
||||||
|
|
||||||
# make debug=true to compile Erlang module with debug informations.
|
# make debug=true to compile Erlang module with debug informations.
|
||||||
|
@ -47,8 +47,8 @@
|
|||||||
-include("ejabberd.hrl").
|
-include("ejabberd.hrl").
|
||||||
-include("jlib.hrl").
|
-include("jlib.hrl").
|
||||||
-include("mod_roster.hrl").
|
-include("mod_roster.hrl").
|
||||||
-include("ejabberd_http.hrl").
|
-include("web/ejabberd_http.hrl").
|
||||||
-include("ejabberd_web_admin.hrl").
|
-include("web/ejabberd_web_admin.hrl").
|
||||||
|
|
||||||
|
|
||||||
start(Host, Opts) ->
|
start(Host, Opts) ->
|
||||||
|
@ -46,8 +46,8 @@
|
|||||||
-include("ejabberd.hrl").
|
-include("ejabberd.hrl").
|
||||||
-include("jlib.hrl").
|
-include("jlib.hrl").
|
||||||
-include("mod_roster.hrl").
|
-include("mod_roster.hrl").
|
||||||
-include("ejabberd_http.hrl").
|
-include("web/ejabberd_http.hrl").
|
||||||
-include("ejabberd_web_admin.hrl").
|
-include("web/ejabberd_web_admin.hrl").
|
||||||
|
|
||||||
|
|
||||||
start(Host, Opts) ->
|
start(Host, Opts) ->
|
||||||
|
@ -52,8 +52,8 @@
|
|||||||
-include("ejabberd.hrl").
|
-include("ejabberd.hrl").
|
||||||
-include("jlib.hrl").
|
-include("jlib.hrl").
|
||||||
-include("mod_roster.hrl").
|
-include("mod_roster.hrl").
|
||||||
-include("ejabberd_http.hrl").
|
-include("web/ejabberd_http.hrl").
|
||||||
-include("ejabberd_web_admin.hrl").
|
-include("web/ejabberd_web_admin.hrl").
|
||||||
|
|
||||||
-record(sr_group, {group_host, opts}).
|
-record(sr_group, {group_host, opts}).
|
||||||
-record(sr_user, {us, group_host}).
|
-record(sr_user, {us, group_host}).
|
||||||
|
@ -50,7 +50,7 @@
|
|||||||
]).
|
]).
|
||||||
|
|
||||||
-include("ejabberd.hrl").
|
-include("ejabberd.hrl").
|
||||||
-include("eldap.hrl").
|
-include("eldap/eldap.hrl").
|
||||||
-include("jlib.hrl").
|
-include("jlib.hrl").
|
||||||
|
|
||||||
-define(PROCNAME, ejabberd_mod_vcard_ldap).
|
-define(PROCNAME, ejabberd_mod_vcard_ldap).
|
||||||
|
@ -9,7 +9,7 @@ LIBS = @LIBS@
|
|||||||
ERLANG_CFLAGS = @ERLANG_CFLAGS@
|
ERLANG_CFLAGS = @ERLANG_CFLAGS@
|
||||||
ERLANG_LIBS = @ERLANG_LIBS@
|
ERLANG_LIBS = @ERLANG_LIBS@
|
||||||
|
|
||||||
EFLAGS += -I ../../include
|
EFLAGS += -I ..
|
||||||
EFLAGS += -pz ..
|
EFLAGS += -pz ..
|
||||||
|
|
||||||
# make debug=true to compile Erlang module with debug informations.
|
# make debug=true to compile Erlang module with debug informations.
|
||||||
|
@ -9,7 +9,7 @@ LIBS = @LIBS@ @PAM_LIBS@
|
|||||||
ERLANG_CFLAGS = @ERLANG_CFLAGS@
|
ERLANG_CFLAGS = @ERLANG_CFLAGS@
|
||||||
ERLANG_LIBS = @ERLANG_LIBS@
|
ERLANG_LIBS = @ERLANG_LIBS@
|
||||||
|
|
||||||
EFLAGS += -I ../../include
|
EFLAGS += -I ..
|
||||||
EFLAGS += -pz ..
|
EFLAGS += -pz ..
|
||||||
|
|
||||||
# make debug=true to compile Erlang module with debug informations.
|
# make debug=true to compile Erlang module with debug informations.
|
||||||
|
@ -16,7 +16,9 @@ else
|
|||||||
DYNAMIC_LIB_CFLAGS = -fpic -shared
|
DYNAMIC_LIB_CFLAGS = -fpic -shared
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EFLAGS = -I .. -pz ..
|
EFLAGS += -I ..
|
||||||
|
EFLAGS += -pz ..
|
||||||
|
|
||||||
# make debug=true to compile Erlang module with debug informations.
|
# make debug=true to compile Erlang module with debug informations.
|
||||||
ifdef debug
|
ifdef debug
|
||||||
EFLAGS+=+debug_info
|
EFLAGS+=+debug_info
|
||||||
|
@ -19,7 +19,7 @@ else
|
|||||||
DYNAMIC_LIB_CFLAGS = -fpic -shared
|
DYNAMIC_LIB_CFLAGS = -fpic -shared
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EFLAGS += -I ../../include
|
EFLAGS += -I ..
|
||||||
EFLAGS += -pz ..
|
EFLAGS += -pz ..
|
||||||
|
|
||||||
# make debug=true to compile Erlang module with debug informations.
|
# make debug=true to compile Erlang module with debug informations.
|
||||||
|
@ -9,7 +9,7 @@ LIBS = @LIBS@
|
|||||||
ERLANG_CFLAGS = @ERLANG_CFLAGS@
|
ERLANG_CFLAGS = @ERLANG_CFLAGS@
|
||||||
ERLANG_LIBS = @ERLANG_LIBS@
|
ERLANG_LIBS = @ERLANG_LIBS@
|
||||||
|
|
||||||
EFLAGS += -I ../../include
|
EFLAGS += -I ..
|
||||||
EFLAGS += -pz ..
|
EFLAGS += -pz ..
|
||||||
|
|
||||||
# make debug=true to compile Erlang module with debug informations.
|
# make debug=true to compile Erlang module with debug informations.
|
||||||
|
Loading…
Reference in New Issue
Block a user