Changeset 4adc69b
- Timestamp:
- Apr 4, 2013, 2:32:56 AM (12 years ago)
- 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. - Files:
-
- 1 deleted
- 12 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
Makefile.am
r353719a r3624a2c 12 12 13 13 check_PROGRAMS = tester.bin 14 dist_check_DATA = t 15 dist_check_SCRIPTS = runtests.sh 16 17 bin_SCRIPTS = barnowl 18 check_SCRIPTS = tester 19 20 barnowl 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 $@ 14 26 15 27 barnowl_bin_SOURCES = $(BASE_SRCS) \ 16 owl.h owl_perl.h config.h\17 owl.c \18 28 owl.h owl_perl.h \ 29 owl.c 30 nodist_barnowl_bin_SOURCES = $(GEN_C) $(GEN_H) 19 31 20 man_MANS = doc/barnowl.121 d oc_DATA = doc/intro.txt doc/advanced.txt32 dist_man_MANS = doc/barnowl.1 33 dist_doc_DATA = doc/intro.txt doc/advanced.txt 22 34 23 35 barnowl_bin_LDADD = compat/libcompat.a libfaim/libfaim.a 24 36 25 37 tester_bin_SOURCES = $(BASE_SRCS) \ 26 owl.h owl_perl.h config.h \ 27 $(GEN_C) $(GEN_H) \ 38 owl.h owl_perl.h \ 28 39 tester.c 40 nodist_tester_bin_SOURCES = $(GEN_C) $(GEN_H) 29 41 30 42 tester_bin_LDADD = compat/libcompat.a libfaim/libfaim.a … … 32 44 TESTS=runtests.sh 33 45 34 AM_CPPFLAGS = -I$(top_srcdir)/\46 AM_CPPFLAGS = \ 35 47 -I$(top_srcdir)/libfaim/ \ 36 48 -DDATADIR='"$(pkgdatadir)"' \ … … 48 60 mainpanel.c msgwin.c sepbar.c editcontext.c signal.c closures.c 49 61 50 NORMAL_SRCS = filterproc.c window.cwindowcb.c62 NORMAL_SRCS = filterproc.c filterproc.h window.c window.h windowcb.c 51 63 52 64 BASE_SRCS = $(CODELIST_SRCS) $(NORMAL_SRCS) 53 65 54 66 GEN_C = varstubs.c perlglue.c gmarshal_funcs.c 55 GEN_H = owl_prototypes.h gmarshal_funcs.h67 GEN_H = owl_prototypes.h owl_prototypes.h.new gmarshal_funcs.h 56 68 57 69 BUILT_SOURCES = $(GEN_C) $(GEN_H) … … 66 78 proto: owl_prototypes.h 67 79 68 perlglue.c: perlglue.xs $(TYPEMAP)69 $(AM_V_GEN)perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes perlglue.xs > perlglue.c80 perlglue.c: perlglue.xs typemap 81 $(AM_V_GEN)perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes $< > $@ 70 82 71 83 varstubs.c: stubgen.pl variable.c … … 84 96 $(COMPILE) -Wall -Wextra -pedantic -fsyntax-only $(CHK_SOURCES) 85 97 86 install-data-local:87 $(mkinstalldirs) ${DESTDIR}${pkgdatadir}/lib88 (cd perl/lib && tar -cf - . ) | (cd ${DESTDIR}${pkgdatadir}/lib && tar -xf - )89 90 98 do_transform = $(shell echo '$(1)' | sed '$(transform)') 91 99 install-exec-hook: … … 93 101 $(DESTDIR)$(bindir)/$(call do_transform,barnowl) 94 102 103 uninstall-local: 104 rm -f $(DESTDIR)$(bindir)/$(call do_transform,barnowl) 105 106 CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS) $(check_SCRIPTS) 107 EXTRA_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 95 119 SUBDIRS = compat libfaim perl -
barnowl-wrapper.in
- Property mode changed from 100755 to 100644
rf5f6ec0 r1dba5bd 4 4 # binary. 5 5 6 SRCDIR=`dirname "${0}"`7 6 EXE="$0.bin" 8 7 … … 12 11 fi 13 12 14 BARNOWL_DATA_DIR=" $SRCDIR/perl/"15 BARNOWL_BIN_DIR=" $SRCDIR/"13 BARNOWL_DATA_DIR="@abs_srcdir@/perl" 14 BARNOWL_BIN_DIR="@abs_builddir@" 16 15 export BARNOWL_DATA_DIR 17 16 export BARNOWL_BIN_DIR -
compat/Makefile.am
r12a6616 rb80bae0 1 1 noinst_LIBRARIES = libcompat.a 2 2 3 libcompat_a_SOURCES = 3 libcompat_a_SOURCES = compat.h 4 4 libcompat_a_LIBADD = $(LIBOBJS) -
compat/compat.h
r4dde585 r6249a88f 2 2 #define INC_BARNOWL_COMPAT_COMPAT_H 3 3 4 #include "../config.h"4 #include <config.h> 5 5 6 6 #include <stddef.h> -
configure.ac
r06e04a9 reb5e8fc 100 100 dnl Find the location of perl XSUBPP 101 101 AC_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;'`"102 XSUBPPDIR="`cd "$srcdir" && perl -MExtUtils::MakeMaker -e 'print ExtUtils::MakeMaker->new({NAME => qw(owl)})->tool_xsubpp;' | grep \^XSUBPPDIR | sed -e 's/XSUBPPDIR = //g;'`" 103 103 if test -n "${XSUBPPDIR}"; then 104 104 AC_MSG_RESULT(${XSUBPPDIR}) -
filterproc.c
r3496369 r7155955 1 #include " owl.h"1 #include "filterproc.h" 2 2 #include <sys/wait.h> 3 #include <fcntl.h> 4 #include <glib.h> 3 5 #include <poll.h> 6 #include <string.h> 7 #include <unistd.h> 4 8 5 9 /* Even in case of error, send_receive is responsible for closing wfd -
libfaim/Makefile.am
r215c119 rb80bae0 13 13 libfaim_a_CPPFLAGS = -DAIM_BUILDDATE=\"x\" -DAIM_BUILDTIME=\"x\" \ 14 14 -I${top_srcdir}/libfaim 15 16 EXTRA_DIST = oscar.c -
owl.h
rbbc31e4 r6249a88f 10 10 #define INC_BARNOWL_OWL_H 11 11 12 #include "config.h"12 #include <config.h> 13 13 14 14 #include "compat/compat.h" … … 608 608 extern owl_global g; 609 609 610 #include "owl_prototypes.h"610 #include <owl_prototypes.h> 611 611 612 612 /* These were missing from the Zephyr includes before Zephyr 3. */ -
perl/Makefile.am
r10557e6 ra870319 1 1 SUBDIRS = modules 2 nobase_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 2 2 3 3 EXTRA_DIST = $(MODULES:=/Makefile.PL) $(MODULES:=/inc) $(MODULES:=/lib) 4 EXTRA_DIST += \ 5 Facebook/README \ 6 Twitter/README \ 7 Twitter/twitter.example 4 8 5 9 all-local: $(MODULES) … … 9 13 MODULES_MAKEFILE = $(MODULES:=/Makefile) 10 14 $(MODULES_MAKEFILE): %/Makefile: %/Makefile.PL 15 [ $(srcdir) = . ] || cp -srf --no-preserve=mode -- $(abs_srcdir)/$*/. $* 11 16 $(AM_V_GEN)(cd $* && perl -I../../lib Makefile.PL) 12 17 … … 14 19 clean-local: $(MODULES_CLEAN) 15 20 $(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 17 27 18 28 MODULES_INSTALL = $(MODULES:%=module_install_%) … … 23 33 ${INSTALL_DATA} $*/$*.par ${DESTDIR}${pkgdatadir}/modules/$*.par 24 34 35 uninstall-local: 36 rm -f $(MODULES:%=${DESTDIR}${pkgdatadir}/modules/%.par) 37 25 38 .PHONY: $(MODULES) $(MODULES_CLEAN) $(MODULES_INSTALL) -
runtests.sh
rf6ab6ee r5db8835 1 1 #!/bin/sh 2 exec env HARNESS_PERL=./tester prove --failures t/2 exec env HARNESS_PERL=./tester prove --failures "${srcdir:=$(dirname "$0")}/t/" -
t/00-core-tests.t
r95414bf r5db8835 1 1 #!/usr/bin/env perl 2 use File::Basename; 3 system(dirname($0) . "/../tester", "--builtin"); 2 system("./tester", "--builtin"); -
zcrypt.c
rd72ba1e r6249a88f 17 17 #include <ctype.h> 18 18 19 #include "config.h"19 #include <config.h> 20 20 21 21 #ifdef HAVE_KERBEROS_IV
Note: See TracChangeset
for help on using the changeset viewer.