aboutsummaryrefslogtreecommitdiff
path: root/sprinkler
diff options
context:
space:
mode:
Diffstat (limited to 'sprinkler')
-rw-r--r--sprinkler/Makefile.am8
-rw-r--r--sprinkler/Makefile.in16
-rw-r--r--sprinkler/README.cvs13
-rw-r--r--sprinkler/README.svn21
-rw-r--r--sprinkler/aclocal.m42
-rwxr-xr-xsprinkler/configure24
-rw-r--r--sprinkler/configure.ac4
l---------sprinkler/m41
l---------sprinkler/mooPdUtils.h1
l---------sprinkler/pdexternal.am1
l---------sprinkler/svn-prepare.sh1
11 files changed, 51 insertions, 41 deletions
diff --git a/sprinkler/Makefile.am b/sprinkler/Makefile.am
index 73dce37..cb492e9 100644
--- a/sprinkler/Makefile.am
+++ b/sprinkler/Makefile.am
@@ -9,14 +9,14 @@
#-----------------------------------------------------------------------
# Includes
#-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
#-----------------------------------------------------------------------
# Options & Subdirectories
#-----------------------------------------------------------------------
##-- aclocal options (top level only)
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I common/m4
## --- automake options
#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
@@ -53,4 +53,6 @@ pddoc_DATA = sprinkler-help.pd
# sources
#-----------------------------------------------------------------------
-sprinkler_SOURCES = sprinkler.c mooPdUtils.h
+sprinkler_SOURCES = sprinkler.c common/mooPdUtils.h
+
+AM_CPPFLAGS = -I$(top_srcdir)/common
diff --git a/sprinkler/Makefile.in b/sprinkler/Makefile.in
index 8593979..21b860d 100644
--- a/sprinkler/Makefile.in
+++ b/sprinkler/Makefile.in
@@ -50,13 +50,14 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/sprinkler-help.pd.in $(top_srcdir)/configure \
- $(top_srcdir)/pdexternal.am COPYING depcomp install-sh missing
+ $(srcdir)/sprinkler-help.pd.in \
+ $(top_srcdir)/common/pdexternal.am $(top_srcdir)/configure \
+ COPYING depcomp install-sh missing
pdexterns_PROGRAMS = sprinkler$(EXEEXT)
EXTRA_PROGRAMS = sprinkler$(EXEEXT)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -259,7 +260,7 @@ MAINTAINERCLEANFILES = *~ \
#-----------------------------------------------------------------------
# Options & Subdirectories
#-----------------------------------------------------------------------
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I common/m4
#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
AUTOMAKE_OPTIONS = foreign
@@ -276,7 +277,8 @@ pddoc_DATA = sprinkler-help.pd
#-----------------------------------------------------------------------
# sources
#-----------------------------------------------------------------------
-sprinkler_SOURCES = sprinkler.c mooPdUtils.h
+sprinkler_SOURCES = sprinkler.c common/mooPdUtils.h
+AM_CPPFLAGS = -I$(top_srcdir)/common
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -284,7 +286,7 @@ all: config.h
.SUFFIXES: .@PDEXT@ .pod .txt .html .c .o .obj
am--refresh:
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -469,7 +471,7 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/. $(distdir)/m4
+ $(mkdir_p) $(distdir)/. $(distdir)/common $(distdir)/common/m4
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
diff --git a/sprinkler/README.cvs b/sprinkler/README.cvs
deleted file mode 100644
index 2a0ee0c..0000000
--- a/sprinkler/README.cvs
+++ /dev/null
@@ -1,13 +0,0 @@
-To build from cvs, do the following:
-
- ./autogen.sh
- ./configure
- make
- make install
-
-NOTE: The README.txt file in the distribution
-is auto-generated from perl ".pod" format by
-the "pod2text" included in most perl distributions.
-
-marmosets,
- Bryan
diff --git a/sprinkler/README.svn b/sprinkler/README.svn
new file mode 100644
index 0000000..2fc9816
--- /dev/null
+++ b/sprinkler/README.svn
@@ -0,0 +1,21 @@
+To build from subversion sources, do the following:
+
+ ./svn-prepare.sh
+ ./autogen.sh
+ ./configure
+ make
+ make install
+
+You will need recent versions of GNU automake and
+autoconf in order to build from the SVN tree.
+
+The './svn-prepare.sh' script requires some shared code
+in the directory ../common (relative to the package root
+directory).
+
+The README.txt file in the distribution is auto-generated
+from perl ".pod" format by the "pod2text" included in most
+Perl distributions.
+
+marmosets,
+ Bryan
diff --git a/sprinkler/aclocal.m4 b/sprinkler/aclocal.m4
index 4ab8160..0cdbeac 100644
--- a/sprinkler/aclocal.m4
+++ b/sprinkler/aclocal.m4
@@ -889,4 +889,4 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-m4_include([m4/ax_pd_external.m4])
+m4_include([common/m4/ax_pd_external.m4])
diff --git a/sprinkler/configure b/sprinkler/configure
index c6941f4..aeda9f0 100755
--- a/sprinkler/configure
+++ b/sprinkler/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for sprinkler 0.06-1.
+# Generated by GNU Autoconf 2.61 for sprinkler 0.06-2.
#
# Report bugs to <moocow@ling.uni-potsdam.de>.
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='sprinkler'
PACKAGE_TARNAME='sprinkler'
-PACKAGE_VERSION='0.06-1'
-PACKAGE_STRING='sprinkler 0.06-1'
+PACKAGE_VERSION='0.06-2'
+PACKAGE_STRING='sprinkler 0.06-2'
PACKAGE_BUGREPORT='moocow@ling.uni-potsdam.de'
ac_default_prefix=/usr/local
@@ -1193,7 +1193,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sprinkler 0.06-1 to adapt to many kinds of systems.
+\`configure' configures sprinkler 0.06-2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1259,7 +1259,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sprinkler 0.06-1:";;
+ short | recursive ) echo "Configuration of sprinkler 0.06-2:";;
esac
cat <<\_ACEOF
@@ -1359,7 +1359,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sprinkler configure 0.06-1
+sprinkler configure 0.06-2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1373,7 +1373,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sprinkler $as_me 0.06-1, which was
+It was created by sprinkler $as_me 0.06-2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2055,7 +2055,7 @@ fi
# Define the identity of the package.
PACKAGE=sprinkler
- VERSION=0.06-1
+ VERSION=0.06-2
cat >>confdefs.h <<_ACEOF
@@ -3497,7 +3497,7 @@ else
fi
if test -n "$pdincludedir" ; then
- IFLAGS="$IFLAGS -I$pdincludedir"
+ PDEXT_IFLAGS="$PDEXT_IFLAGS -I$pdincludedir"
fi
@@ -3565,7 +3565,7 @@ fi
##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
## check: m_pd.h
- CPPFLAGS="$CPPFLAGS $IFLAGS"
+ CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS"
{ echo "$as_me:$LINENO: checking for m_pd.h" >&5
echo $ECHO_N "checking for m_pd.h... $ECHO_C" >&6; }
if test "${ac_cv_header_m_pd_h+set}" = set; then
@@ -4314,7 +4314,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sprinkler $as_me 0.06-1, which was
+This file was extended by sprinkler $as_me 0.06-2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4367,7 +4367,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-sprinkler config.status 0.06-1
+sprinkler config.status 0.06-2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/sprinkler/configure.ac b/sprinkler/configure.ac
index ef41fa7..c26abc3 100644
--- a/sprinkler/configure.ac
+++ b/sprinkler/configure.ac
@@ -4,13 +4,13 @@ AC_PREREQ(2.5)
dnl Some handy macros
define([THE_PACKAGE_NAME], [sprinkler])
-define([THE_PACKAGE_VERSION], [0.06-1])
+define([THE_PACKAGE_VERSION], [0.06-2])
define([THE_PACKAGE_AUTHOR], [moocow@ling.uni-potsdam.de])
AC_INIT(THE_PACKAGE_NAME, THE_PACKAGE_VERSION, THE_PACKAGE_AUTHOR)
##-- Additional m4 macros
-AC_CONFIG_MACRO_DIR(m4)
+AC_CONFIG_MACRO_DIR(common/m4)
##-- source & aux
dnl AC_CONFIG_AUX_DIR(config)
diff --git a/sprinkler/m4 b/sprinkler/m4
deleted file mode 120000
index 83ffc0c..0000000
--- a/sprinkler/m4
+++ /dev/null
@@ -1 +0,0 @@
-../common/m4 \ No newline at end of file
diff --git a/sprinkler/mooPdUtils.h b/sprinkler/mooPdUtils.h
deleted file mode 120000
index 677b39d..0000000
--- a/sprinkler/mooPdUtils.h
+++ /dev/null
@@ -1 +0,0 @@
-../common/mooPdUtils.h \ No newline at end of file
diff --git a/sprinkler/pdexternal.am b/sprinkler/pdexternal.am
deleted file mode 120000
index 914f4be..0000000
--- a/sprinkler/pdexternal.am
+++ /dev/null
@@ -1 +0,0 @@
-../common/pdexternal.am \ No newline at end of file
diff --git a/sprinkler/svn-prepare.sh b/sprinkler/svn-prepare.sh
new file mode 120000
index 0000000..12a9e5b
--- /dev/null
+++ b/sprinkler/svn-prepare.sh
@@ -0,0 +1 @@
+../common/svn-prepare.sh \ No newline at end of file
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 22:34:55 +0000