Changeset 0b9daac for protocols/twitter

Timestamp:

2015-02-20T23:16:08Z (10 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/twitter

Files:

• twitter.c (modified) (1 diff)
• twitter.h (modified) (1 diff)
• twitter_http.c (modified) (1 diff)
• twitter_http.h (modified) (1 diff)
• twitter_lib.c (modified) (1 diff)
• twitter_lib.h (modified) (1 diff)

protocols/twitter/twitter.c

@@ -23 +23 @@
 ****************************************************************************/
 
-#include "nogaim.h"
-#include "oauth.h"
+#include "protocols/nogaim.h"
+#include "lib/oauth.h"
 #include "twitter.h"
 #include "twitter_http.h"
 #include "twitter_lib.h"
-#include "url.h"
+#include "lib/url.h"
 
 GSList *twitter_connections = NULL;

protocols/twitter/twitter.h

@@ -23 +23 @@
 ****************************************************************************/
 
-#include "nogaim.h"
+#include "protocols/nogaim.h"
 
 #ifndef _TWITTER_H

protocols/twitter/twitter_http.c

@@ -31 +31 @@
 #include "twitter.h"
 #include "bitlbee.h"
-#include "url.h"
-#include "misc.h"
-#include "base64.h"
-#include "oauth.h"
+#include "lib/url.h"
+#include "lib/misc.h"
+#include "lib/base64.h"
+#include "lib/oauth.h"
 #include <ctype.h>
 #include <errno.h>

protocols/twitter/twitter_http.h

@@ -25 +25 @@
 #define _TWITTER_HTTP_H
 
-#include "nogaim.h"
-#include "http_client.h"
+#include "protocols/nogaim.h"
+#include "lib/http_client.h"
 
 typedef enum {

protocols/twitter/twitter_lib.c

@@ -32 +32 @@
 #include "twitter.h"
 #include "bitlbee.h"
-#include "url.h"
-#include "misc.h"
-#include "base64.h"
+#include "lib/url.h"
+#include "lib/misc.h"
+#include "lib/base64.h"
 #include "twitter_lib.h"
-#include "json_util.h"
+#include "lib/json_util.h"
 #include <ctype.h>
 #include <errno.h>

protocols/twitter/twitter_lib.h

@@ -26 +26 @@
 #define _TWITTER_LIB_H
 
-#include "nogaim.h"
+#include "protocols/nogaim.h"
 #include "twitter_http.h"