Changes in / [4adc69b:13a39ae8]

Files:

• Makefile.am (modified) (6 diffs)
• barnowl (added)
• barnowl-wrapper.in (deleted)
• compat/Makefile.am (modified) (1 diff)
• compat/compat.h (modified) (1 diff)
• configure.ac (modified) (1 diff)
• filterproc.c (modified) (1 diff)
• libfaim/Makefile.am (modified) (1 diff)
• owl.h (modified) (2 diffs)
• perl/Makefile.am (modified) (1 diff)
• perl/modules/Makefile.am (modified) (4 diffs)
• runtests.sh (modified) (1 diff)
• t/00-core-tests.t (modified) (1 diff)
• tester (added)
• zcrypt.c (modified) (1 diff)

Makefile.am

@@ -12 +12 @@
 
 check_PROGRAMS = tester.bin
-dist_check_DATA = t
-dist_check_SCRIPTS = runtests.sh
-
-bin_SCRIPTS = barnowl
-check_SCRIPTS = tester
-
-barnowl tester: %: barnowl-wrapper.in %.bin Makefile
-        sed \
-            -e 's,[@]abs_srcdir[@],$(abs_srcdir),g' \
-            -e 's,[@]abs_builddir[@],$(abs_builddir),g' \
-            $< > $@
-        chmod +x $@
 
 barnowl_bin_SOURCES = $(BASE_SRCS) \
-     owl.h owl_perl.h \
-     owl.c
-nodist_barnowl_bin_SOURCES = $(GEN_C) $(GEN_H)
+     owl.h owl_perl.h config.h \
+     owl.c \
+     $(GEN_C) $(GEN_H)
 
-dist_man_MANS = doc/barnowl.1
-dist_doc_DATA = doc/intro.txt doc/advanced.txt
+man_MANS = doc/barnowl.1
+doc_DATA = doc/intro.txt doc/advanced.txt
 
 barnowl_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
 
 tester_bin_SOURCES = $(BASE_SRCS) \
-     owl.h owl_perl.h \
+     owl.h owl_perl.h config.h \
+     $(GEN_C) $(GEN_H) \
      tester.c
-nodist_tester_bin_SOURCES = $(GEN_C) $(GEN_H)
 
 tester_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
@@ -44 +32 @@
 TESTS=runtests.sh
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS = -I$(top_srcdir)/ \
            -I$(top_srcdir)/libfaim/ \
            -DDATADIR='"$(pkgdatadir)"' \
@@ -60 +48 @@
      mainpanel.c msgwin.c sepbar.c editcontext.c signal.c closures.c
 
-NORMAL_SRCS = filterproc.c filterproc.h window.c window.h windowcb.c
+NORMAL_SRCS = filterproc.c window.c windowcb.c
 
 BASE_SRCS = $(CODELIST_SRCS) $(NORMAL_SRCS)
 
 GEN_C = varstubs.c perlglue.c gmarshal_funcs.c
-GEN_H = owl_prototypes.h owl_prototypes.h.new gmarshal_funcs.h
+GEN_H = owl_prototypes.h gmarshal_funcs.h
 
 BUILT_SOURCES = $(GEN_C) $(GEN_H)
@@ -78 +66 @@
 proto: owl_prototypes.h
 
-perlglue.c: perlglue.xs typemap
-        $(AM_V_GEN)perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes $< > $@
+perlglue.c: perlglue.xs $(TYPEMAP)
+        $(AM_V_GEN)perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes perlglue.xs > perlglue.c
 
 varstubs.c: stubgen.pl variable.c
@@ -96 +84 @@
         $(COMPILE) -Wall -Wextra -pedantic -fsyntax-only $(CHK_SOURCES)
 
+install-data-local:
+        $(mkinstalldirs) ${DESTDIR}${pkgdatadir}/lib
+        (cd perl/lib && tar -cf - . ) | (cd ${DESTDIR}${pkgdatadir}/lib && tar -xf - )
+
 do_transform = $(shell echo '$(1)' | sed '$(transform)')
 install-exec-hook:
@@ -101 +93 @@
               $(DESTDIR)$(bindir)/$(call do_transform,barnowl)
 
-uninstall-local:
-        rm -f $(DESTDIR)$(bindir)/$(call do_transform,barnowl)
-
-CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS) $(check_SCRIPTS)
-EXTRA_DIST = \
-    autogen.sh \
-    barnowl-wrapper.in \
-    codelist.pl \
-    doc \
-    examples \
-    marshal_types \
-    perlglue.xs \
-    scripts \
-    stubgen.pl \
-    typemap
-
 SUBDIRS = compat libfaim perl

compat/Makefile.am

@@ -1 +1 @@
 noinst_LIBRARIES = libcompat.a
 
-libcompat_a_SOURCES = compat.h
+libcompat_a_SOURCES =
 libcompat_a_LIBADD = $(LIBOBJS)

compat/compat.h

@@ -2 +2 @@
 #define INC_BARNOWL_COMPAT_COMPAT_H
 
-#include <config.h>
+#include "../config.h"
 
 #include <stddef.h>

configure.ac

@@ -100 +100 @@
 dnl Find the location of perl XSUBPP
 AC_MSG_CHECKING(for the perl xsubpp precompiler)
