Changeset 0b9daac


Ignore:
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.

Files:
86 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r5ebff60 r0b9daac  
    1111# Program variables
    1212objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o $(OTR_BI) query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o conf.o log.o
    13 headers = $(wildcard $(_SRCDIR_)*.h $(_SRCDIR_)lib/*.h $(_SRCDIR_)protocols/*.h)
     13headers = $(foreach dir,./ ./lib/ ./protocols/,$(patsubst $(_SRCDIR_)%,%,$(wildcard $(_SRCDIR_)$(dir)*.h)))
    1414subdirs = lib protocols
    1515
    … …  
    9292
    9393install-dev:
    94         mkdir -p $(DESTDIR)$(INCLUDEDIR)
     94        mkdir -p $(DESTDIR)$(INCLUDEDIR) $(DESTDIR)$(INCLUDEDIR)lib $(DESTDIR)$(INCLUDEDIR)protocols
    9595        $(INSTALL) -m 0644 config.h $(DESTDIR)$(INCLUDEDIR)
    96         for i in $(headers); do $(INSTALL) -m 0644 $$i $(DESTDIR)$(INCLUDEDIR); done
     96        for i in $(headers); do $(INSTALL) -m 0644 $(_SRCDIR_)$$i $(DESTDIR)$(INCLUDEDIR)$$i; done
    9797        mkdir -p $(DESTDIR)$(PCDIR)
    9898        $(INSTALL) -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
    9999
    100100uninstall-dev:
    101         rm -f $(foreach hdr,$(headers),$(DESTDIR)$(INCLUDEDIR)/$(hdr))
    102         -rmdir $(DESTDIR)$(INCLUDEDIR)
     101        rm -f $(foreach hdr,$(headers),$(DESTDIR)$(INCLUDEDIR)$(hdr))
     102        -rmdir $(DESTDIR)$(INCLUDEDIR)lib $(DESTDIR)$(INCLUDEDIR)protocols $(DESTDIR)$(INCLUDEDIR)
    103103        rm -f $(DESTDIR)$(PCDIR)/bitlbee.pc
    104104

  • bitlbee.h

    r5ebff60 r0b9daac  
    4444
    4545#if HAVE_CONFIG_H
    46 #include <config.h>
     46#include "config.h"
    4747#endif
    4848
    … …  
    132132#define PASSWORD_PENDING "\r\rchangeme\r\r"
    133133
    134 #include "bee.h"
     134#include "protocols/bee.h"
    135135#include "irc.h"
    136136#include "storage.h"
    137137#include "set.h"
    138 #include "nogaim.h"
     138#include "protocols/nogaim.h"
    139139#include "commands.h"
    140 #include "account.h"
     140#include "protocols/account.h"
    141141#include "nick.h"
    142142#include "conf.h"
    143143#include "log.h"
    144 #include "ini.h"
     144#include "lib/ini.h"
    145145#include "query.h"
    146146#include "sock.h"
    147 #include "misc.h"
    148 #include "proxy.h"
     147#include "lib/misc.h"
     148#include "lib/proxy.h"
    149149
    150150typedef struct global {

  • conf.c

    r5ebff60 r0b9daac  
    3030#include <stdlib.h>
    3131#include "conf.h"
    32 #include "ini.h"
    33 #include "url.h"
     32#include "lib/ini.h"
     33#include "lib/url.h"
    3434#include "ipc.h"
    3535
    36 #include "proxy.h"
     36#include "lib/proxy.h"
    3737
    3838static int conf_loadini(conf_t *conf, char *file);

  • configure

    r5ebff60 r0b9daac  
    231231
    232232echo CFLAGS=$CFLAGS $CPPFLAGS >> Makefile.settings
    233 echo CFLAGS+=-I${srcdir} -I${srcdir}/lib -I${srcdir}/protocols -I. >> Makefile.settings
     233echo CFLAGS+=-I${srcdir} >> Makefile.settings
    234234
    235235echo CFLAGS+=-DHAVE_CONFIG_H -D_GNU_SOURCE >> Makefile.settings
    … …  
    707707Version: $BITLBEE_VERSION
    708708Libs:
    709 Cflags: -I\${includedir}
     709Cflags:
    710710
    711711EOF

  • dcc.c

    r5ebff60 r0b9daac  
    2424#define BITLBEE_CORE
    2525#include "bitlbee.h"
    26 #include "ft.h"
     26#include "protocols/ft.h"
    2727#include "dcc.h"
    2828#include <netinet/tcp.h>

  • lib/arc.c

    r5ebff60 r0b9daac  
    4545#include <stdlib.h>
    4646#include <string.h>
    47 #include "misc.h"
    48 #include "arc.h"
     47#include "lib/misc.h"
     48#include "lib/arc.h"
    4949
    5050/* Add some seed to the password, to make sure we *never* use the same key.

  • lib/base64.c

    r5ebff60 r0b9daac  
    2525#include <glib.h>
    2626#include <string.h>
    27 #include "base64.h"
     27#include "lib/base64.h"
    2828
    2929char *tobase64(const char *text)

  • lib/events_glib.c

    r5ebff60 r0b9daac  
    3838#include <fcntl.h>
    3939#include <errno.h>
    40 #include "proxy.h"
     40#include "lib/proxy.h"
    4141
    4242typedef struct _GaimIOClosure {

  • lib/events_libevent.c

    r5ebff60 r0b9daac  
    3434#include <sys/time.h>
    3535#include <event.h>
    36 #include "proxy.h"
     36#include "lib/proxy.h"
    3737
    3838static void b_main_restart();

  • lib/http_client.c

    r5ebff60 r0b9daac  
    2727#include <stdio.h>
    2828
    29 #include "http_client.h"
    30 #include "url.h"
     29#include "lib/http_client.h"
     30#include "lib/url.h"
    3131#include "sock.h"
    3232

  • lib/http_client.h

    r5ebff60 r0b9daac  
    3434
    3535#include <glib.h>
    36 #include "ssl_client.h"
     36#include "lib/ssl_client.h"
    3737
    3838struct http_request;

  • lib/json.c

    r5ebff60 r0b9daac  
    3030#include <glib.h>
    3131
    32 #include "json.h"
     32#include "lib/json.h"
    3333
    3434#ifdef _MSC_VER

  • lib/json_util.c

    r5ebff60 r0b9daac  
    2626#include <glib.h>
    2727
    28 #include "json_util.h"
     28#include "lib/json_util.h"
    2929
    3030json_value *json_o_get(const json_value *obj, const json_char *name)

  • lib/json_util.h

    r5ebff60 r0b9daac  
    2222****************************************************************************/
    2323
    24 #include "json.h"
     24#include "lib/json.h"
    2525
    2626#define JSON_O_FOREACH(o, k, v) \

  • lib/md5.c

    r5ebff60 r0b9daac  
    1 #include "md5.h"
     1#include "lib/md5.h"
    22
    33/* Creates a new GChecksum in ctx */

  • lib/misc.c

    r5ebff60 r0b9daac  
    3232
    3333#define BITLBEE_CORE
    34 #include "nogaim.h"
    35 #include "base64.h"
    36 #include "md5.h"
     34#include "protocols/nogaim.h"
     35#include "lib/base64.h"
     36#include "lib/md5.h"
    3737#include <stdio.h>
    3838#include <stdlib.h>
    … …  
    4747#endif
    4848
    49 #include "md5.h"
    50 #include "ssl_client.h"
     49#include "lib/md5.h"
     50#include "lib/ssl_client.h"
    5151
    5252void strip_linefeed(gchar *text)

  • lib/oauth.c

    r5ebff60 r0b9daac  
    2626#include <stdlib.h>
    2727#include <string.h>
    28 #include "http_client.h"
    29 #include "base64.h"
    30 #include "misc.h"
    31 #include "sha1.h"
    32 #include "url.h"
    33 #include "oauth.h"
     28#include "lib/http_client.h"
     29#include "lib/base64.h"
     30#include "lib/misc.h"
     31#include "lib/sha1.h"
     32#include "lib/url.h"
     33#include "lib/oauth.h"
    3434
    3535#define HMAC_BLOCK_SIZE 64

  • lib/oauth2.c

    r5ebff60 r0b9daac  
    3939
    4040#include <glib.h>
    41 #include "http_client.h"
    42 #include "oauth2.h"
    43 #include "oauth.h"
    44 #include "json.h"
    45 #include "json_util.h"
    46 #include "url.h"
     41#include "lib/http_client.h"
     42#include "lib/oauth2.h"
     43#include "lib/oauth.h"
     44#include "lib/json.h"
     45#include "lib/json_util.h"
     46#include "lib/url.h"
    4747
    4848char *oauth2_url(const struct oauth2_service *sp)

  • lib/proxy.c

    r5ebff60 r0b9daac  
    3333#include <fcntl.h>
    3434#include <errno.h>
    35 #include "nogaim.h"
    36 #include "proxy.h"
    37 #include "base64.h"
     35#include "protocols/nogaim.h"
     36#include "lib/proxy.h"
     37#include "lib/base64.h"
    3838
    3939char proxyhost[128] = "";

  • lib/proxy.h

    r5ebff60 r0b9daac  
    3434#include <gmodule.h>
    3535
    36 #include "events.h"
     36#include "lib/events.h"
    3737
    3838#define PROXY_NONE 0

  • lib/sha1.c

    r5ebff60 r0b9daac  
    1 #include "sha1.h"
     1#include "lib/sha1.h"
    22#include <string.h>
    33#include <stdio.h>
     4
    45
    56

  • lib/ssl_client.h

    r5ebff60 r0b9daac  
    3333
    3434#include <glib.h>
    35 #include "proxy.h"
     35#include "lib/proxy.h"
    3636
    3737/* Some generic error codes. Especially SSL_AGAIN is important if you

  • lib/ssl_gnutls.c

    r5ebff60 r0b9daac  
    2929#include <fcntl.h>
    3030#include <unistd.h>
    31 #include "proxy.h"
    32 #include "ssl_client.h"
     31#include "lib/proxy.h"
     32#include "lib/ssl_client.h"
    3333#include "sock.h"
    3434#include "stdlib.h"

  • lib/ssl_nss.c

    r5ebff60 r0b9daac  
    2727
    2828#include "bitlbee.h"
    29 #include "proxy.h"
    30 #include "ssl_client.h"
     29#include "lib/proxy.h"
     30#include "lib/ssl_client.h"
    3131#include "sock.h"
    3232#include <nspr.h>

  • lib/ssl_openssl.c

    r5ebff60 r0b9daac  
    3232
    3333#include "bitlbee.h"
    34 #include "proxy.h"
    35 #include "ssl_client.h"
     34#include "lib/proxy.h"
     35#include "lib/ssl_client.h"
    3636#include "sock.h"
    3737

  • lib/url.c

    r5ebff60 r0b9daac  
    2424*/
    2525
    26 #include "url.h"
     26#include "lib/url.h"
    2727
    2828/* Convert an URL to a url_t structure */

  • lib/xmltree.c

    r5ebff60 r0b9daac  
    2828#include <stdio.h>
    2929
    30 #include "xmltree.h"
     30#include "lib/xmltree.h"
    3131
    3232#define g_strcasecmp g_ascii_strcasecmp

  • protocols/account.c

    r5ebff60 r0b9daac  
    2626#define BITLBEE_CORE
    2727#include "bitlbee.h"
    28 #include "account.h"
     28#include "protocols/account.h"
    2929
    3030static const char* account_protocols_local[] = {

  • protocols/bee_ft.c

    r5ebff60 r0b9daac  
    2424#define BITLBEE_CORE
    2525#include "bitlbee.h"
    26 #include "ft.h"
     26#include "protocols/ft.h"
    2727
    2828file_transfer_t *imcb_file_send_start(struct im_connection *ic, char *handle, char *file_name, size_t file_size)

  • protocols/jabber/conference.c

    r5ebff60 r0b9daac  
    2323
    2424#include "jabber.h"
    25 #include "sha1.h"
     25#include "lib/sha1.h"
    2626
    2727static xt_status jabber_chat_join_failed(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);

  • protocols/jabber/io.c

    r5ebff60 r0b9daac  
    2323
    2424#include "jabber.h"
    25 #include "ssl_client.h"
     25#include "lib/ssl_client.h"
    2626
    2727static gboolean jabber_write_callback(gpointer data, gint fd, b_input_condition cond);

  • protocols/jabber/iq.c

    r5ebff60 r0b9daac  
    2323
    2424#include "jabber.h"
    25 #include "sha1.h"
     25#include "lib/sha1.h"
    2626
    2727static xt_status jabber_parse_roster(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);

  • protocols/jabber/jabber.c

    r5ebff60 r0b9daac  
    2828#include <stdio.h>
    2929
    30 #include "ssl_client.h"
    31 #include "xmltree.h"
     30#include "lib/ssl_client.h"
     31#include "lib/xmltree.h"
    3232#include "bitlbee.h"
    3333#include "jabber.h"
    34 #include "oauth.h"
    35 #include "md5.h"
     34#include "lib/oauth.h"
     35#include "lib/md5.h"
    3636
    3737GSList *jabber_connections;

  • protocols/jabber/jabber.h

    r5ebff60 r0b9daac  
    2828
    2929#include "bitlbee.h"
    30 #include "md5.h"
    31 #include "xmltree.h"
     30#include "lib/md5.h"
     31#include "lib/xmltree.h"
    3232
    3333extern GSList *jabber_connections;

  • protocols/jabber/jabber_util.c

    r5ebff60 r0b9daac  
    2323
    2424#include "jabber.h"
    25 #include "md5.h"
    26 #include "base64.h"
     25#include "lib/md5.h"
     26#include "lib/base64.h"
    2727
    2828static unsigned int next_id = 1;

  • protocols/jabber/s5bytestream.c

    r5ebff60 r0b9daac  
    2323
    2424#include "jabber.h"
    25 #include "sha1.h"
     25#include "lib/sha1.h"
    2626#include "lib/ftutil.h"
    2727#include <poll.h>

  • protocols/jabber/sasl.c

    r5ebff60 r0b9daac  
    2525
    2626#include "jabber.h"
    27 #include "base64.h"
    28 #include "oauth2.h"
    29 #include "oauth.h"
     27#include "lib/base64.h"
     28#include "lib/oauth2.h"
     29#include "lib/oauth.h"
    3030
    3131const struct oauth2_service oauth2_service_google =

  • protocols/jabber/si.c

    r5ebff60 r0b9daac  
    2323
    2424#include "jabber.h"
    25 #include "sha1.h"
     25#include "lib/sha1.h"
    2626
    2727void jabber_si_answer_request(file_transfer_t *ft);

  • protocols/msn/msn.c

    r5ebff60 r0b9daac  
    2424*/
    2525
    26 #include "nogaim.h"
     26#include "protocols/nogaim.h"
    2727#include "soap.h"
    2828#include "msn.h"

  • protocols/msn/msn_util.c

    r5ebff60 r0b9daac  
    2424*/
    2525
    26 #include "nogaim.h"
     26#include "protocols/nogaim.h"
    2727#include "msn.h"
    28 #include "md5.h"
     28#include "lib/md5.h"
    2929#include "soap.h"
    3030#include <ctype.h>

  • protocols/msn/ns.c

    r5ebff60 r0b9daac  
    2626#include <ctype.h>
    2727#include <sys/utsname.h>
    28 #include "nogaim.h"
     28#include "protocols/nogaim.h"
    2929#include "msn.h"
    30 #include "md5.h"
    31 #include "sha1.h"
     30#include "lib/md5.h"
     31#include "lib/sha1.h"
    3232#include "soap.h"
    33 #include "xmltree.h"
     33#include "lib/xmltree.h"
    3434
    3535static gboolean msn_ns_connected(gpointer data, gint source, b_input_condition cond);

  • protocols/msn/sb.c

    r5ebff60 r0b9daac  
    2525
    2626#include <ctype.h>
    27 #include "nogaim.h"
     27#include "protocols/nogaim.h"
    2828#include "msn.h"
    29 #include "md5.h"
     29#include "lib/md5.h"
    3030#include "soap.h"
    3131#include "invitation.h"

  • protocols/msn/soap.c

    r5ebff60 r0b9daac  
    2727*/
    2828
    29 #include "http_client.h"
     29#include "lib/http_client.h"
    3030#include "soap.h"
    3131#include "msn.h"
    3232#include "bitlbee.h"
    33 #include "url.h"
    34 #include "misc.h"
    35 #include "sha1.h"
    36 #include "base64.h"
    37 #include "xmltree.h"
     33#include "lib/url.h"
     34#include "lib/misc.h"
     35#include "lib/sha1.h"
     36#include "lib/base64.h"
     37#include "lib/xmltree.h"
    3838#include <ctype.h>
    3939#include <errno.h>

  • protocols/msn/soap.h

    r5ebff60 r0b9daac  
    4040#include <arpa/inet.h>
    4141#include <unistd.h>
    42 #include "nogaim.h"
     42#include "protocols/nogaim.h"
    4343
    4444

  • protocols/msn/tables.c

    r5ebff60 r0b9daac  
    2424*/
    2525
    26 #include "nogaim.h"
     26#include "protocols/nogaim.h"
    2727#include "msn.h"
    2828

  • protocols/nogaim.c

    r5ebff60 r0b9daac  
    3535#include <ctype.h>
    3636
    37 #include "nogaim.h"
     37#include "protocols/nogaim.h"
    3838
    3939GSList *connections;

  • protocols/nogaim.h

    r5ebff60 r0b9daac  
    4646
    4747#include "bitlbee.h"
    48 #include "account.h"
    49 #include "proxy.h"
     48#include "protocols/account.h"
     49#include "lib/proxy.h"
    5050#include "query.h"
    51 #include "md5.h"
    52 #include "ft.h"
     51#include "lib/md5.h"
     52#include "protocols/ft.h"
    5353
    5454#define BUDDY_ALIAS_MAXLEN 388   /* because MSN names can be 387 characters */

  • protocols/oscar/admin.c

    r5ebff60 r0b9daac  
    1 #include <aim.h>
     1#include "aim.h"
    22#include "admin.h"
    33

  • protocols/oscar/aim.h

    r5ebff60 r0b9daac  
    792792int aim_sncmp(const char *a, const char *b);
    793793
    794 #include <aim_internal.h>
     794#include "aim_internal.h"
    795795
    796796/*

  • protocols/oscar/auth.c

    r5ebff60 r0b9daac  
    44 */
    55
    6 #include <aim.h>
    7 
    8 #include "md5.h"
     6#include "aim.h"
     7
     8#include "lib/md5.h"
    99
    1010static int aim_encode_password(const char *password, unsigned char *encoded);

  • protocols/oscar/bos.c

    r5ebff60 r0b9daac  
    1 #include <aim.h>
     1#include "aim.h"
    22#include "bos.h"
    33

  • protocols/oscar/buddylist.c

    r5ebff60 r0b9daac  
    1 #include <aim.h>
     1#include "aim.h"
    22#include "buddylist.h"
    33

  • protocols/oscar/chat.c

    r5ebff60 r0b9daac  
    66 */
    77
    8 #include <aim.h>
     8#include "aim.h"
    99#include <glib.h>
    1010#include "info.h"

  • protocols/oscar/chatnav.c

    r5ebff60 r0b9daac  
    88 */
    99
    10 #include <aim.h>
     10#include "aim.h"
    1111#include "chatnav.h"
    1212

  • protocols/oscar/conn.c

    r5ebff60 r0b9daac  
    77 */
    88
    9 #include <aim.h>
     9#include "aim.h"
    1010#include "sock.h"
    1111

  • protocols/oscar/icq.c

    r5ebff60 r0b9daac  
    44 */
    55
    6 #include <aim.h>
     6#include "aim.h"
    77#include "icq.h"
    88

  • protocols/oscar/im.c

    r5ebff60 r0b9daac  
    2020 */
    2121
    22 #include <aim.h>
     22#include "aim.h"
    2323#include "im.h"
    2424#include "info.h"

  • protocols/oscar/info.c

    r5ebff60 r0b9daac  
    77 */
    88
    9 #include <aim.h>
     9#include "aim.h"
    1010#include "info.h"
    1111

  • protocols/oscar/misc.c

    r5ebff60 r0b9daac  
    1212 */
    1313
    14 #include <aim.h>
     14#include "aim.h"
    1515
    1616/*

  • protocols/oscar/msgcookie.c

    r5ebff60 r0b9daac  
    1212 */
    1313
    14 #include <aim.h>
     14#include "aim.h"
    1515#include "info.h"
    1616

  • protocols/oscar/oscar.c

    r5ebff60 r0b9daac  
    3131#include <sys/stat.h>
    3232#include <glib.h>
    33 #include "nogaim.h"
     33#include "protocols/nogaim.h"
    3434#include "bitlbee.h"
    35 #include "proxy.h"
     35#include "lib/proxy.h"
    3636#include "sock.h"
    3737

  • protocols/oscar/oscar_util.c

    r5ebff60 r0b9daac  
    1 #include <aim.h>
     1#include "aim.h"
    22#include <ctype.h>
    33

  • protocols/oscar/rxhandlers.c

    r5ebff60 r0b9daac  
    88 */
    99
    10 #include <aim.h>
     10#include "aim.h"
    1111
    1212struct aim_rxcblist_s {

  • protocols/oscar/rxqueue.c

    r5ebff60 r0b9daac  
    77 */
    88
    9 #include <aim.h>
     9#include "aim.h"
    1010
    1111#include <sys/socket.h>

  • protocols/oscar/search.c

    r5ebff60 r0b9daac  
    77 */
    88
    9 #include <aim.h>
     9#include "aim.h"
    1010
    1111/* XXX can this be integrated with the rest of the error handling? */

  • protocols/oscar/service.c

    r5ebff60 r0b9daac  
    44 */
    55
    6 #include <aim.h>
    7 
    8 #include "md5.h"
     6#include "aim.h"
     7
     8#include "lib/md5.h"
    99
    1010/* Client Online (group 1, subtype 2) */

  • protocols/oscar/snac.c

    r5ebff60 r0b9daac  
    1313 */
    1414
    15 #include <aim.h>
     15#include "aim.h"
    1616
    1717static aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac);

  • protocols/oscar/ssi.c

    r5ebff60 r0b9daac  
    2323 */
    2424
    25 #include <aim.h>
     25#include "aim.h"
    2626#include "ssi.h"
    2727

  • protocols/oscar/stats.c

    r5ebff60 r0b9daac  
    11
    2 #include <aim.h>
     2#include "aim.h"
    33
    44static int reportinterval(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac,

  • protocols/oscar/tlv.c

    r5ebff60 r0b9daac  
    1 #include <aim.h>
     1#include "aim.h"
    22
    33static void freetlv(aim_tlv_t **oldtlv)

  • protocols/oscar/txqueue.c

    r5ebff60 r0b9daac  
    66 */
    77
    8 #include <aim.h>
     8#include "aim.h"
    99#include "im.h"
    1010

  • protocols/skype/skype.c

    r5ebff60 r0b9daac  
    2424#include <poll.h>
    2525#include <stdio.h>
    26 #include <bitlbee.h>
    27 #include <ssl_client.h>
     26#include "bitlbee.h"
     27#include "lib/ssl_client.h"
    2828
    2929#define SKYPE_DEFAULT_SERVER "localhost"

  • protocols/twitter/twitter.c

    r5ebff60 r0b9daac  
    2323****************************************************************************/
    2424
    25 #include "nogaim.h"
    26 #include "oauth.h"
     25#include "protocols/nogaim.h"
     26#include "lib/oauth.h"
    2727#include "twitter.h"
    2828#include "twitter_http.h"
    2929#include "twitter_lib.h"
    30 #include "url.h"
     30#include "lib/url.h"
    3131
    3232GSList *twitter_connections = NULL;

  • protocols/twitter/twitter.h

    r5ebff60 r0b9daac  
    2323****************************************************************************/
    2424
    25 #include "nogaim.h"
     25#include "protocols/nogaim.h"
    2626
    2727#ifndef _TWITTER_H

  • protocols/twitter/twitter_http.c

    r5ebff60 r0b9daac  
    3131#include "twitter.h"
    3232#include "bitlbee.h"
    33 #include "url.h"
    34 #include "misc.h"
    35 #include "base64.h"
    36 #include "oauth.h"
     33#include "lib/url.h"
     34#include "lib/misc.h"
     35#include "lib/base64.h"
     36#include "lib/oauth.h"
    3737#include <ctype.h>
    3838#include <errno.h>

  • protocols/twitter/twitter_http.h

    r5ebff60 r0b9daac  
    2525#define _TWITTER_HTTP_H
    2626
    27 #include "nogaim.h"
    28 #include "http_client.h"
     27#include "protocols/nogaim.h"
     28#include "lib/http_client.h"
    2929
    3030typedef enum {

  • protocols/twitter/twitter_lib.c

    r5ebff60 r0b9daac  
    3232#include "twitter.h"
    3333#include "bitlbee.h"
    34 #include "url.h"
    35 #include "misc.h"
    36 #include "base64.h"
     34#include "lib/url.h"
     35#include "lib/misc.h"
     36#include "lib/base64.h"
    3737#include "twitter_lib.h"
    38 #include "json_util.h"
     38#include "lib/json_util.h"
    3939#include <ctype.h>
    4040#include <errno.h>

  • protocols/twitter/twitter_lib.h

    r5ebff60 r0b9daac  
    2626#define _TWITTER_LIB_H
    2727
    28 #include "nogaim.h"
     28#include "protocols/nogaim.h"
    2929#include "twitter_http.h"
    3030

  • protocols/yahoo/libyahoo2.c

    r5ebff60 r0b9daac  
    7676#include <ctype.h>
    7777
    78 #include "sha1.h"
    79 #include "md5.h"
     78#include "lib/sha1.h"
     79#include "lib/md5.h"
    8080#include "yahoo2.h"
    8181#include "yahoo_httplib.h"
    … …  
    8989#endif
    9090
    91 #include "base64.h"
    92 #include "http_client.h"
     91#include "lib/base64.h"
     92#include "lib/http_client.h"
    9393
    9494#ifdef USE_STRUCT_CALLBACKS

  • protocols/yahoo/yahoo.c

    r5ebff60 r0b9daac  
    2828#include <sys/stat.h>
    2929#include <ctype.h>
    30 #include "nogaim.h"
     30#include "protocols/nogaim.h"
    3131#include "yahoo2.h"
    3232#include "yahoo2_callbacks.h"

  • storage_xml.c

    r5ebff60 r0b9daac  
    2626#define BITLBEE_CORE
    2727#include "bitlbee.h"
    28 #include "base64.h"
    29 #include "arc.h"
    30 #include "md5.h"
    31 #include "xmltree.h"
     28#include "lib/base64.h"
     29#include "lib/arc.h"
     30#include "lib/md5.h"
     31#include "lib/xmltree.h"
    3232
    3333#include <glib/gstdio.h>

  • tests/check_arc.c

    r5ebff60 r0b9daac  
    55#include <string.h>
    66#include <stdio.h>
    7 #include "arc.h"
     7#include "lib/arc.h"
    88
    99char *password = "ArcVier";

  • tests/check_md5.c

    r5ebff60 r0b9daac  
    55#include <string.h>
    66#include <stdio.h>
    7 #include "md5.h"
     7#include "lib/md5.h"
    88
    99/* From RFC 1321 */

  • tests/check_nick.c

    r5ebff60 r0b9daac  
    66#include "irc.h"
    77#include "set.h"
    8 #include "misc.h"
     8#include "lib/misc.h"
    99#include "bitlbee.h"
    1010

  • tests/check_util.c

    r5ebff60 r0b9daac  
    66#include "irc.h"
    77#include "set.h"
    8 #include "misc.h"
    9 #include "url.h"
     8#include "lib/misc.h"
     9#include "lib/url.h"
    1010
    1111START_TEST(test_strip_linefeed){

  • unix.c

    r5ebff60 r0b9daac  
    2626#include "bitlbee.h"
    2727
    28 #include "arc.h"
    29 #include "base64.h"
     28#include "lib/arc.h"
     29#include "lib/base64.h"
    3030#include "commands.h"
    3131#include "protocols/nogaim.h"
    3232#include "help.h"
    3333#include "ipc.h"
    34 #include "md5.h"
    35 #include "misc.h"
     34#include "lib/md5.h"
     35#include "lib/misc.h"
    3636#include <signal.h>
    3737#include <unistd.h>
Note: See TracChangeset for help on using the changeset viewer.