* 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

diff --git a/ChangeLog b/ChangeLog
index e2b10f71e3f8441247a2d238105d570adf1e6024..a14d930bbc189f950df74d7a51732ab8b3fdc281 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 3d398f569c80f44cc0dcb4d27491afbe80b933e2..5dabf54317b980ff232db2095eee6b7710c3dd08 100644 (file)
--- 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 8cea87a816f14d4d97e8e3bb921abe5459066ff7..e22be1bc9dc785ec546ebee7645e1ce36bd37360 100644 (file)
--- 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 3a70186bd0c8156562625ef7a72e4ab60344f155..dd781d0aeb04860728d0d4baeb97a9d827388b25 100644 (file)
--- 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 4c9c33c2220f758e58db0a0557878a88b228ff94..22cdad48bd080da59142b31318e4a97495f08516 100644 (file)
--- 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 86212e45cba75409c56e03fa4b0f8a86fc9f2135..76a2d57f68a66817e0399661058651b5e6a32e5a 100644 (file)
--- 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 80725d33d90d7eefa5073bb6120aca06b9386d79..5ede5e521356605e2510c82ea31019fc826722ce 100644 (file)
--- 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 3db29844be21af3cb4e3498f0c139884af2da580..3a751c328fb0aed5b92a4d49a5602ff3708b0b5e 100644 (file)
--- 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 79d7c51ae82f4a177c718b6a4eeeb7fb458a9140..c3d0513d042275f93756ab23baa02660d1e70efe 100644 (file)
--- 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 62ae77c9fd502e27d67a596be60b8af5f62f73ff..3fc94c66227eafac8c333a4752d8f6540f1c1331 100644 (file)
--- 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 25dbf57a5ce592a330629c6ffcf3797e9f34467d..4088303cbfbdd9a20709bf3bb490762b92752fb5 100644 (file)
--- 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 c1569bb6137250a26532159835b9f71dca4ebea2..038de586a81b822a88c4eb48ee0495b551b1794d 100644 (file)
--- 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 dfb76dcbefcde105bf68de3d5bfafd53aa65a27a..d38121560ed324249879ac48c9f0ed81c889d2de 100644 (file)
--- 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 f363bd22ef375e892a75a3711eae7318b43b5697..ff378010d56364e1f6302c8c8d6d26daf7a85ff4 100644 (file)
--- 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 2225f7c86d45844790e16bdad205a8b5971abe6f..2b5e7faac83155306e193bf239a7f21694080003 100644 (file)
--- 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 5bd130b6ea26107fc8f55f0a23b0865d94bb19e1..3f4898d3ae0fdf7af8238ef50f1f389fb613c1d9 100644 (file)
--- 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 57c1ab78af3f028c551439bb7c31a6641024e696..bde289402b9342769f795cb765a1e8114a0b8d32 100644 (file)
--- 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 248aee69364ec52809776643ec955bf1820e6c78..3ac6c24db1418dadbad89c2ec64de4d3cb2671af 100644 (file)
--- 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 db4a874e16ce60845b5a1a7ad0c57a3225560654..b6f10efc2640780142bd45e487d96d2cb528410a 100644 (file)
--- 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 3a75f7e17377f4360d4a9fd137eb58b2c7485d3b..151f4c476537758bab0f8abecb063484277bd5de 100644 (file)
--- 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