Changeset 0b9daac for lib

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:

lib

Files:

• arc.c (modified) (1 diff)
• base64.c (modified) (1 diff)
• events_glib.c (modified) (1 diff)
• events_libevent.c (modified) (1 diff)
• http_client.c (modified) (1 diff)
• http_client.h (modified) (1 diff)
• json.c (modified) (1 diff)
• json_util.c (modified) (1 diff)
• json_util.h (modified) (1 diff)
• md5.c (modified) (1 diff)
• misc.c (modified) (2 diffs)
• oauth.c (modified) (1 diff)
• oauth2.c (modified) (1 diff)
• proxy.c (modified) (1 diff)
• proxy.h (modified) (1 diff)
• sha1.c (modified) (1 diff)
• ssl_client.h (modified) (1 diff)
• ssl_gnutls.c (modified) (1 diff)
• ssl_nss.c (modified) (1 diff)
• ssl_openssl.c (modified) (1 diff)
• url.c (modified) (1 diff)
• xmltree.c (modified) (1 diff)

lib/arc.c

@@ -45 +45 @@
 #include <stdlib.h>
 #include <string.h>
-#include "misc.h"
-#include "arc.h"
+#include "lib/misc.h"
+#include "lib/arc.h"
 
 /* Add some seed to the password, to make sure we *never* use the same key.

lib/base64.c

@@ -25 +25 @@
 #include <glib.h>
 #include <string.h>
-#include "base64.h"
+#include "lib/base64.h"
 
 char *tobase64(const char *text)

lib/events_glib.c

@@ -38 +38 @@
 #include <fcntl.h>
 #include <errno.h>
-#include "proxy.h"
+#include "lib/proxy.h"
 
 typedef struct _GaimIOClosure {

lib/events_libevent.c

@@ -34 +34 @@
 #include <sys/time.h>
 #include <event.h>
-#include "proxy.h"
+#include "lib/proxy.h"
 
 static void b_main_restart();

lib/http_client.c

@@ -27 +27 @@
 #include <stdio.h>
 
-#include "http_client.h"
-#include "url.h"
+#include "lib/http_client.h"
+#include "lib/url.h"
 #include "sock.h"
 

lib/http_client.h

@@ -34 +34 @@
 
 #include <glib.h>
-#include "ssl_client.h"
+#include "lib/ssl_client.h"
 
 struct http_request;

lib/json.c

@@ -30 +30 @@
 #include <glib.h>
 
-#include "json.h"
+#include "lib/json.h"
 
 #ifdef _MSC_VER

lib/json_util.c

@@ -26 +26 @@
 #include <glib.h>
 
-#include "json_util.h"
+#include "lib/json_util.h"
 
 json_value *json_o_get(const json_value *obj, const json_char *name)

lib/json_util.h

@@ -22 +22 @@
 ****************************************************************************/
 
-#include "json.h"
+#include "lib/json.h"
 
 #define JSON_O_FOREACH(o, k, v) \

lib/md5.c

@@ -1 @@
-#include "md5.h"
+#include "lib/md5.h"
 
 /* Creates a new GChecksum in ctx */

lib/misc.c

@@ -32 +32 @@
 
 #define BITLBEE_CORE
-#include "nogaim.h"
-#include "base64.h"
-#include "md5.h"
+#include "protocols/nogaim.h"
+#include "lib/base64.h"
+#include "lib/md5.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -47 +47 @@
 #endif
 
-#include "md5.h"
-#include "ssl_client.h"
+#include "lib/md5.h"
+#include "lib/ssl_client.h"
 
 void strip_linefeed(gchar *text)

lib/oauth.c

@@ -26 +26 @@
 #include <stdlib.h>
 #include <string.h>
-#include "http_client.h"
-#include "base64.h"
-#include "misc.h"
-#include "sha1.h"
-#include "url.h"
-#include "oauth.h"
+#include "lib/http_client.h"
+#include "lib/base64.h"
+#include "lib/misc.h"
+#include "lib/sha1.h"
+#include "lib/url.h"
+#include "lib/oauth.h"
 
 #define HMAC_BLOCK_SIZE 64

lib/oauth2.c

@@ -39 +39 @@
 
 #include <glib.h>
-#include "http_client.h"
-#include "oauth2.h"
-#include "oauth.h"
-#include "json.h"
-#include "json_util.h"
-#include "url.h"
+#include "lib/http_client.h"
+#include "lib/oauth2.h"
+#include "lib/oauth.h"
+#include "lib/json.h"
+#include "lib/json_util.h"
+#include "lib/url.h"
 
 char *oauth2_url(const struct oauth2_service *sp)

lib/proxy.c

@@ -33 +33 @@
 #include <fcntl.h>
 #include <errno.h>
-#include "nogaim.h"
-#include "proxy.h"
-#include "base64.h"
+#include "protocols/nogaim.h"
+#include "lib/proxy.h"
+#include "lib/base64.h"
 
 char proxyhost[128] = "";

lib/proxy.h

@@ -34 +34 @@
 #include <gmodule.h>
 
-#include "events.h"
+#include "lib/events.h"
 
 #define PROXY_NONE 0

lib/sha1.c

@@ -1 @@
-#include "sha1.h"
+#include "lib/sha1.h"
 #include <string.h>
 #include <stdio.h>
+
 
 

lib/ssl_client.h

@@ -33 +33 @@
 
 #include <glib.h>
-#include "proxy.h"
+#include "lib/proxy.h"
 
 /* Some generic error codes. Especially SSL_AGAIN is important if you

lib/ssl_gnutls.c

@@ -29 +29 @@
 #include <fcntl.h>
 #include <unistd.h>
-#include "proxy.h"
-#include "ssl_client.h"
+#include "lib/proxy.h"
+#include "lib/ssl_client.h"
 #include "sock.h"
 #include "stdlib.h"

lib/ssl_nss.c

@@ -27 +27 @@
 
 #include "bitlbee.h"
-#include "proxy.h"
-#include "ssl_client.h"
+#include "lib/proxy.h"
+#include "lib/ssl_client.h"
 #include "sock.h"
 #include <nspr.h>

lib/ssl_openssl.c

@@ -32 +32 @@
 
 #include "bitlbee.h"
-#include "proxy.h"
-#include "ssl_client.h"
+#include "lib/proxy.h"
+#include "lib/ssl_client.h"
 #include "sock.h"
 

lib/url.c

@@ -24 +24 @@
 */
 
-#include "url.h"
+#include "lib/url.h"
 
 /* Convert an URL to a url_t structure */

lib/xmltree.c

@@ -28 +28 @@
 #include <stdio.h>
 
-#include "xmltree.h"
+#include "lib/xmltree.h"
 
 #define g_strcasecmp g_ascii_strcasecmp