Changeset 0b9daac for protocols/yahoo

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/yahoo

Files:

• libyahoo2.c (modified) (2 diffs)
• yahoo.c (modified) (1 diff)

protocols/yahoo/libyahoo2.c

@@ -76 +76 @@
 #include <ctype.h>
 
-#include "sha1.h"
-#include "md5.h"
+#include "lib/sha1.h"
+#include "lib/md5.h"
 #include "yahoo2.h"
 #include "yahoo_httplib.h"
@@ -89 +89 @@
 #endif
 
-#include "base64.h"
-#include "http_client.h"
+#include "lib/base64.h"
+#include "lib/http_client.h"
 
 #ifdef USE_STRUCT_CALLBACKS

protocols/yahoo/yahoo.c

@@ -28 +28 @@
 #include <sys/stat.h>
 #include <ctype.h>
-#include "nogaim.h"
+#include "protocols/nogaim.h"
 #include "yahoo2.h"
 #include "yahoo2_callbacks.h"