Changeset c8b8c83


Ignore:
Timestamp:
2011-07-24T12:51:00Z (8 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
3d952b5
Parents:
a010498 (diff), 17f6079 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merging Skype plugin. Many thanks to Miklos Vajna for all his work on this,
having this distributed together with BitlBee will hopefully make up for the
fact that BitlBee has poor binary API backward compatibility.

Files:
21 added
2 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    ra010498 rc8b8c83  
    2727subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)
    2828
    29 all: $(OUTFILE) $(OTR_PI) systemd
     29all: $(OUTFILE) $(OTR_PI) $(SKYPE_PI) systemd
    3030        $(MAKE) -C doc
     31ifdef SKYPE_PI
     32        $(MAKE) -C protocols/skype doc
     33endif
    3134
    3235uninstall: uninstall-bin uninstall-doc
     
    7174install-doc:
    7275        $(MAKE) -C doc install
     76ifdef SKYPE_PI
     77        $(MAKE) -C protocols/skype install-doc
     78endif
    7379
    7480uninstall-doc:
    7581        $(MAKE) -C doc uninstall
     82ifdef SKYPE_PI
     83        $(MAKE) -C protocols/skype uninstall-doc
     84endif
    7685
    7786install-bin:
     
    109118        install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
    110119endif
     120ifdef SKYPE_PI
     121        mkdir -p $(DESTDIR)$(PLUGINDIR)
     122        install -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
     123        mkdir -p $(DESTDIR)$(ETCDIR)/../skyped
     124        install -m 0644 $(SRCDIR)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
     125        install -m 0644 $(SRCDIR)protocols/skype/skyped.conf $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
     126        install -m 0755 $(SRCDIR)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
     127endif
    111128
    112129systemd:
     
    141158        @$(CC) $(CFLAGS) $(OTRFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@
    142159
     160$(SKYPE_PI): $(SRCDIR)protocols/skype/skype.c
     161        @echo '*' Building plugin skype
     162        @$(CC) $(CFLAGS) -fPIC -shared $< -o $@
     163
    143164$(objects): %.o: $(SRCDIR)%.c
    144165        @echo '*' Compiling $<
  • configure

    ra010498 rc8b8c83  
    3636plugins=1
    3737otr=0
     38skype=0
    3839
    3940events=glib
     
    8384--otr=0/1/auto/plugin
    8485                Disable/enable OTR encryption support   $otr
     86--skype=0/1/plugin
     87                Disable/enable Skype support            $skype
    8588
    8689--events=...    Event handler (glib, libevent)          $events
     
    109112ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
    110113pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
     114
     115protocols_mods=""
    111116
    112117cat<<EOF>Makefile.settings
     
    538543fi
    539544
     545if [ "$skype" = "1" -o "$skype" = "plugin" ]; then
     546        echo 'SKYPE_PI=skype.so' >> Makefile.settings
     547        protocols_mods="$protocol_mods skype(plugin)"
     548fi
     549
    540550if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then
    541551        echo
     
    751761
    752762if [ -n "$protocols" ]; then
    753         echo '  Building with these protocols:' $protocols
     763        echo '  Building with these protocols:' $protocols$protocols_mods
    754764        case "$protocols" in
    755765        *purple*)
Note: See TracChangeset for help on using the changeset viewer.