diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/Makefile.in | 11 | ||||
| -rw-r--r-- | src/adhoc.hrl (renamed from include/adhoc.hrl) | 0 | ||||
| -rw-r--r-- | src/ejabberd.hrl (renamed from include/ejabberd.hrl) | 0 | ||||
| -rw-r--r-- | src/ejabberd_auth_ldap.erl | 2 | ||||
| -rw-r--r-- | src/ejabberd_config.hrl (renamed from include/ejabberd_config.hrl) | 0 | ||||
| -rw-r--r-- | src/ejabberd_ctl.hrl (renamed from include/ejabberd_ctl.hrl) | 0 | ||||
| -rw-r--r-- | src/ejabberd_zlib/Makefile.in | 3 | ||||
| -rw-r--r-- | src/eldap/Makefile.in | 3 | ||||
| -rw-r--r-- | src/eldap/eldap.hrl (renamed from include/eldap.hrl) | 0 | ||||
| -rw-r--r-- | src/jlib.hrl (renamed from include/jlib.hrl) | 0 | ||||
| -rw-r--r-- | src/mod_irc/Makefile.in | 2 | ||||
| -rw-r--r-- | src/mod_muc/Makefile.in | 2 | ||||
| -rw-r--r-- | src/mod_offline.erl | 4 | ||||
| -rw-r--r-- | src/mod_offline_odbc.erl | 4 | ||||
| -rw-r--r-- | src/mod_privacy.hrl (renamed from include/mod_privacy.hrl) | 0 | ||||
| -rw-r--r-- | src/mod_proxy65/Makefile.in | 2 | ||||
| -rw-r--r-- | src/mod_proxy65/mod_proxy65.hrl (renamed from include/mod_proxy65.hrl) | 0 | ||||
| -rw-r--r-- | src/mod_pubsub/Makefile.in | 2 | ||||
| -rw-r--r-- | src/mod_pubsub/pubsub.hrl (renamed from include/pubsub.hrl) | 0 | ||||
| -rw-r--r-- | src/mod_roster.erl | 4 | ||||
| -rw-r--r-- | src/mod_roster.hrl (renamed from include/mod_roster.hrl) | 0 | ||||
| -rw-r--r-- | src/mod_roster_odbc.erl | 4 | ||||
| -rw-r--r-- | src/mod_shared_roster.erl | 4 | ||||
| -rw-r--r-- | src/mod_vcard_ldap.erl | 2 | ||||
| -rw-r--r-- | src/odbc/Makefile.in | 2 | ||||
| -rw-r--r-- | src/pam/Makefile.in | 2 | ||||
| -rw-r--r-- | src/stringprep/Makefile.in | 4 | ||||
| -rw-r--r-- | src/tls/Makefile.in | 2 | ||||
| -rw-r--r-- | src/web/Makefile.in | 2 | ||||
| -rw-r--r-- | src/web/ejabberd_http.hrl (renamed from include/ejabberd_http.hrl) | 0 | ||||
| -rw-r--r-- | src/web/ejabberd_web_admin.hrl (renamed from include/ejabberd_web_admin.hrl) | 0 |
32 files changed, 43 insertions, 25 deletions
@@ -1,5 +1,12 @@ 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 2008-07-15 Badlop <badlop@process-one.net> diff --git a/src/Makefile.in b/src/Makefile.in index 3d398f569..5dabf5431 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -29,7 +29,6 @@ else endif EFLAGS += @ERLANG_SSL39@ -EFLAGS += -I ../include # make debug=true to compile Erlang module with debug informations. ifdef debug @@ -189,7 +188,15 @@ install: all # # ejabberd header files 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 install -d $(PBINDIR) diff --git a/include/adhoc.hrl b/src/adhoc.hrl index 5dbc515bc..5dbc515bc 100644 --- a/include/adhoc.hrl +++ b/src/adhoc.hrl diff --git a/include/ejabberd.hrl b/src/ejabberd.hrl index d7b16f1e2..d7b16f1e2 100644 --- a/include/ejabberd.hrl +++ b/src/ejabberd.hrl diff --git a/src/ejabberd_auth_ldap.erl b/src/ejabberd_auth_ldap.erl index 8cea87a81..e22be1bc9 100644 --- a/src/ejabberd_auth_ldap.erl +++ b/src/ejabberd_auth_ldap.erl @@ -58,7 +58,7 @@ ]). -include("ejabberd.hrl"). --include("eldap.hrl"). +-include("eldap/eldap.hrl"). -record(state, {host, eldap_id, diff --git a/include/ejabberd_config.hrl b/src/ejabberd_config.hrl index aa783ea5e..aa783ea5e 100644 --- a/include/ejabberd_config.hrl +++ b/src/ejabberd_config.hrl diff --git a/include/ejabberd_ctl.hrl b/src/ejabberd_ctl.hrl index e8daef90b..e8daef90b 100644 --- a/include/ejabberd_ctl.hrl +++ b/src/ejabberd_ctl.hrl diff --git a/src/ejabberd_zlib/Makefile.in b/src/ejabberd_zlib/Makefile.in index 3a70186bd..dd781d0ae 100644 --- a/src/ejabberd_zlib/Makefile.in +++ b/src/ejabberd_zlib/Makefile.in @@ -19,8 +19,9 @@ else DYNAMIC_LIB_CFLAGS = -fpic -shared endif -EFLAGS += -I ../../include +EFLAGS += -I .. EFLAGS += -pz .. + # make debug=true to compile Erlang module with debug informations. ifdef debug EFLAGS+=+debug_info diff --git a/src/eldap/Makefile.in b/src/eldap/Makefile.in index 4c9c33c22..22cdad48b 100644 --- a/src/eldap/Makefile.in +++ b/src/eldap/Makefile.in @@ -9,8 +9,9 @@ LIBS = @LIBS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_LIBS = @ERLANG_LIBS@ -EFLAGS += -I ../../include +EFLAGS += -I .. EFLAGS += -pz .. + # make debug=true to compile Erlang module with debug informations. ifdef debug EFLAGS+=+debug_info diff --git a/include/eldap.hrl b/src/eldap/eldap.hrl index 75f6f76ef..75f6f76ef 100644 --- a/include/eldap.hrl +++ b/src/eldap/eldap.hrl diff --git a/include/jlib.hrl b/src/jlib.hrl index 3ea10b157..3ea10b157 100644 --- a/include/jlib.hrl +++ b/src/jlib.hrl diff --git a/src/mod_irc/Makefile.in b/src/mod_irc/Makefile.in index 86212e45c..76a2d57f6 100644 --- a/src/mod_irc/Makefile.in +++ b/src/mod_irc/Makefile.in @@ -16,7 +16,7 @@ else DYNAMIC_LIB_CFLAGS = -fpic -shared endif -EFLAGS += -I ../../include +EFLAGS += -I .. EFLAGS += -pz .. # make debug=true to compile Erlang module with debug informations. diff --git a/src/mod_muc/Makefile.in b/src/mod_muc/Makefile.in index 80725d33d..5ede5e521 100644 --- a/src/mod_muc/Makefile.in +++ b/src/mod_muc/Makefile.in @@ -9,7 +9,7 @@ LIBS = @LIBS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_LIBS = @ERLANG_LIBS@ -EFLAGS += -I ../../include +EFLAGS += -I .. EFLAGS += -pz .. # make debug=true to compile Erlang module with debug informations. diff --git a/src/mod_offline.erl b/src/mod_offline.erl index 3db29844b..3a751c328 100644 --- a/src/mod_offline.erl +++ b/src/mod_offline.erl @@ -43,8 +43,8 @@ -include("ejabberd.hrl"). -include("jlib.hrl"). --include("ejabberd_http.hrl"). --include("ejabberd_web_admin.hrl"). +-include("web/ejabberd_http.hrl"). +-include("web/ejabberd_web_admin.hrl"). -record(offline_msg, {us, timestamp, expire, from, to, packet}). diff --git a/src/mod_offline_odbc.erl b/src/mod_offline_odbc.erl index 79d7c51ae..c3d0513d0 100644 --- a/src/mod_offline_odbc.erl +++ b/src/mod_offline_odbc.erl @@ -42,8 +42,8 @@ -include("ejabberd.hrl"). -include("jlib.hrl"). --include("ejabberd_http.hrl"). --include("ejabberd_web_admin.hrl"). +-include("web/ejabberd_http.hrl"). +-include("web/ejabberd_web_admin.hrl"). -record(offline_msg, {user, timestamp, expire, from, to, packet}). diff --git a/include/mod_privacy.hrl b/src/mod_privacy.hrl index 21ad1c961..21ad1c961 100644 --- a/include/mod_privacy.hrl +++ b/src/mod_privacy.hrl diff --git a/src/mod_proxy65/Makefile.in b/src/mod_proxy65/Makefile.in index 62ae77c9f..3fc94c662 100644 --- a/src/mod_proxy65/Makefile.in +++ b/src/mod_proxy65/Makefile.in @@ -9,7 +9,7 @@ LIBS = @LIBS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_LIBS = @ERLANG_LIBS@ -EFLAGS += -I ../../include +EFLAGS += -I .. EFLAGS += -pz .. # make debug=true to compile Erlang module with debug informations. diff --git a/include/mod_proxy65.hrl b/src/mod_proxy65/mod_proxy65.hrl index 66cb86f42..66cb86f42 100644 --- a/include/mod_proxy65.hrl +++ b/src/mod_proxy65/mod_proxy65.hrl diff --git a/src/mod_pubsub/Makefile.in b/src/mod_pubsub/Makefile.in index 25dbf57a5..4088303cb 100644 --- a/src/mod_pubsub/Makefile.in +++ b/src/mod_pubsub/Makefile.in @@ -9,7 +9,7 @@ LIBS = @LIBS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_LIBS = @ERLANG_LIBS@ -EFLAGS += -I ../../include +EFLAGS += -I .. EFLAGS += -pz .. # make debug=true to compile Erlang module with debug informations. diff --git a/include/pubsub.hrl b/src/mod_pubsub/pubsub.hrl index 25f60c36d..25f60c36d 100644 --- a/include/pubsub.hrl +++ b/src/mod_pubsub/pubsub.hrl diff --git a/src/mod_roster.erl b/src/mod_roster.erl index c1569bb61..038de586a 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -47,8 +47,8 @@ -include("ejabberd.hrl"). -include("jlib.hrl"). -include("mod_roster.hrl"). --include("ejabberd_http.hrl"). --include("ejabberd_web_admin.hrl"). +-include("web/ejabberd_http.hrl"). +-include("web/ejabberd_web_admin.hrl"). start(Host, Opts) -> diff --git a/include/mod_roster.hrl b/src/mod_roster.hrl index 2a2e8bc72..2a2e8bc72 100644 --- a/include/mod_roster.hrl +++ b/src/mod_roster.hrl diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl index dfb76dcbe..d38121560 100644 --- a/src/mod_roster_odbc.erl +++ b/src/mod_roster_odbc.erl @@ -46,8 +46,8 @@ -include("ejabberd.hrl"). -include("jlib.hrl"). -include("mod_roster.hrl"). --include("ejabberd_http.hrl"). --include("ejabberd_web_admin.hrl"). +-include("web/ejabberd_http.hrl"). +-include("web/ejabberd_web_admin.hrl"). start(Host, Opts) -> diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl index f363bd22e..ff378010d 100644 --- a/src/mod_shared_roster.erl +++ b/src/mod_shared_roster.erl @@ -52,8 +52,8 @@ -include("ejabberd.hrl"). -include("jlib.hrl"). -include("mod_roster.hrl"). --include("ejabberd_http.hrl"). --include("ejabberd_web_admin.hrl"). +-include("web/ejabberd_http.hrl"). +-include("web/ejabberd_web_admin.hrl"). -record(sr_group, {group_host, opts}). -record(sr_user, {us, group_host}). diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl index 2225f7c86..2b5e7faac 100644 --- a/src/mod_vcard_ldap.erl +++ b/src/mod_vcard_ldap.erl @@ -50,7 +50,7 @@ ]). -include("ejabberd.hrl"). --include("eldap.hrl"). +-include("eldap/eldap.hrl"). -include("jlib.hrl"). -define(PROCNAME, ejabberd_mod_vcard_ldap). diff --git a/src/odbc/Makefile.in b/src/odbc/Makefile.in index 5bd130b6e..3f4898d3a 100644 --- a/src/odbc/Makefile.in +++ b/src/odbc/Makefile.in @@ -9,7 +9,7 @@ LIBS = @LIBS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_LIBS = @ERLANG_LIBS@ -EFLAGS += -I ../../include +EFLAGS += -I .. EFLAGS += -pz .. # make debug=true to compile Erlang module with debug informations. diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in index 57c1ab78a..bde289402 100644 --- a/src/pam/Makefile.in +++ b/src/pam/Makefile.in @@ -9,7 +9,7 @@ LIBS = @LIBS@ @PAM_LIBS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_LIBS = @ERLANG_LIBS@ -EFLAGS += -I ../../include +EFLAGS += -I .. EFLAGS += -pz .. # make debug=true to compile Erlang module with debug informations. diff --git a/src/stringprep/Makefile.in b/src/stringprep/Makefile.in index 248aee693..3ac6c24db 100644 --- a/src/stringprep/Makefile.in +++ b/src/stringprep/Makefile.in @@ -16,7 +16,9 @@ else DYNAMIC_LIB_CFLAGS = -fpic -shared endif -EFLAGS = -I .. -pz .. +EFLAGS += -I .. +EFLAGS += -pz .. + # make debug=true to compile Erlang module with debug informations. ifdef debug EFLAGS+=+debug_info diff --git a/src/tls/Makefile.in b/src/tls/Makefile.in index db4a874e1..b6f10efc2 100644 --- a/src/tls/Makefile.in +++ b/src/tls/Makefile.in @@ -19,7 +19,7 @@ else DYNAMIC_LIB_CFLAGS = -fpic -shared endif -EFLAGS += -I ../../include +EFLAGS += -I .. EFLAGS += -pz .. # make debug=true to compile Erlang module with debug informations. diff --git a/src/web/Makefile.in b/src/web/Makefile.in index 3a75f7e17..151f4c476 100644 --- a/src/web/Makefile.in +++ b/src/web/Makefile.in @@ -9,7 +9,7 @@ LIBS = @LIBS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_LIBS = @ERLANG_LIBS@ -EFLAGS += -I ../../include +EFLAGS += -I .. EFLAGS += -pz .. # make debug=true to compile Erlang module with debug informations. diff --git a/include/ejabberd_http.hrl b/src/web/ejabberd_http.hrl index 4bcf047ec..4bcf047ec 100644 --- a/include/ejabberd_http.hrl +++ b/src/web/ejabberd_http.hrl diff --git a/include/ejabberd_web_admin.hrl b/src/web/ejabberd_web_admin.hrl index 7c37d076f..7c37d076f 100644 --- a/include/ejabberd_web_admin.hrl +++ b/src/web/ejabberd_web_admin.hrl |