-XSUBPPDIR="`cd "$srcdir" && perl -MExtUtils::MakeMaker -e 'print ExtUtils::MakeMaker->new({NAME => qw(owl)})->tool_xsubpp;' | grep \^XSUBPPDIR | sed -e 's/XSUBPPDIR = //g;'`"
+XSUBPPDIR="`(perl -MExtUtils::MakeMaker -e 'print ExtUtils::MakeMaker->new({NAME => qw(owl)})->tool_xsubpp;') | grep \^XSUBPPDIR | sed -e 's/XSUBPPDIR = //g;'`"
 if test -n "${XSUBPPDIR}"; then
    AC_MSG_RESULT(${XSUBPPDIR})

filterproc.c

@@ -1 @@
-#include "filterproc.h"
+#include "owl.h"
 #include <sys/wait.h>
-#include <fcntl.h>
-#include <glib.h>
 #include <poll.h>
-#include <string.h>
-#include <unistd.h>
 
 /* Even in case of error, send_receive is responsible for closing wfd

libfaim/Makefile.am

@@ -13 +13 @@
 libfaim_a_CPPFLAGS = -DAIM_BUILDDATE=\"x\" -DAIM_BUILDTIME=\"x\" \
                      -I${top_srcdir}/libfaim
-
-EXTRA_DIST = oscar.c

owl.h

@@ -10 +10 @@
 #define INC_BARNOWL_OWL_H
 
-#include <config.h>
+#include "config.h"
 
 #include "compat/compat.h"
@@ -608 +608 @@
 extern owl_global g;
 
-#include <owl_prototypes.h>
+#include "owl_prototypes.h"
 
 /* These were missing from the Zephyr includes before Zephyr 3. */

perl/Makefile.am

@@ -1 +1 @@
 SUBDIRS = modules
-nobase_dist_pkgdata_DATA = \
-        lib/BarnOwl.pm \
-        lib/BarnOwl/Complete/AIM.pm \
-        lib/BarnOwl/Complete/Client.pm \
-        lib/BarnOwl/Complete/Filter.pm \
-        lib/BarnOwl/Complete/Zephyr.pm \
-        lib/BarnOwl/Completion.pm \
-        lib/BarnOwl/Completion/Context.pm \
-        lib/BarnOwl/Completion/Util.pm \
-        lib/BarnOwl/Editwin.pm \
-        lib/BarnOwl/Help.pm \
-        lib/BarnOwl/Hook.pm \
-        lib/BarnOwl/Hooks.pm \
-        lib/BarnOwl/MainLoopCompatHook.pm \
-        lib/BarnOwl/Message.pm \
-        lib/BarnOwl/Message/AIM.pm \
-        lib/BarnOwl/Message/Admin.pm \
-        lib/BarnOwl/Message/Generic.pm \
-        lib/BarnOwl/Message/Loopback.pm \
-        lib/BarnOwl/Message/Zephyr.pm \
-        lib/BarnOwl/ModuleLoader.pm \
-        lib/BarnOwl/Parse.pm \
-        lib/BarnOwl/Style.pm \
-        lib/BarnOwl/Style/Basic.pm \
-        lib/BarnOwl/Style/Default.pm \
-        lib/BarnOwl/Style/Legacy.pm \
-        lib/BarnOwl/Style/OneLine.pm \
-        lib/BarnOwl/Timer.pm \
-        lib/BarnOwl/Zephyr.pm \
-        lib/Module/Install/BarnOwl.pm

perl/modules/Makefile.am

@@ -2 +2 @@
 
 EXTRA_DIST = $(MODULES:=/Makefile.PL) $(MODULES:=/inc) $(MODULES:=/lib)
-EXTRA_DIST += \
-    Facebook/README \
-    Twitter/README \
-    Twitter/twitter.example
 
 all-local: $(MODULES)
@@ -13 +9 @@
 MODULES_MAKEFILE = $(MODULES:=/Makefile)
 $(MODULES_MAKEFILE): %/Makefile: %/Makefile.PL
-        [ $(srcdir) = . ] || cp -srf --no-preserve=mode -- $(abs_srcdir)/$*/. $*
         $(AM_V_GEN)(cd $* && perl -I../../lib Makefile.PL)
 
@@ -19 +14 @@
 clean-local: $(MODULES_CLEAN)
 $(MODULES_CLEAN): clean_%:
-        if [ $(srcdir) = . ]; then \
-            (cd $* && { test ! -f Makefile || $(MAKE) realclean; }) && \
-            rm -f $*/$*.par; \
-        else \
-            rm -rf $*; \
-        fi
+        (cd $* && (test ! -f Makefile || $(MAKE) clean))
 
 MODULES_INSTALL = $(MODULES:%=module_install_%)
@@ -33 +23 @@
         ${INSTALL_DATA} $*/$*.par ${DESTDIR}${pkgdatadir}/modules/$*.par
 
-uninstall-local:
-        rm -f $(MODULES:%=${DESTDIR}${pkgdatadir}/modules/%.par)
-
 .PHONY: $(MODULES) $(MODULES_CLEAN) $(MODULES_INSTALL)

runtests.sh

@@ -1 +1 @@
 #!/bin/sh
-exec env HARNESS_PERL=./tester prove --failures "${srcdir:=$(dirname "$0")}/t/"
+exec env HARNESS_PERL=./tester prove --failures t/

t/00-core-tests.t

@@ -1 +1 @@
 #!/usr/bin/env perl
-system("./tester", "--builtin");
+use File::Basename;
+system(dirname($0) . "/../tester", "--builtin");

zcrypt.c

@@ -17 +17 @@
 #include <ctype.h>
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_KERBEROS_IV