From 970e9e0843e4da51bb7bfb42b89c11d491883e5c Mon Sep 17 00:00:00 2001 From: Badlop Date: Wed, 16 Jul 2008 16:58:42 +0000 Subject: [PATCH] * 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 --- ChangeLog | 7 +++++++ src/Makefile.in | 11 +++++++++-- {include => src}/adhoc.hrl | 0 {include => src}/ejabberd.hrl | 0 src/ejabberd_auth_ldap.erl | 2 +- {include => src}/ejabberd_config.hrl | 0 {include => src}/ejabberd_ctl.hrl | 0 src/ejabberd_zlib/Makefile.in | 3 ++- src/eldap/Makefile.in | 3 ++- {include => src/eldap}/eldap.hrl | 0 {include => src}/jlib.hrl | 0 src/mod_irc/Makefile.in | 2 +- src/mod_muc/Makefile.in | 2 +- src/mod_offline.erl | 4 ++-- src/mod_offline_odbc.erl | 4 ++-- {include => src}/mod_privacy.hrl | 0 src/mod_proxy65/Makefile.in | 2 +- {include => src/mod_proxy65}/mod_proxy65.hrl | 0 src/mod_pubsub/Makefile.in | 2 +- {include => src/mod_pubsub}/pubsub.hrl | 0 src/mod_roster.erl | 4 ++-- {include => src}/mod_roster.hrl | 0 src/mod_roster_odbc.erl | 4 ++-- src/mod_shared_roster.erl | 4 ++-- src/mod_vcard_ldap.erl | 2 +- src/odbc/Makefile.in | 2 +- src/pam/Makefile.in | 2 +- src/stringprep/Makefile.in | 4 +++- src/tls/Makefile.in | 2 +- src/web/Makefile.in | 2 +- {include => src/web}/ejabberd_http.hrl | 0 {include => src/web}/ejabberd_web_admin.hrl | 0 32 files changed, 43 insertions(+), 25 deletions(-) rename {include => src}/adhoc.hrl (100%) rename {include => src}/ejabberd.hrl (100%) rename {include => src}/ejabberd_config.hrl (100%) rename {include => src}/ejabberd_ctl.hrl (100%) rename {include => src/eldap}/eldap.hrl (100%) rename {include => src}/jlib.hrl (100%) rename {include => src}/mod_privacy.hrl (100%) rename {include => src/mod_proxy65}/mod_proxy65.hrl (100%) rename {include => src/mod_pubsub}/pubsub.hrl (100%) rename {include => src}/mod_roster.hrl (100%) rename {include => src/web}/ejabberd_http.hrl (100%) rename {include => src/web}/ejabberd_web_admin.hrl (100%) diff --git a/ChangeLog b/ChangeLog index e2b10f71e..a14d930bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-07-16 Badlop + * 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 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 similarity index 100% rename from include/adhoc.hrl rename to src/adhoc.hrl diff --git a/include/ejabberd.hrl b/src/ejabberd.hrl similarity index 100% rename from include/ejabberd.hrl rename to 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 similarity index 100% rename from include/ejabberd_config.hrl rename to src/ejabberd_config.hrl diff --git a/include/ejabberd_ctl.hrl b/src/ejabberd_ctl.hrl similarity index 100% rename from include/ejabberd_ctl.hrl rename to 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 similarity index 100% rename from include/eldap.hrl rename to src/eldap/eldap.hrl diff --git a/include/jlib.hrl b/src/jlib.hrl similarity index 100% rename from include/jlib.hrl rename to 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 similarity index 100% rename from include/mod_privacy.hrl rename to 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 similarity index 100% rename from include/mod_proxy65.hrl rename to 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 similarity index 100% rename from include/pubsub.hrl rename to 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 similarity index 100% rename from include/mod_roster.hrl rename to 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 similarity index 100% rename from include/ejabberd_http.hrl rename to src/web/ejabberd_http.hrl diff --git a/include/ejabberd_web_admin.hrl b/src/web/ejabberd_web_admin.hrl similarity index 100% rename from include/ejabberd_web_admin.hrl rename to src/web/ejabberd_web_admin.hrl