Changeset 62a2bf9 for protocols/skype/Makefile

Timestamp:

2013-01-05T13:47:56Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

cfbecc9

Parents:

e6298e5 (diff), 757e1e0 (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:

Merge from vmiklos.

File:

• protocols/skype/Makefile (modified) (3 diffs)

protocols/skype/Makefile

@@ -4 +4 @@
 endif
 
-VERSION = 0.9.0
 DATE := $(shell date +%Y-%m-%d)
-# latest stable
-BITLBEE_VERSION = 3.0.1
 INSTALL = install
 ASCIIDOC = yes
@@ -17 +14 @@
 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:
-        perl checkpatch.pl --no-tree --file skype.c
+        perl checkpatch.pl --show-types --ignore LONG_LINE,CAMELCASE --no-tree --file skype.c
 
 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)
@@ -92 +37 @@
         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 . $<