diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | protocols/skype/HACKING | 8 | ||||
| -rw-r--r-- | protocols/skype/Makefile | 73 | ||||
| -rw-r--r-- | protocols/skype/README | 5 | ||||
| -rw-r--r-- | protocols/skype/asciidoc.conf | 7 | ||||
| -rw-r--r-- | protocols/skype/skyped.txt | 2 |
6 files changed, 11 insertions, 87 deletions
@@ -54,6 +54,9 @@ Makefile.settings: clean: $(subdirs) rm -f *.o $(OUTFILE) core utils/bitlbeed init/bitlbee*.service $(MAKE) -C tests clean +ifdef SKYPE_PI + $(MAKE) -C protocols/skype clean +endif distclean: clean $(subdirs) rm -rf .depend diff --git a/protocols/skype/HACKING b/protocols/skype/HACKING index f5516832..68ea44e8 100644 --- a/protocols/skype/HACKING +++ b/protocols/skype/HACKING @@ -16,11 +16,3 @@ run python skyped.py -n -d 4) irssi - -== Get the code from git - -To get the code directly from git, you need: - -git clone git://vmiklos.hu/bitlbee-skype -cd bitlbee-skype -make autogen diff --git a/protocols/skype/Makefile b/protocols/skype/Makefile index 3afefbc0..8bd3464f 100644 --- a/protocols/skype/Makefile +++ b/protocols/skype/Makefile @@ -3,10 +3,7 @@ ifdef _SRCDIR_ _SRCDIR_ := $(_SRCDIR_)protocols/skype/ endif -VERSION = 0.9.0 DATE := $(shell date +%Y-%m-%d) -# latest stable -BITLBEE_VERSION = 3.0.1 INSTALL = install ASCIIDOC = yes @@ -16,48 +13,10 @@ else MANPAGES = endif -ifeq ($(BITLBEE),yes) -LIBS = skype.$(SHARED_EXT) -else -LIBS = -endif - -all: $(LIBS) $(MANPAGES) - -skype.$(SHARED_EXT): $(_SRCDIR_)skype.c config.mak -ifeq ($(BITLBEE),yes) - $(CC) $(CFLAGS) $(SHARED_FLAGS) -o skype.$(SHARED_EXT) $(_SRCDIR_)skype.c $(LDFLAGS) -endif - -install: all install-doc -ifeq ($(BITLBEE),yes) - $(INSTALL) -d $(DESTDIR)$(plugindir) - $(INSTALL) skype.$(SHARED_EXT) $(DESTDIR)$(plugindir) -endif -ifeq ($(SKYPE4PY),yes) - $(INSTALL) -d $(DESTDIR)$(bindir) - $(INSTALL) -d $(DESTDIR)$(sysconfdir) - $(INSTALL) skyped.py $(DESTDIR)$(bindir)/skyped - perl -p -i -e 's|/usr/local/etc/skyped|$(sysconfdir)|' $(DESTDIR)$(bindir)/skyped - $(INSTALL) -m644 skyped.conf.dist $(DESTDIR)$(sysconfdir)/skyped.conf - perl -p -i -e 's|\$${prefix}|$(prefix)|' $(DESTDIR)$(sysconfdir)/skyped.conf - $(INSTALL) -m644 skyped.cnf $(DESTDIR)$(sysconfdir) -endif - -client: $(_SRCDIR_)client.c - -autogen: configure.ac - cp $(shell ls /usr/share/automake-*/install-sh | tail -n1) ./ - autoconf +all: $(MANPAGES) clean: - rm -f $(LIBS) $(MANPAGES) - -distclean: clean - rm -f config.log config.mak config.status $(MANPAGES) - -autoclean: distclean - rm -rf aclocal.m4 autom4te.cache configure install-sh + rm -f $(MANPAGES) # take this from the kernel check: @@ -66,20 +25,6 @@ check: test: all $(MAKE) -C t/ all -dist: - git archive --format=tar --prefix=bitlbee-skype-$(VERSION)/ HEAD | tar xf - - mkdir -p bitlbee-skype-$(VERSION) - git log --no-merges |git name-rev --tags --stdin > bitlbee-skype-$(VERSION)/Changelog - make -C bitlbee-skype-$(VERSION) autogen - tar czf bitlbee-skype-$(VERSION).tar.gz bitlbee-skype-$(VERSION) - rm -rf bitlbee-skype-$(VERSION) - -release: - git tag $(VERSION) - $(MAKE) dist - gpg --comment "See http://vmiklos.hu/gpg/ for info" \ - -ba bitlbee-skype-$(VERSION).tar.gz - doc: $(MANPAGES) install-doc: doc @@ -91,17 +36,5 @@ endif uninstall-doc: rm -f $(DESTDIR)$(MANDIR)/man1/skyped.1* -HEADER.html: README Makefile - asciidoc -a toc -a numbered -a sectids -o HEADER.html -a icons -a data-uri --attribute iconsdir=./images/icons README - sed -i 's|@VERSION@|$(VERSION)|g' HEADER.html - sed -i 's|@BITLBEE_VERSION@|$(BITLBEE_VERSION)|g' HEADER.html - -Changelog: .git/refs/heads/master - git log --no-merges |git name-rev --tags --stdin >Changelog - -AUTHORS: .git/refs/heads/master - git shortlog -s -n |sed 's/.*\t//'> AUTHORS - %.1: $(_SRCDIR_)%.txt $(_SRCDIR_)asciidoc.conf - a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" \ - -a bs_version=$(VERSION) -a bs_date=$(DATE) -f manpage -D . $< + a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" -a bee_date=$(DATE) -f manpage -D . $< diff --git a/protocols/skype/README b/protocols/skype/README index a881b8aa..06e608ff 100644 --- a/protocols/skype/README +++ b/protocols/skype/README @@ -373,7 +373,7 @@ $ skyped -n -d == I would like to have support for ... If something does not work and it's not in the TODO section, then please -contact me! Please also try the link:HACKING[git version] before reporting a bug, your +contact me! Please also try the bzr version before reporting a bug, your problem may be already fixed there. In fact, of course, I wrote this documentation after figured out how to do this @@ -393,9 +393,6 @@ You can reach some screenshots link:shot[here]. == Additional resources -You can reach the Changelog link:Changelog[here], and a gitweb interface -http://vmiklos.hu/gitweb/?p=bitlbee-skype.git[here]. - The Skype API documentation is http://developer.skype.com/resources/public_api_ref.zip[here] if you're interested. diff --git a/protocols/skype/asciidoc.conf b/protocols/skype/asciidoc.conf index 24a649c1..f52b3ad6 100644 --- a/protocols/skype/asciidoc.conf +++ b/protocols/skype/asciidoc.conf @@ -4,14 +4,13 @@ ifdef::backend-docbook[] template::[header-declarations] <refentry> <refentryinfo> - <date>{bs_date}</date> + <date>{bee_date}</date> </refentryinfo> <refmeta> <refentrytitle>{mantitle}</refentrytitle> <manvolnum>{manvolnum}</manvolnum> - <refmiscinfo class="source">bitlbee-skype</refmiscinfo> - <refmiscinfo class="version">{bs_version}</refmiscinfo> - <refmiscinfo class="manual">bitlbee-skype manual</refmiscinfo> + <refmiscinfo class="source">BitlBee</refmiscinfo> + <refmiscinfo class="manual">BitlBee manual</refmiscinfo> </refmeta> <refnamediv> <refname>{manname}</refname> diff --git a/protocols/skype/skyped.txt b/protocols/skype/skyped.txt index 53f2626d..fe0b4d50 100644 --- a/protocols/skype/skyped.txt +++ b/protocols/skype/skyped.txt @@ -11,7 +11,7 @@ skyped [<options>] == DESCRIPTION Skype supports remote control of the GUI client only via X11 or DBus -messages. This is hard in care you want remote control. This daemon +messages. This is hard in case you want remote control. This daemon listens on a TCP port and runs on the same machine where the GUI client runs. It passes all the input it gets to Skype directly, except for a few commands which is related to authentication. The whole communication |