* 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
2024-06-16 22:05:29 +02:00 · 2008-07-16 16:58:42 +00:00 · 2008-07-16 16:58:42 +00:00 · 970e9e0843
commit 970e9e0843
parent e0e7797e99
32 changed files with 43 additions and 25 deletions
--- a/7
+++ b/7
@ -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>
--- 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)
--- a/include/adhoc.hrl
+++ b/include/adhoc.hrl
--- a/include/ejabberd.hrl
+++ b/include/ejabberd.hrl
--- 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,
--- a/include/ejabberd_config.hrl
+++ b/include/ejabberd_config.hrl
--- a/include/ejabberd_ctl.hrl
+++ b/include/ejabberd_ctl.hrl
--- 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
--- 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
--- a/src/eldap/eldap.hrl
+++ b/src/eldap/eldap.hrl
--- a/include/jlib.hrl
+++ b/include/jlib.hrl
--- 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.
--- 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.
--- 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}).

--- 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}).

--- a/include/mod_privacy.hrl
+++ b/include/mod_privacy.hrl
--- 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.
--- a/src/mod_proxy65/mod_proxy65.hrl
+++ b/src/mod_proxy65/mod_proxy65.hrl
--- 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.
--- a/src/mod_pubsub/pubsub.hrl
+++ b/src/mod_pubsub/pubsub.hrl
--- 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) ->
--- a/include/mod_roster.hrl
+++ b/include/mod_roster.hrl
--- 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) ->
--- 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}).
--- 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).
--- 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.
--- 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.
--- 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
--- 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.
--- 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.
--- a/src/web/ejabberd_http.hrl
+++ b/src/web/ejabberd_http.hrl
--- a/src/web/ejabberd_web_admin.hrl
+++ b/src/web/ejabberd_web_admin.hrl