diff options
Diffstat (limited to 'gfsm')
-rw-r--r-- | gfsm/Makefile.am | 4 | ||||
-rw-r--r-- | gfsm/Makefile.in | 12 | ||||
-rw-r--r-- | gfsm/README.cvs | 13 | ||||
-rw-r--r-- | gfsm/README.svn | 21 | ||||
-rw-r--r-- | gfsm/aclocal.m4 | 2 | ||||
-rw-r--r-- | gfsm/config/Makefile.am | 2 | ||||
-rw-r--r-- | gfsm/config/Makefile.in | 10 | ||||
-rwxr-xr-x | gfsm/configure | 24 | ||||
-rw-r--r-- | gfsm/configure.ac | 4 | ||||
l--------- | gfsm/m4 | 1 | ||||
l--------- | gfsm/pdexternal.am | 1 | ||||
-rw-r--r-- | gfsm/src/Makefile.am | 2 | ||||
-rw-r--r-- | gfsm/src/Makefile.in | 8 | ||||
l--------- | gfsm/svn-prepare.sh | 1 |
14 files changed, 56 insertions, 49 deletions
diff --git a/gfsm/Makefile.am b/gfsm/Makefile.am index 8f590b3..0a62ea4 100644 --- a/gfsm/Makefile.am +++ b/gfsm/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 diff --git a/gfsm/Makefile.in b/gfsm/Makefile.in index 739188f..39cd028 100644 --- a/gfsm/Makefile.in +++ b/gfsm/Makefile.in @@ -49,11 +49,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure \ - $(top_srcdir)/pdexternal.am COPYING + $(srcdir)/Makefile.in $(top_srcdir)/common/pdexternal.am \ + $(top_srcdir)/configure COPYING 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) @@ -268,7 +268,7 @@ MAINTAINERCLEANFILES = *~ \ #----------------------------------------------------------------------- # Options & Subdirectories #----------------------------------------------------------------------- -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I common/m4 #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip AUTOMAKE_OPTIONS = foreign @@ -286,7 +286,7 @@ all: all-recursive .SUFFIXES: .@PDEXT@ .pod .txt .html 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*) \ @@ -463,7 +463,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/m4 + $(mkdir_p) $(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/gfsm/README.cvs b/gfsm/README.cvs deleted file mode 100644 index 2a0ee0c..0000000 --- a/gfsm/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/gfsm/README.svn b/gfsm/README.svn new file mode 100644 index 0000000..2fc9816 --- /dev/null +++ b/gfsm/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/gfsm/aclocal.m4 b/gfsm/aclocal.m4 index a5516e1..0273319 100644 --- a/gfsm/aclocal.m4 +++ b/gfsm/aclocal.m4 @@ -7416,4 +7416,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/gfsm/config/Makefile.am b/gfsm/config/Makefile.am index cd4d337..0fd8484 100644 --- a/gfsm/config/Makefile.am +++ b/gfsm/config/Makefile.am @@ -9,4 +9,4 @@ #----------------------------------------------------------------------- # Includes #----------------------------------------------------------------------- -include $(top_srcdir)/pdexternal.am +include $(top_srcdir)/common/pdexternal.am diff --git a/gfsm/config/Makefile.in b/gfsm/config/Makefile.in index f45de05..a2f2e1d 100644 --- a/gfsm/config/Makefile.in +++ b/gfsm/config/Makefile.in @@ -41,11 +41,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/pdexternal.am config.guess config.sub depcomp \ - install-sh ltmain.sh missing + $(top_srcdir)/common/pdexternal.am config.guess config.sub \ + depcomp install-sh ltmain.sh missing subdir = config 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) @@ -235,7 +235,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .@PDEXT@ .pod .txt .html -$(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*) \ @@ -282,7 +282,7 @@ CTAGS: distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/.. + $(mkdir_p) $(distdir)/../common @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/gfsm/configure b/gfsm/configure index f6922d3..ef88f9f 100755 --- a/gfsm/configure +++ b/gfsm/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for pd-gfsm 0.05-1. +# Generated by GNU Autoconf 2.61 for pd-gfsm 0.05-2. # # Report bugs to <moocow@ling.uni-potsdam.de>. # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='pd-gfsm' PACKAGE_TARNAME='pd-gfsm' -PACKAGE_VERSION='0.05-1' -PACKAGE_STRING='pd-gfsm 0.05-1' +PACKAGE_VERSION='0.05-2' +PACKAGE_STRING='pd-gfsm 0.05-2' PACKAGE_BUGREPORT='moocow@ling.uni-potsdam.de' ac_default_prefix=/usr/local @@ -1422,7 +1422,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 pd-gfsm 0.05-1 to adapt to many kinds of systems. +\`configure' configures pd-gfsm 0.05-2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1492,7 +1492,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pd-gfsm 0.05-1:";; + short | recursive ) echo "Configuration of pd-gfsm 0.05-2:";; esac cat <<\_ACEOF @@ -1614,7 +1614,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pd-gfsm configure 0.05-1 +pd-gfsm configure 0.05-2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1628,7 +1628,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 pd-gfsm $as_me 0.05-1, which was +It was created by pd-gfsm $as_me 0.05-2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2310,7 +2310,7 @@ fi # Define the identity of the package. PACKAGE=pd-gfsm - VERSION=0.05-1 + VERSION=0.05-2 cat >>confdefs.h <<_ACEOF @@ -20149,7 +20149,7 @@ else fi if test -n "$pdincludedir" ; then - IFLAGS="$IFLAGS -I$pdincludedir" + PDEXT_IFLAGS="$PDEXT_IFLAGS -I$pdincludedir" fi @@ -20217,7 +20217,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 @@ -21249,7 +21249,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 pd-gfsm $as_me 0.05-1, which was +This file was extended by pd-gfsm $as_me 0.05-2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21302,7 +21302,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -pd-gfsm config.status 0.05-1 +pd-gfsm config.status 0.05-2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/gfsm/configure.ac b/gfsm/configure.ac index dfd380e..fc48396 100644 --- a/gfsm/configure.ac +++ b/gfsm/configure.ac @@ -4,13 +4,13 @@ AC_PREREQ(2.5) dnl Some handy macros define([THE_PACKAGE_NAME], [pd-gfsm]) -define([THE_PACKAGE_VERSION], [0.05-1]) +define([THE_PACKAGE_VERSION], [0.05-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 AC_CONFIG_AUX_DIR(config) diff --git a/gfsm/m4 b/gfsm/m4 deleted file mode 120000 index 83ffc0c..0000000 --- a/gfsm/m4 +++ /dev/null @@ -1 +0,0 @@ -../common/m4
\ No newline at end of file diff --git a/gfsm/pdexternal.am b/gfsm/pdexternal.am deleted file mode 120000 index 914f4be..0000000 --- a/gfsm/pdexternal.am +++ /dev/null @@ -1 +0,0 @@ -../common/pdexternal.am
\ No newline at end of file diff --git a/gfsm/src/Makefile.am b/gfsm/src/Makefile.am index 3b18b75..5d0ef26 100644 --- a/gfsm/src/Makefile.am +++ b/gfsm/src/Makefile.am @@ -9,7 +9,7 @@ #----------------------------------------------------------------------- # Includes #----------------------------------------------------------------------- -include $(top_srcdir)/pdexternal.am +include $(top_srcdir)/common/pdexternal.am #----------------------------------------------------------------------- # Options & Subdirectories diff --git a/gfsm/src/Makefile.in b/gfsm/src/Makefile.in index a4194a6..c03ed6c 100644 --- a/gfsm/src/Makefile.in +++ b/gfsm/src/Makefile.in @@ -51,11 +51,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in $(top_srcdir)/pdexternal.am + $(srcdir)/config.h.in $(top_srcdir)/common/pdexternal.am pdexterns_PROGRAMS = gfsm$(EXEEXT) subdir = src 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) @@ -306,7 +306,7 @@ all: config.h .SUFFIXES: .SUFFIXES: .@PDEXT@ .pod .txt .html .c .lo .o .obj -$(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*) \ @@ -512,7 +512,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/.. + $(mkdir_p) $(distdir)/../common @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/gfsm/svn-prepare.sh b/gfsm/svn-prepare.sh new file mode 120000 index 0000000..12a9e5b --- /dev/null +++ b/gfsm/svn-prepare.sh @@ -0,0 +1 @@ +../common/svn-prepare.sh
\ No newline at end of file |