Changeset 0b9daac for protocols/msn

Timestamp:

2015-02-20T23:16:08Z (9 years ago)

Author:

dequis <dx@…>

Parents:

5ebff60

git-author:

dequis <dx@…> (27-12-14 04:06:45)

git-committer:

dequis <dx@…> (20-02-15 23:16:08)

Message:

Reorganize include files to avoid conflicts with other libs

• Change all header includes to be relative to the project root
• Remove -I${includedir} from bitlbee.pc Cflags
• Install lib and protocols headers to their own directories. So now it is:

/usr/include/bitlbee/*.h
/usr/include/bitlbee/lib/*.h
/usr/include/bitlbee/protocols/*.h

This breaks backwards compatibility of third party plugins, but now
they don't have to do ambiguous includes like #include <proxy.h>

This also fixes trac ticket 1170 - conflicts when libproxy and liboauth
are installed at the same time bitlbee is built, which the macports
project ran into several times.

Location:

protocols/msn

Files:

• msn.c (modified) (1 diff)
• msn_util.c (modified) (1 diff)
• ns.c (modified) (1 diff)
• sb.c (modified) (1 diff)
• soap.c (modified) (1 diff)
• soap.h (modified) (1 diff)
• tables.c (modified) (1 diff)

protocols/msn/msn.c

@@ -24 +24 @@
 */
 
-#include "nogaim.h"
+#include "protocols/nogaim.h"
 #include "soap.h"
 #include "msn.h"

protocols/msn/msn_util.c

@@ -24 +24 @@
 */
 
-#include "nogaim.h"
+#include "protocols/nogaim.h"
 #include "msn.h"
-#include "md5.h"
+#include "lib/md5.h"
 #include "soap.h"
 #include <ctype.h>

protocols/msn/ns.c

@@ -26 +26 @@
 #include <ctype.h>
 #include <sys/utsname.h>
-#include "nogaim.h"
+#include "protocols/nogaim.h"
 #include "msn.h"
-#include "md5.h"
-#include "sha1.h"
+#include "lib/md5.h"
+#include "lib/sha1.h"
 #include "soap.h"
-#include "xmltree.h"
+#include "lib/xmltree.h"
 
 static gboolean msn_ns_connected(gpointer data, gint source, b_input_condition cond);

protocols/msn/sb.c

@@ -25 +25 @@
 
 #include <ctype.h>
-#include "nogaim.h"
+#include "protocols/nogaim.h"
 #include "msn.h"
-#include "md5.h"
+#include "lib/md5.h"
 #include "soap.h"
 #include "invitation.h"

protocols/msn/soap.c

@@ -27 +27 @@
 */
 
-#include "http_client.h"
+#include "lib/http_client.h"
 #include "soap.h"
 #include "msn.h"
 #include "bitlbee.h"
-#include "url.h"
-#include "misc.h"
-#include "sha1.h"
-#include "base64.h"
-#include "xmltree.h"
+#include "lib/url.h"
+#include "lib/misc.h"
+#include "lib/sha1.h"
+#include "lib/base64.h"
+#include "lib/xmltree.h"
 #include <ctype.h>
 #include <errno.h>

protocols/msn/soap.h

@@ -40 +40 @@
 #include <arpa/inet.h>
 #include <unistd.h>
-#include "nogaim.h"
+#include "protocols/nogaim.h"
 
 

protocols/msn/tables.c

@@ -24 +24 @@
 */
 
-#include "nogaim.h"
+#include "protocols/nogaim.h"
 #include "msn.h"