Changes in / [10c32c9:80d7b44]


Ignore:
Files:
45 added
5 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r1c22155 rb58dea1  
    33*.par
    44.deps
    5 /bin/
    65META.yml
    76MYMETA.yml
     
    1211aclocal.m4
    1312autom4te.cache
    14 barnowl
     13barnowl.bin
     14tester.bin
     15zcrypt
    1516blib
    1617config.cache
     
    2324core
    2425depcomp
    25 gmarshal_funcs.c
    26 gmarshal_funcs.h
    27 inc/
    2826install-sh
    2927jabber.log
     
    3230owl_prototypes.h.new
    3331perlglue.c
     32perlwrap.c
    3433pm_to_blib
    35 runtests.sh.log
    36 runtests.sh.trs
    3734stamp-h1
    38 test-driver
    39 test-suite.log
    40 tester
    4135varstubs.c
    42 zcrypt
  • README

    r1c22155 rba5e919  
    2121AnyEvent
    2222Class::Accessor
     23Glib
     24PAR
    2325ExtUtils::Depends
    24 Glib
    25 Module::Install
    26 PAR
    2726
    2827(Note that these are all available as Debian packages)
  • configure.ac

    re4b8f93 r80d7b44  
    1010AC_PROG_CC
    1111AC_PROG_CC_C99
    12 AC_PROG_LN_S
    1312
    1413AC_ARG_WITH([zephyr-default-format],
     
    141140AX_PROG_PERL_MODULES([Class::Accessor::Fast],,
    142141                     [AC_MSG_ERROR([cannot find perl module Class::Accessor::Fast.])])
     142AX_PROG_PERL_MODULES([Glib],,
     143                     [AC_MSG_ERROR([cannot find perl module Glib.])])
     144AX_PROG_PERL_MODULES([PAR],,
     145                     [AC_MSG_WARN([PAR.pm not found. Loadable modules will be disabled.])])
    143146AX_PROG_PERL_MODULES([ExtUtils::Depends],,
    144147                     [AC_MSG_ERROR([cannot find perl module ExtUtils::Depends])])
    145 AX_PROG_PERL_MODULES([Glib],,
    146                      [AC_MSG_ERROR([cannot find perl module Glib.])])
    147 AX_PROG_PERL_MODULES([Module::Install::Base],,
    148                      [AC_MSG_ERROR([cannot find perl module Module::Install::Base])])
    149 AX_PROG_PERL_MODULES([PAR],,
    150                      [AC_MSG_WARN([PAR.pm not found. Loadable modules will be disabled.])])
    151148
    152149dnl Add CFLAGS and LIBS for glib-2.0
  • perl/lib/Module/Install/BarnOwl.pm

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

    re4b8f93 reb5e8fc  
    11MODULES = Jabber IRC WordWrap Twitter Facebook
    22
    3 EXTRA_DIST = $(MODULES:=/Makefile.PL) $(MODULES:=/lib)
     3EXTRA_DIST = $(MODULES:=/Makefile.PL) $(MODULES:=/inc) $(MODULES:=/lib)
    44EXTRA_DIST += \
    55    Facebook/README \
     
    1111        (cd $* && $(MAKE) $*.par)
    1212
    13 BARNOWL_PERL := $(shell which perl) -I$(abs_srcdir)/../lib
    14 
    1513MODULES_MAKEFILE = $(MODULES:=/Makefile)
    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)')
     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)
    2017
    2118MODULES_CLEAN = $(MODULES:%=clean_%)
    2219clean-local: $(MODULES_CLEAN)
    2320$(MODULES_CLEAN): clean_%:
    24         (cd $* && { test ! -f Makefile || $(MAKE) realclean; })
    25         rm -f $*/$*.par
    26         rm -rf $*/inc
    27         test $(srcdir) = . || rm -f $*/Makefile.PL
     21        if [ $(srcdir) = . ]; then \
     22            (cd $* && { test ! -f Makefile || $(MAKE) realclean; }) && \
     23            rm -f $*/$*.par; \
     24        else \
     25            rm -rf $*; \
     26        fi
    2827
    2928MODULES_INSTALL = $(MODULES:%=module_install_%)
Note: See TracChangeset for help on using the changeset viewer.