Changeset 10c32c9


Ignore:
Timestamp:
Jun 20, 2013, 9:52:06 AM (8 years ago)
Author:
Anders Kaseorg <andersk@mit.edu>
Parents:
80d7b44 (diff), e4b8f93 (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 e4b8f937e213d2addfd212ab06571d541b2b532e into 80d7b445c48a5c63361e0ae972d0b0264d54ed65
Files:
45 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    rb58dea1 r1c22155  
    33*.par
    44.deps
     5/bin/
    56META.yml
    67MYMETA.yml
     
    1112aclocal.m4
    1213autom4te.cache
    13 barnowl.bin
    14 tester.bin
    15 zcrypt
     14barnowl
    1615blib
    1716config.cache
     
    2423core
    2524depcomp
     25gmarshal_funcs.c
     26gmarshal_funcs.h
     27inc/
    2628install-sh
    2729jabber.log
     
    3032owl_prototypes.h.new
    3133perlglue.c
    32 perlwrap.c
    3334pm_to_blib
     35runtests.sh.log
     36runtests.sh.trs
    3437stamp-h1
     38test-driver
     39test-suite.log
     40tester
    3541varstubs.c
     42zcrypt
  • README

    rba5e919 r1c22155  
    2121AnyEvent
    2222Class::Accessor
     23ExtUtils::Depends
    2324Glib
     25Module::Install
    2426PAR
    25 ExtUtils::Depends
    2627
    2728(Note that these are all available as Debian packages)
  • configure.ac

    r80d7b44 re4b8f93  
    1010AC_PROG_CC
    1111AC_PROG_CC_C99
     12AC_PROG_LN_S
    1213
    1314AC_ARG_WITH([zephyr-default-format],
     
    140141AX_PROG_PERL_MODULES([Class::Accessor::Fast],,
    141142                     [AC_MSG_ERROR([cannot find perl module Class::Accessor::Fast.])])
     143AX_PROG_PERL_MODULES([ExtUtils::Depends],,
     144                     [AC_MSG_ERROR([cannot find perl module ExtUtils::Depends])])
    142145AX_PROG_PERL_MODULES([Glib],,
    143146                     [AC_MSG_ERROR([cannot find perl module Glib.])])
     147AX_PROG_PERL_MODULES([Module::Install::Base],,
     148                     [AC_MSG_ERROR([cannot find perl module Module::Install::Base])])
    144149AX_PROG_PERL_MODULES([PAR],,
    145150                     [AC_MSG_WARN([PAR.pm not found. Loadable modules will be disabled.])])
    146 AX_PROG_PERL_MODULES([ExtUtils::Depends],,
    147                      [AC_MSG_ERROR([cannot find perl module ExtUtils::Depends])])
    148151
    149152dnl Add CFLAGS and LIBS for glib-2.0
  • perl/lib/Module/Install/BarnOwl.pm

    rb8a3e00 re4b8f93  
    4141    my $class = ref $self;
    4242
     43    my $srcdir = $ENV{BARNOWL_SRCDIR} || '.';
     44
    4345    $self->name("BarnOwl-Module-$name");
    44     $self->all_from("lib/BarnOwl/Module/$name.pm");
     46    $self->all_from("$srcdir/lib/BarnOwl/Module/$name.pm");
     47    $self->makemaker_args(PMLIBDIRS => ["$srcdir/lib"],
     48                          PMLIBPARENTDIRS => ["$srcdir/lib"]);
    4549
    4650    $self->postamble(<<"END_MAKEFILE");
    4751
    4852# --- $class section:
     53
     54BARNOWL_SRCDIR = $srcdir
     55export BARNOWL_SRCDIR
    4956
    5057$name.par: pm_to_blib
  • perl/modules/Makefile.am

    reb5e8fc re4b8f93  
    11MODULES = Jabber IRC WordWrap Twitter Facebook
    22
    3 EXTRA_DIST = $(MODULES:=/Makefile.PL) $(MODULES:=/inc) $(MODULES:=/lib)
     3EXTRA_DIST = $(MODULES:=/Makefile.PL) $(MODULES:=/lib)
    44EXTRA_DIST += \
    55    Facebook/README \
     
    1111        (cd $* && $(MAKE) $*.par)
    1212
     13BARNOWL_PERL := $(shell which perl) -I$(abs_srcdir)/../lib
     14
    1315MODULES_MAKEFILE = $(MODULES:=/Makefile)
    14 $(MODULES_MAKEFILE): %/Makefile: %/Makefile.PL
    15         [ $(srcdir) = . ] || cp -srf --no-preserve=mode -- $(abs_srcdir)/$*/. $*
    16         $(AM_V_GEN)(cd $* && perl -I../../lib Makefile.PL)
     16$(MODULES_MAKEFILE): %/Makefile: %/Makefile.PL ../lib/Module/Install/BarnOwl.pm
     17        $(AM_V_GEN)test -d $* || mkdir $*
     18        $(AM_V_at)test $(srcdir) = . || $(LN_S) $(abs_srcdir)/$*/Makefile.PL $*/Makefile.PL
     19        $(AM_V_at)(cd $* && BARNOWL_SRCDIR='$(abs_srcdir)/$*' && export BARNOWL_SRCDIR && $(BARNOWL_PERL) Makefile.PL 'PERL=$(BARNOWL_PERL)')
    1720
    1821MODULES_CLEAN = $(MODULES:%=clean_%)
    1922clean-local: $(MODULES_CLEAN)
    2023$(MODULES_CLEAN): clean_%:
    21         if [ $(srcdir) = . ]; then \
    22             (cd $* && { test ! -f Makefile || $(MAKE) realclean; }) && \
    23             rm -f $*/$*.par; \
    24         else \
    25             rm -rf $*; \
    26         fi
     24        (cd $* && { test ! -f Makefile || $(MAKE) realclean; })
     25        rm -f $*/$*.par
     26        rm -rf $*/inc
     27        test $(srcdir) = . || rm -f $*/Makefile.PL
    2728
    2829MODULES_INSTALL = $(MODULES:%=module_install_%)
Note: See TracChangeset for help on using the changeset viewer.