Changeset 4adc69b


Ignore:
Timestamp:
Apr 4, 2013, 2:32:56 AM (8 years ago)
Author:
Anders Kaseorg <andersk@mit.edu>
Parents:
13a39ae8 (diff), 3624a2c (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 3624a2caf75400743f257ffcf68a274d6d21f689 into 13a39ae85b50a361ce1f1c27746d66e2d1470649
Files:
1 deleted
12 edited
1 moved

Legend:

Unmodified
Added
Removed
  • Makefile.am

    r353719a r3624a2c  
    1212
    1313check_PROGRAMS = tester.bin
     14dist_check_DATA = t
     15dist_check_SCRIPTS = runtests.sh
     16
     17bin_SCRIPTS = barnowl
     18check_SCRIPTS = tester
     19
     20barnowl tester: %: barnowl-wrapper.in %.bin Makefile
     21        sed \
     22            -e 's,[@]abs_srcdir[@],$(abs_srcdir),g' \
     23            -e 's,[@]abs_builddir[@],$(abs_builddir),g' \
     24            $< > $@
     25        chmod +x $@
    1426
    1527barnowl_bin_SOURCES = $(BASE_SRCS) \
    16      owl.h owl_perl.h config.h \
    17      owl.c \
    18     $(GEN_C) $(GEN_H)
     28     owl.h owl_perl.h \
     29     owl.c
     30nodist_barnowl_bin_SOURCES = $(GEN_C) $(GEN_H)
    1931
    20 man_MANS = doc/barnowl.1
    21 doc_DATA = doc/intro.txt doc/advanced.txt
     32dist_man_MANS = doc/barnowl.1
     33dist_doc_DATA = doc/intro.txt doc/advanced.txt
    2234
    2335barnowl_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
    2436
    2537tester_bin_SOURCES = $(BASE_SRCS) \
    26      owl.h owl_perl.h config.h \
    27      $(GEN_C) $(GEN_H) \
     38     owl.h owl_perl.h \
    2839     tester.c
     40nodist_tester_bin_SOURCES = $(GEN_C) $(GEN_H)
    2941
    3042tester_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
     
    3244TESTS=runtests.sh
    3345
    34 AM_CPPFLAGS = -I$(top_srcdir)/ \
     46AM_CPPFLAGS = \
    3547           -I$(top_srcdir)/libfaim/ \
    3648           -DDATADIR='"$(pkgdatadir)"' \
     
    4860     mainpanel.c msgwin.c sepbar.c editcontext.c signal.c closures.c
    4961
    50 NORMAL_SRCS = filterproc.c window.c windowcb.c
     62NORMAL_SRCS = filterproc.c filterproc.h window.c window.h windowcb.c
    5163
    5264BASE_SRCS = $(CODELIST_SRCS) $(NORMAL_SRCS)
    5365
    5466GEN_C = varstubs.c perlglue.c gmarshal_funcs.c
    55 GEN_H = owl_prototypes.h gmarshal_funcs.h
     67GEN_H = owl_prototypes.h owl_prototypes.h.new gmarshal_funcs.h
    5668
    5769BUILT_SOURCES = $(GEN_C) $(GEN_H)
     
    6678proto: owl_prototypes.h
    6779
    68 perlglue.c: perlglue.xs $(TYPEMAP)
    69         $(AM_V_GEN)perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes perlglue.xs > perlglue.c
     80perlglue.c: perlglue.xs typemap
     81        $(AM_V_GEN)perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes $< > $@
    7082
    7183varstubs.c: stubgen.pl variable.c
     
    8496        $(COMPILE) -Wall -Wextra -pedantic -fsyntax-only $(CHK_SOURCES)
    8597
    86 install-data-local:
    87         $(mkinstalldirs) ${DESTDIR}${pkgdatadir}/lib
    88         (cd perl/lib && tar -cf - . ) | (cd ${DESTDIR}${pkgdatadir}/lib && tar -xf - )
    89 
    9098do_transform = $(shell echo '$(1)' | sed '$(transform)')
    9199install-exec-hook:
     
    93101              $(DESTDIR)$(bindir)/$(call do_transform,barnowl)
    94102
     103uninstall-local:
     104        rm -f $(DESTDIR)$(bindir)/$(call do_transform,barnowl)
     105
     106CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS) $(check_SCRIPTS)
     107EXTRA_DIST = \
     108    autogen.sh \
     109    barnowl-wrapper.in \
     110    codelist.pl \
     111    doc \
     112    examples \
     113    marshal_types \
     114    perlglue.xs \
     115    scripts \
     116    stubgen.pl \
     117    typemap
     118
    95119SUBDIRS = compat libfaim perl
  • barnowl-wrapper.in

    • Property mode changed from 100755 to 100644
    rf5f6ec0 r1dba5bd  
    44# binary.
    55
    6 SRCDIR=`dirname "${0}"`
    76EXE="$0.bin"
    87
     
    1211fi
    1312
    14 BARNOWL_DATA_DIR="$SRCDIR/perl/"
    15 BARNOWL_BIN_DIR="$SRCDIR/"
     13BARNOWL_DATA_DIR="@abs_srcdir@/perl"
     14BARNOWL_BIN_DIR="@abs_builddir@"
    1615export BARNOWL_DATA_DIR
    1716export BARNOWL_BIN_DIR
  • compat/Makefile.am

    r12a6616 rb80bae0  
    11noinst_LIBRARIES = libcompat.a
    22
    3 libcompat_a_SOURCES =
     3libcompat_a_SOURCES = compat.h
    44libcompat_a_LIBADD = $(LIBOBJS)
  • compat/compat.h

    r4dde585 r6249a88f  
    22#define INC_BARNOWL_COMPAT_COMPAT_H
    33
    4 #include "../config.h"
     4#include <config.h>
    55
    66#include <stddef.h>
  • configure.ac

    r06e04a9 reb5e8fc  
    100100dnl Find the location of perl XSUBPP
    101101AC_MSG_CHECKING(for the perl xsubpp precompiler)
    102 XSUBPPDIR="`(perl -MExtUtils::MakeMaker -e 'print ExtUtils::MakeMaker->new({NAME => qw(owl)})->tool_xsubpp;') | grep \^XSUBPPDIR | sed -e 's/XSUBPPDIR = //g;'`"
     102XSUBPPDIR="`cd "$srcdir" && perl -MExtUtils::MakeMaker -e 'print ExtUtils::MakeMaker->new({NAME => qw(owl)})->tool_xsubpp;' | grep \^XSUBPPDIR | sed -e 's/XSUBPPDIR = //g;'`"
    103103if test -n "${XSUBPPDIR}"; then
    104104   AC_MSG_RESULT(${XSUBPPDIR})
  • filterproc.c

    r3496369 r7155955  
    1 #include "owl.h"
     1#include "filterproc.h"
    22#include <sys/wait.h>
     3#include <fcntl.h>
     4#include <glib.h>
    35#include <poll.h>
     6#include <string.h>
     7#include <unistd.h>
    48
    59/* Even in case of error, send_receive is responsible for closing wfd
  • libfaim/Makefile.am

    r215c119 rb80bae0  
    1313libfaim_a_CPPFLAGS = -DAIM_BUILDDATE=\"x\" -DAIM_BUILDTIME=\"x\" \
    1414                     -I${top_srcdir}/libfaim
     15
     16EXTRA_DIST = oscar.c
  • owl.h

    rbbc31e4 r6249a88f  
    1010#define INC_BARNOWL_OWL_H
    1111
    12 #include "config.h"
     12#include <config.h>
    1313
    1414#include "compat/compat.h"
     
    608608extern owl_global g;
    609609
    610 #include "owl_prototypes.h"
     610#include <owl_prototypes.h>
    611611
    612612/* These were missing from the Zephyr includes before Zephyr 3. */
  • perl/Makefile.am

    r10557e6 ra870319  
    11SUBDIRS = modules
     2nobase_dist_pkgdata_DATA = \
     3        lib/BarnOwl.pm \
     4        lib/BarnOwl/Complete/AIM.pm \
     5        lib/BarnOwl/Complete/Client.pm \
     6        lib/BarnOwl/Complete/Filter.pm \
     7        lib/BarnOwl/Complete/Zephyr.pm \
     8        lib/BarnOwl/Completion.pm \
     9        lib/BarnOwl/Completion/Context.pm \
     10        lib/BarnOwl/Completion/Util.pm \
     11        lib/BarnOwl/Editwin.pm \
     12        lib/BarnOwl/Help.pm \
     13        lib/BarnOwl/Hook.pm \
     14        lib/BarnOwl/Hooks.pm \
     15        lib/BarnOwl/MainLoopCompatHook.pm \
     16        lib/BarnOwl/Message.pm \
     17        lib/BarnOwl/Message/AIM.pm \
     18        lib/BarnOwl/Message/Admin.pm \
     19        lib/BarnOwl/Message/Generic.pm \
     20        lib/BarnOwl/Message/Loopback.pm \
     21        lib/BarnOwl/Message/Zephyr.pm \
     22        lib/BarnOwl/ModuleLoader.pm \
     23        lib/BarnOwl/Parse.pm \
     24        lib/BarnOwl/Style.pm \
     25        lib/BarnOwl/Style/Basic.pm \
     26        lib/BarnOwl/Style/Default.pm \
     27        lib/BarnOwl/Style/Legacy.pm \
     28        lib/BarnOwl/Style/OneLine.pm \
     29        lib/BarnOwl/Timer.pm \
     30        lib/BarnOwl/Zephyr.pm \
     31        lib/Module/Install/BarnOwl.pm
  • perl/modules/Makefile.am

    r35c5bd8 reb5e8fc  
    22
    33EXTRA_DIST = $(MODULES:=/Makefile.PL) $(MODULES:=/inc) $(MODULES:=/lib)
     4EXTRA_DIST += \
     5    Facebook/README \
     6    Twitter/README \
     7    Twitter/twitter.example
    48
    59all-local: $(MODULES)
     
    913MODULES_MAKEFILE = $(MODULES:=/Makefile)
    1014$(MODULES_MAKEFILE): %/Makefile: %/Makefile.PL
     15        [ $(srcdir) = . ] || cp -srf --no-preserve=mode -- $(abs_srcdir)/$*/. $*
    1116        $(AM_V_GEN)(cd $* && perl -I../../lib Makefile.PL)
    1217
     
    1419clean-local: $(MODULES_CLEAN)
    1520$(MODULES_CLEAN): clean_%:
    16         (cd $* && (test ! -f Makefile || $(MAKE) clean))
     21        if [ $(srcdir) = . ]; then \
     22            (cd $* && { test ! -f Makefile || $(MAKE) realclean; }) && \
     23            rm -f $*/$*.par; \
     24        else \
     25            rm -rf $*; \
     26        fi
    1727
    1828MODULES_INSTALL = $(MODULES:%=module_install_%)
     
    2333        ${INSTALL_DATA} $*/$*.par ${DESTDIR}${pkgdatadir}/modules/$*.par
    2434
     35uninstall-local:
     36        rm -f $(MODULES:%=${DESTDIR}${pkgdatadir}/modules/%.par)
     37
    2538.PHONY: $(MODULES) $(MODULES_CLEAN) $(MODULES_INSTALL)
  • runtests.sh

    rf6ab6ee r5db8835  
    11#!/bin/sh
    2 exec env HARNESS_PERL=./tester prove --failures t/
     2exec env HARNESS_PERL=./tester prove --failures "${srcdir:=$(dirname "$0")}/t/"
  • t/00-core-tests.t

    r95414bf r5db8835  
    11#!/usr/bin/env perl
    2 use File::Basename;
    3 system(dirname($0) . "/../tester", "--builtin");
     2system("./tester", "--builtin");
  • zcrypt.c

    rd72ba1e r6249a88f  
    1717#include <ctype.h>
    1818
    19 #include "config.h"
     19#include <config.h>
    2020
    2121#ifdef HAVE_KERBEROS_IV
Note: See TracChangeset for help on using the changeset viewer.