ekg-external_libgadu.patch

   1 diff -Nur src.orig/commands.c src/commands.c
   2 --- src.orig/commands.c 2007-06-20 10:25:16.349058035 +0200
   3 +++ src/commands.c      2007-06-20 10:25:32.489857094 +0200
   4 @@ -52,7 +52,7 @@
   5  #include "configfile.h"
   6  #include "dynstuff.h"
   7  #include "events.h"
   8 -#include "libgadu.h"
   9 +#include <libgadu.h>
  10  #include "log.h"
  11  #include "msgqueue.h"
  12  #ifdef HAVE_OPENSSL
  13 diff -Nur src.orig/dynstuff.c src/dynstuff.c
  14 --- src.orig/dynstuff.c 2007-06-20 10:25:16.349058035 +0200
  15 +++ src/dynstuff.c      2007-06-20 10:25:32.499857589 +0200
  16 @@ -24,7 +24,7 @@
  17  #include <stdlib.h>
  18  #include <string.h>
  19
  20 -#include "libgadu.h"
  21 +#include <libgadu.h>
  22  #include "dynstuff.h"
  23  #include "stuff.h"
  24  #include "xmalloc.h"
  25 diff -Nur src.orig/ekg.c src/ekg.c
  26 --- src.orig/ekg.c      2007-06-20 10:25:16.349058035 +0200
  27 +++ src/ekg.c   2007-06-20 10:25:32.506524586 +0200
  28 @@ -60,7 +60,7 @@
  29  #include "configfile.h"
  30  #include "emoticons.h"
  31  #include "events.h"
  32 -#include "libgadu.h"
  33 +#include <libgadu.h>
  34  #include "log.h"
  35  #include "mail.h"
  36  #include "msgqueue.h"
  37 diff -Nur src.orig/events.c src/events.c
  38 --- src.orig/events.c   2007-06-20 10:25:16.352391533 +0200
  39 +++ src/events.c        2007-06-20 10:25:32.519858579 +0200
  40 @@ -40,7 +40,7 @@
  41  #include "commands.h"
  42  #include "emoticons.h"
  43  #include "events.h"
  44 -#include "libgadu.h"
  45 +#include <libgadu.h>
  46  #include "log.h"
  47  #include "msgqueue.h"
  48  #ifdef HAVE_OPENSSL
  49 diff -Nur src.orig/events.h src/events.h
  50 --- src.orig/events.h   2007-06-20 10:25:16.345724537 +0200
  51 +++ src/events.h        2007-06-20 10:25:32.519858579 +0200
  52 @@ -21,7 +21,7 @@
  53  #ifndef __EVENTS_H
  54  #define __EVENTS_H
  55
  56 -#include "libgadu.h"
  57 +#include <libgadu.h>
  58  #include "userlist.h"
  59
  60  struct handler {
  61 diff -Nur src.orig/log.h src/log.h
  62 --- src.orig/log.h      2007-06-20 10:25:16.349058035 +0200
  63 +++ src/log.h   2007-06-20 10:25:32.526525576 +0200
  64 @@ -28,7 +28,7 @@
  65  #include <time.h>
  66
  67  #include "dynstuff.h"
  68 -#include "libgadu.h"
  69 +#include <libgadu.h>
  70
  71  struct last {
  72         int type;               /* 0 - przychodz±ca, 1 - wychodz±ca */
  73 diff -Nur src.orig/msgqueue.c src/msgqueue.c
  74 --- src.orig/msgqueue.c 2007-06-20 10:25:16.349058035 +0200
  75 +++ src/msgqueue.c      2007-06-20 10:25:32.529859074 +0200
  76 @@ -32,7 +32,7 @@
  77  #include <unistd.h>
  78
  79  #include "dynstuff.h"
  80 -#include "libgadu.h"
  81 +#include <libgadu.h>
  82  #include "msgqueue.h"
  83  #include "stuff.h"
  84  #include "xmalloc.h"
  85 diff -Nur src.orig/msgqueue.h src/msgqueue.h
  86 --- src.orig/msgqueue.h 2007-06-20 10:25:16.352391533 +0200
  87 +++ src/msgqueue.h      2007-06-20 10:25:32.529859074 +0200
  88 @@ -25,7 +25,7 @@
  89  #include <time.h>
  90
  91  #include "dynstuff.h"
  92 -#include "libgadu.h"
  93 +#include <libgadu.h>
  94
  95  struct msg_queue {
  96         int msg_class;
  97 diff -Nur src.orig/python.c src/python.c
  98 --- src.orig/python.c   2007-06-20 10:25:16.352391533 +0200
  99 +++ src/python.c        2007-06-20 10:25:32.533192573 +0200
 100 @@ -27,7 +27,7 @@
 101  #include <string.h>
 102
 103  #include "commands.h"
 104 -#include "libgadu.h"
 105 +#include <libgadu.h>
 106  #include "stuff.h"
 107  #include "themes.h"
 108  #include "ui.h"
 109 diff -Nur src.orig/simlite.c src/simlite.c
 110 --- src.orig/simlite.c  2007-06-20 10:25:16.349058035 +0200
 111 +++ src/simlite.c       2007-06-20 10:25:32.536526071 +0200
 112 @@ -35,7 +35,7 @@
 113  #include <string.h>
 114  #include <time.h>
 115
 116 -#include "libgadu.h"
 117 +#include <libgadu.h>
 118  #include "simlite.h"
 119
 120  #ifndef PATH_MAX
 121 diff -Nur src.orig/stuff.c src/stuff.c
 122 --- src.orig/stuff.c    2007-06-20 10:25:16.352391533 +0200
 123 +++ src/stuff.c 2007-06-20 10:25:32.549860065 +0200
 124 @@ -55,7 +55,7 @@
 125  #include "commands.h"
 126  #include "compat.h"
 127  #include "dynstuff.h"
 128 -#include "libgadu.h"
 129 +#include <libgadu.h>
 130  #ifdef HAVE_OPENSSL
 131  #  include "simlite.h"
 132  #endif
 133 diff -Nur src.orig/stuff.h src/stuff.h
 134 --- src.orig/stuff.h    2007-06-20 10:25:16.349058035 +0200
 135 +++ src/stuff.h 2007-06-20 10:25:32.553193563 +0200
 136 @@ -35,7 +35,7 @@
 137  #include <time.h>
 138
 139  #include "dynstuff.h"
 140 -#include "libgadu.h"
 141 +#include <libgadu.h>
 142  #include "ioctld.h"
 143
 144  #define DEBUG_MAX_LINES        50      /* ile linii z debug zrzucaæ do pliku */
 145 diff -Nur src.orig/ui-ncurses.c src/ui-ncurses.c
 146 --- src.orig/ui-ncurses.c       2007-06-20 10:25:16.345724537 +0200
 147 +++ src/ui-ncurses.c    2007-06-20 10:25:32.583195048 +0200
 148 @@ -66,7 +66,7 @@
 149  #include <unistd.h>
 150
 151  #include "commands.h"
 152 -#include "libgadu.h"
 153 +#include <libgadu.h>
 154  #include "mail.h"
 155  #ifndef HAVE_STRLCAT
 156  #  include "../compat/strlcat.h"
 157 diff -Nur src.orig/userlist.c src/userlist.c
 158 --- src.orig/userlist.c 2007-06-20 10:25:16.349058035 +0200
 159 +++ src/userlist.c      2007-06-20 10:25:32.593195543 +0200
 160 @@ -38,7 +38,7 @@
 161
 162  #include "commands.h"
 163  #include "dynstuff.h"
 164 -#include "libgadu.h"
 165 +#include <libgadu.h>
 166  #ifndef HAVE_STRLCAT
 167  #  include "../compat/strlcat.h"
 168  #endif
 169 diff -Nur src.orig/userlist.h src/userlist.h
 170 --- src.orig/userlist.h 2007-06-20 10:25:16.345724537 +0200
 171 +++ src/userlist.h      2007-06-20 10:25:32.596529042 +0200
 172 @@ -30,7 +30,7 @@
 173  #include <stdio.h>
 174  #include <time.h>
 175
 176 -#include "libgadu.h"
 177 +#include <libgadu.h>
 178  #include "dynstuff.h"
 179  #include "stuff.h"
 180
 181 diff -Nur src.orig/vars.c src/vars.c
 182 --- src.orig/vars.c     2007-06-20 10:25:16.345724537 +0200
 183 +++ src/vars.c  2007-06-20 10:25:32.599862540 +0200
 184 @@ -28,7 +28,7 @@
 185  #include <unistd.h>
 186
 187  #include "dynstuff.h"
 188 -#include "libgadu.h"
 189 +#include <libgadu.h>
 190  #include "mail.h"
 191  #ifndef HAVE_STRLCAT
 192  #  include "../compat/strlcat.h"
 193 diff -Nur src.orig/voice.c src/voice.c
 194 --- src.orig/voice.c    2007-06-20 10:25:16.349058035 +0200
 195 +++ src/voice.c 2007-06-20 10:25:32.603196038 +0200
 196 @@ -29,7 +29,7 @@
 197  #include <stdlib.h>
 198  #include <unistd.h>
 199
 200 -#include "libgadu.h"
 201 +#include <libgadu.h>
 202  #include "voice.h"
 203  #include "stuff.h"
 204  #include "xmalloc.h"
 205 diff -Nur src.orig/xmalloc.c src/xmalloc.c
 206 --- src.orig/xmalloc.c  2007-06-20 10:25:16.345724537 +0200
 207 +++ src/xmalloc.c       2007-06-20 10:25:32.603196038 +0200
 208 @@ -28,7 +28,7 @@
 209  #include "configfile.h"
 210  #include "stuff.h"
 211  #include "userlist.h"
 212 -#include "libgadu.h"
 213 +#include <libgadu.h>
 214
 215  void ekg_oom_handler()
 216  {
 217 --- src/Makefile.in     2007-06-20 10:30:09.886922984 +0200
 218 +++ src/Makefile.in-new 2007-06-20 10:33:36.693827460 +0200
 219 @@ -28,7 +28,7 @@
 220
 221  ekg:   $(OBJS) comptime.c @libgadu_a@
 222         $(CC) $(CFLAGS) -c -o comptime.o comptime.c
 223 -       $(CC) $(LDFLAGS) $(CFLAGS) -o ekg $(OBJS) comptime.o -L../lib @lgadu@ @libgadu_a@ $(LIBS)
 224 +       $(CC) $(LDFLAGS) $(CFLAGS) -o ekg $(OBJS) comptime.o @lgadu@ @libgadu_a@ $(LIBS)
 225
 226  ioctld:        ioctld.c
 227         $(CC) $(LDFLAGS) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
 228 --- Makefile.in 2006-08-05 17:46:21.000000000 +0200
 229 +++ Makefile.in-new     2007-06-20 10:43:18.322620629 +0200
 230 @@ -15,10 +15,7 @@
 231
 232  #
 233
 234 -all:   configure libgadu @ekg@ @make_ekgwap@
 235 -
 236 -libgadu:
 237 -       cd lib && $(MAKE) all
 238 +all:   configure @ekg@ @make_ekgwap@
 239
 240  ekg:
 241         cd src && $(MAKE) all
 242 @@ -31,10 +28,7 @@
 243
 244  #
 245
 246 -dep:   dep-libgadu @dep_ekg@
 247 -
 248 -dep-libgadu:
 249 -       cd lib && $(MAKE) dep
 250 +dep:   @dep_ekg@
 251
 252  dep-ekg:
 253         cd src && $(MAKE) dep
 254 @@ -46,10 +40,7 @@
 255
 256  #
 257
 258 -install:       all install-libgadu @install_ekg@ @install_ekgwap@
 259 -
 260 -install-libgadu:
 261 -       cd lib && $(MAKE) install
 262 +install:       all @install_ekg@ @install_ekgwap@
 263
 264  install-ekg:   install-ekg-data install-ekg-man
 265         cd src && $(MAKE) install
 266 @@ -93,10 +84,7 @@
 267
 268  #
 269
 270 -clean: clean-libgadu @clean_ekg@ clean-examples clean-compat
 271 -
 272 -clean-libgadu:
 273 -       cd lib && $(MAKE) clean
 274 +clean: @clean_ekg@ clean-examples clean-compat
 275
 276  clean-ekg:
 277         cd src && $(MAKE) clean
 278 @@ -109,13 +97,10 @@
 279
 280  #
 281
 282 -distclean:     distclean-libgadu @distclean_ekg@ distclean-examples distclean-compat
 283 +distclean:     @distclean_ekg@ distclean-examples distclean-compat
 284         rm -f *~ config.log config.cache config.status config.h Makefile
 285         rm -f config.h.in configure aclocal.m4
 286
 287 -distclean-libgadu:
 288 -       cd lib && $(MAKE) distclean
 289 -
 290  distclean-ekg:
 291         cd src && $(MAKE) distclean
 292