diff options
Diffstat (limited to 'weightmap')
| -rw-r--r-- | weightmap/Makefile.am | 88 | ||||
| -rw-r--r-- | weightmap/Makefile.in | 141 | ||||
| -rw-r--r-- | weightmap/aclocal.m4 | 1 | ||||
| -rw-r--r-- | weightmap/config/Makefile.am | 66 | ||||
| -rw-r--r-- | weightmap/config/Makefile.in | 335 | ||||
| -rwxr-xr-x | weightmap/configure | 852 | ||||
| -rw-r--r-- | weightmap/configure.ac | 221 | ||||
| -rwxr-xr-x | weightmap/depcomp (renamed from weightmap/config/depcomp) | 0 | ||||
| -rwxr-xr-x | weightmap/install-sh (renamed from weightmap/config/install-sh) | 0 | ||||
| l--------- | weightmap/m4 | 1 | ||||
| -rwxr-xr-x | weightmap/missing (renamed from weightmap/config/missing) | 0 | ||||
| l--------- | weightmap/pdexternal.am | 1 | ||||
| -rw-r--r-- | weightmap/src/Makefile.am | 105 | ||||
| -rw-r--r-- | weightmap/src/Makefile.in | 319 | ||||
| -rw-r--r-- | weightmap/src/config.h.in | 9 | ||||
| -rw-r--r-- | weightmap/src/weightmap.c | 29 |
16 files changed, 820 insertions, 1348 deletions
diff --git a/weightmap/Makefile.am b/weightmap/Makefile.am index e1c1480..cdf1a87 100644 --- a/weightmap/Makefile.am +++ b/weightmap/Makefile.am @@ -1,5 +1,5 @@ # File: ./Makefile.am -# Package: weightmap +# Package: (pd external): generic # Description: # + top-level automake file # @@ -7,92 +7,30 @@ #----------------------------------------------------------------------- #----------------------------------------------------------------------- -# Options & Subdirectories +# Includes #----------------------------------------------------------------------- +include $(top_srcdir)/pdexternal.am -## --- automake options -#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip -AUTOMAKE_OPTIONS = foreign - -## --- recursion subdirectories -SUBDIRS = config src - -## --- pseudo-deps for '.SUFFIXES' -SUFFIXES = .pod .txt - -#----------------------------------------------------------------------- -# Variables: cleanup +##----------------------------------------------------------------------- +## Options & Subdirectories #----------------------------------------------------------------------- -## --- mostlyclean: built by 'make' & commonly rebuilt -#MOSTLYCLEANFILES = -## --- clean: built by 'make' -#CLEANFILES = +##-- aclocal options (top level only) +ACLOCAL_AMFLAGS = -I m4 -## --- distclean: built by 'configure' -DISTCLEANFILES = \ - config.log \ - config.cache \ - config.status - -## -- maintainerclean: built by maintainer / by hand -MAINTAINERCLEANFILES = *~ \ - $(PODS:.pod=.txt) \ - Makefile Makefile.in \ - aclocal.m4 \ - configure \ - install-sh \ - stamp-h.in \ - config.h.in - -maintainer-clean-local: - rm -rf autom4te.cache - -#CVSCLEAN_SUBDIRS = $(SUBDIRS) - -#CVSCLEANFILES = Makefile.in Makefile +## --- automake options (top level only) +#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip +AUTOMAKE_OPTIONS = foreign +## --- recursion subdirectories +SUBDIRS = src #----------------------------------------------------------------------- # Additional Variables & Rules: PODS #----------------------------------------------------------------------- PODS = README.pod -.pod.txt: - pod2text $< $@ - all-local: $(PODS:.pod=.txt) -#----------------------------------------------------------------------- -# Variables: distribution -#----------------------------------------------------------------------- - ## --- extra distribution files -EXTRA_DIST = \ - $(PODS:.pod=.txt) autogen.sh configure \ - README.cvs COPYING - -## --- recursion subdirectories for 'make dist' -#DIST_SUBDIRS = $(SUBDIRS) - -## --- dist-hook: when another 'Makefile.am' is overkill -#DISTHOOK_DIRS = foo -#DISTHOOK_FILES = foo/bar.txt foo/baz.txt -#dist-hook: -# for d in $(DISTHOOK_DIRS); do\ -# mkdir -p $(distdir)/$$d ;\ -# done -# for f in $(DISTHOOK_FILES); do\ -# cp -p $(srcdir)/$$f $(distdir)/$$f ;\ -# done - -#dist-bz2: dist-bzip2 ; - - -#----------------------------------------------------------------------- -# Rules: cleanup -#----------------------------------------------------------------------- -.PHONY: cvsclean cvsclean-hook - -cvsclean: maintainer-clean ; - +#EXTRA_DIST += $(PODS:.pod=.txt) diff --git a/weightmap/Makefile.in b/weightmap/Makefile.in index 1bf8f30..0376c0e 100644 --- a/weightmap/Makefile.in +++ b/weightmap/Makefile.in @@ -15,16 +15,17 @@ @SET_MAKE@ # File: ./Makefile.am -# Package: weightmap +# Package: (pd external): generic # Description: # + top-level automake file # # Process this file with Automake to create Makefile.in. #----------------------------------------------------------------------- -#----------------------------------------------------------------------- -# Options & Subdirectories -#----------------------------------------------------------------------- +#ACLOCAL_AMFLAGS = -I m4 + +#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip +#AUTOMAKE_OPTIONS = foreign srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -45,11 +46,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -subdir = . DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure COPYING + $(srcdir)/Makefile.in $(top_srcdir)/configure \ + $(top_srcdir)/pdexternal.am COPYING depcomp install-sh missing +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -80,7 +83,6 @@ GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -AFLAGS = @AFLAGS@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ @@ -94,31 +96,28 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ -DEBUG = @DEBUG@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DFLAGS = @DFLAGS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ -IFLAGS = @IFLAGS@ +ENABLE_DEBUG = @ENABLE_DEBUG@ +EXEEXT = .@PDEXT@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LFLAGS = @LFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ -OFLAGS = @OFLAGS@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -127,12 +126,18 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PDEXT = @PDEXT@ -PD_OBJECT_EXTERNALS = @PD_OBJECT_EXTERNALS@ +PDEXT_AFLAGS = @PDEXT_AFLAGS@ +PDEXT_DFLAGS = @PDEXT_DFLAGS@ +PDEXT_IFLAGS = @PDEXT_IFLAGS@ +PDEXT_LFLAGS = @PDEXT_LFLAGS@ +PDEXT_OFLAGS = @PDEXT_OFLAGS@ +PDEXT_WFLAGS = @PDEXT_WFLAGS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -WFLAGS = @WFLAGS@ +WANT_OBJECT_EXTERNALS_FALSE = @WANT_OBJECT_EXTERNALS_FALSE@ +WANT_OBJECT_EXTERNALS_TRUE = @WANT_OBJECT_EXTERNALS_TRUE@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ @@ -160,8 +165,11 @@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pd_buildext = @pd_buildext@ pddir = @pddir@ pddocdir = @pddocdir@ +pdexecdir = @pdexecdir@ +pdextdir = @pdextdir@ pdexternsdir = @pdexternsdir@ pdfdir = @pdfdir@ pdincludedir = @pdincludedir@ @@ -172,18 +180,28 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip -AUTOMAKE_OPTIONS = foreign -SUBDIRS = config src -SUFFIXES = .pod .txt - -#----------------------------------------------------------------------- -# Variables: cleanup -#----------------------------------------------------------------------- -#MOSTLYCLEANFILES = - -#CLEANFILES = +DEXT = @PDEXT@ +SUFFIXES = .@PDEXT@ .pod .txt .html +EXTRA_DIST = \ + $(PODS) \ + $(PODS:.pod=.txt) \ + $(pddoc_DATA) \ + $(pdext_DATA) \ + $(pdexterns_DATA) \ + $(pdexec_DATA) \ + $(wildcard COPYING) \ + $(wildcard Changes) \ + $(wildcard ChangeLog) \ + $(wildcard README.cvs) \ + $(wildcard depcomp) \ + $(wildcard install-sh) \ + $(wildcard ltmain.sh) \ + $(wildcard mising) \ + $(wildcard mkinstalldirs) + + +#all-local: $(PODS:.pod=.txt) +CLEANFILES = *.$(PDEXT) DISTCLEANFILES = \ config.log \ config.cache \ @@ -191,37 +209,46 @@ DISTCLEANFILES = \ MAINTAINERCLEANFILES = *~ \ $(PODS:.pod=.txt) \ - Makefile Makefile.in \ + Makefile \ + Makefile.in \ aclocal.m4 \ + compile \ configure \ + config.h.in \ + config.guess \ + config.sub \ + depcomp \ install-sh \ + ltmain.sh \ + missing \ + mkinstalldirs \ stamp-h.in \ - config.h.in + texinfo.tex \ + ylwrap -#CVSCLEAN_SUBDIRS = $(SUBDIRS) +#----------------------------------------------------------------------- +# Includes +#----------------------------------------------------------------------- -#CVSCLEANFILES = Makefile.in Makefile +#----------------------------------------------------------------------- +ACLOCAL_AMFLAGS = -I m4 + +#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip +AUTOMAKE_OPTIONS = foreign +SUBDIRS = src #----------------------------------------------------------------------- # Additional Variables & Rules: PODS #----------------------------------------------------------------------- PODS = README.pod - -#----------------------------------------------------------------------- -# Variables: distribution -#----------------------------------------------------------------------- -EXTRA_DIST = \ - $(PODS:.pod=.txt) autogen.sh configure \ - README.cvs COPYING - all: all-recursive .SUFFIXES: -.SUFFIXES: .pod .txt +.SUFFIXES: .@PDEXT@ .pod .txt .html am--refresh: @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -389,6 +416,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) + $(mkdir_p) $(distdir)/m4 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -549,6 +577,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,34 +655,22 @@ uninstall-info: uninstall-info-recursive uninstall uninstall-am uninstall-info-am -maintainer-clean-local: - rm -rf autom4te.cache - .pod.txt: pod2text $< $@ -all-local: $(PODS:.pod=.txt) +.pod.html: + pod2html $< --outfile=$@ -#DIST_SUBDIRS = $(SUBDIRS) - -#DISTHOOK_DIRS = foo -#DISTHOOK_FILES = foo/bar.txt foo/baz.txt -#dist-hook: -# for d in $(DISTHOOK_DIRS); do\ -# mkdir -p $(distdir)/$$d ;\ -# done -# for f in $(DISTHOOK_FILES); do\ -# cp -p $(srcdir)/$$f $(distdir)/$$f ;\ -# done - -#dist-bz2: dist-bzip2 ; +maintainer-clean-local: + rm -rf autom4te.cache -#----------------------------------------------------------------------- -# Rules: cleanup -#----------------------------------------------------------------------- .PHONY: cvsclean cvsclean-hook cvsclean: maintainer-clean ; + +all-local: $(PODS:.pod=.txt) + +#EXTRA_DIST += $(PODS:.pod=.txt) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/weightmap/aclocal.m4 b/weightmap/aclocal.m4 index b7a0e85..4ab8160 100644 --- a/weightmap/aclocal.m4 +++ b/weightmap/aclocal.m4 @@ -889,3 +889,4 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/ax_pd_external.m4]) diff --git a/weightmap/config/Makefile.am b/weightmap/config/Makefile.am deleted file mode 100644 index b49d6df..0000000 --- a/weightmap/config/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -## File: config/Makefile.am -## Package: weightmap -## Description: -## + automake file for 'config' package-subdir -## -## Process this file with Automake to create Makefile.in. -##----------------------------------------------------------------------- - -##----------------------------------------------------------------------- -## Variables: options -##----------------------------------------------------------------------- - -##----------------------------------------------------------------------- -## Variables: cleanup -##----------------------------------------------------------------------- - -## --- mostlyclean: built by 'make' & commonly rebuilt -#MOSTLYCLEANFILES = - -## --- clean: built by 'make' -#CLEANFILES = - -## --- distclean: built by 'configure' -#DISTCLEANFILES = - -## -- maintainerclean: built by maintainer / by hand -MAINTAINERCLEANFILES = \ - *~ .*~ \ - compile Makefile Makefile.in \ - config.guess \ - config.sub \ - depcomp \ - install-sh \ - ltmain.sh \ - missing \ - mkinstalldirs \ - texinfo.tex \ - ylwrap - - -##----------------------------------------------------------------------- -## Variables: distribution -##----------------------------------------------------------------------- - -## --- extra distribution files -EXTRA_DIST = \ - Makefile.in \ - depcomp \ - install-sh \ - $(wildcard mkinstalldirs) \ - missing - -# config.guess -# config.sub -# ltmain.sh -# texinfo.tex - -## --- recursion subdirectories for 'make dist' -#DIST_SUBDIRS = $(SUBDIRS) - -#----------------------------------------------------------------------- -# Rules: cleanup -#----------------------------------------------------------------------- -.PHONY: cvsclean cvsclean-hook - -cvsclean: maintainer-clean ; diff --git a/weightmap/config/Makefile.in b/weightmap/config/Makefile.in deleted file mode 100644 index a05e281..0000000 --- a/weightmap/config/Makefile.in +++ /dev/null @@ -1,335 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -#MOSTLYCLEANFILES = - -#CLEANFILES = - -#DISTCLEANFILES = -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -subdir = config -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in depcomp \ - install-sh missing -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AFLAGS = @AFLAGS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUGREPORT = @BUGREPORT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEBUG = @DEBUG@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DFLAGS = @DFLAGS@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EXEEXT = @EXEEXT@ -IFLAGS = @IFLAGS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LFLAGS = @LFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ -OFLAGS = @OFLAGS@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PDEXT = @PDEXT@ -PD_OBJECT_EXTERNALS = @PD_OBJECT_EXTERNALS@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WFLAGS = @WFLAGS@ -ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build_alias = @build_alias@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pddir = @pddir@ -pddocdir = @pddocdir@ -pdexternsdir = @pdexternsdir@ -pdfdir = @pdfdir@ -pdincludedir = @pdincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -MAINTAINERCLEANFILES = \ - *~ .*~ \ - compile Makefile Makefile.in \ - config.guess \ - config.sub \ - depcomp \ - install-sh \ - ltmain.sh \ - missing \ - mkinstalldirs \ - texinfo.tex \ - ylwrap - -EXTRA_DIST = \ - Makefile.in \ - depcomp \ - install-sh \ - $(wildcard mkinstalldirs) \ - missing - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu config/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - - -# config.guess -# config.sub -# ltmain.sh -# texinfo.tex - -#DIST_SUBDIRS = $(SUBDIRS) - -#----------------------------------------------------------------------- -# Rules: cleanup -#----------------------------------------------------------------------- -.PHONY: cvsclean cvsclean-hook - -cvsclean: maintainer-clean ; -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/weightmap/configure b/weightmap/configure index 46b1b87..c471c93 100755 --- a/weightmap/configure +++ b/weightmap/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for weightmap 0.01. +# Generated by GNU Autoconf 2.61 for weightmap 0.01-1. # # Report bugs to <moocow@ling.uni-potsdam.de>. # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='weightmap' PACKAGE_TARNAME='weightmap' -PACKAGE_VERSION='0.01' -PACKAGE_STRING='weightmap 0.01' +PACKAGE_VERSION='0.01-1' +PACKAGE_STRING='weightmap 0.01-1' PACKAGE_BUGREPORT='moocow@ling.uni-potsdam.de' ac_default_prefix=/usr/local @@ -637,6 +637,9 @@ am__leading_dot AMTAR am__tar am__untar +MAINTAINER_MODE_TRUE +MAINTAINER_MODE_FALSE +MAINT CC CFLAGS LDFLAGS @@ -653,24 +656,26 @@ AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE -AFLAGS -DFLAGS -IFLAGS -LFLAGS -OFLAGS -WFLAGS -LD -PDEXT +LN_S BUGREPORT -MAINTAINER_MODE_TRUE -MAINTAINER_MODE_FALSE -MAINT -PD_OBJECT_EXTERNALS +pd_buildext pddir pddocdir pdincludedir +pdextdir pdexternsdir -DEBUG +pdexecdir +WANT_OBJECT_EXTERNALS_TRUE +WANT_OBJECT_EXTERNALS_FALSE +ENABLE_DEBUG +LD +PDEXT +PDEXT_AFLAGS +PDEXT_DFLAGS +PDEXT_IFLAGS +PDEXT_LFLAGS +PDEXT_OFLAGS +PDEXT_WFLAGS LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -1184,7 +1189,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 weightmap 0.01 to adapt to many kinds of systems. +\`configure' configures weightmap 0.01-1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1250,25 +1255,28 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of weightmap 0.01:";; + short | recursive ) echo "Configuration of weightmap 0.01-1:";; esac cat <<\_ACEOF Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors + --enable-object-externals + Whether to build single-object externals + (default=no) --enable-debug build debug version (default=no) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pd-dir=DIR PD base directory (default=PREFIX/pd) - --with-pd-include=DIR PD include directory (default=NONE) - --with-pd-extdir=DIR Directory for PD externals (default=PDDIR/externs) + --with-pd-dir=DIR Pd base directory (default=PREFIX/pd) + --with-pd-include=DIR Pd include directory (default=NONE) + --with-pd-extdir=DIR Directory for Pd externals (default=PDDIR/externs) Some influential environment variables: CC C compiler command @@ -1343,7 +1351,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -weightmap configure 0.01 +weightmap configure 0.01-1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1357,7 +1365,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 weightmap $as_me 0.01, which was +It was created by weightmap $as_me 0.01-1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1711,8 +1719,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +##-- Additional m4 macros + + +##-- source & aux ac_aux_dir= -for ac_dir in config "$srcdir"/config; do +for ac_dir in . "$srcdir"/.; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -1728,8 +1740,8 @@ for ac_dir in config "$srcdir"/config; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in . \"$srcdir\"/." >&5 +echo "$as_me: error: cannot find install-sh or install.sh in . \"$srcdir\"/." >&2;} { (exit 1); exit 1; }; } fi @@ -1743,9 +1755,12 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +##-- save user's CFLAGS,CPPFLAGS UCPPFLAGS="$CPPFLAGS" UCFLAGS="$CFLAGS" +ULDFLAGS="$LDFLAGS" +##-- use automake, autoheader am__api_version="1.9" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2032,7 +2047,7 @@ fi # Define the identity of the package. PACKAGE=weightmap - VERSION=0.01 + VERSION=0.01-1 cat >>confdefs.h <<_ACEOF @@ -2178,12 +2193,119 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - ac_config_headers="$ac_config_headers src/config.h" +##-- Default prefix -ac_ext=c + +{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } + + +if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + + +##-- other flags (?) + +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## Pd external common +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo done +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi +fi + + +{ echo "$as_me:$LINENO: result: $_am_result" >&5 +echo "${ECHO_T}$_am_result" >&6; } +rm -f confinc confmf + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi + + +if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + + + + + ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv + ## prerequisites + + + ##-- save user's CFLAGS,CPPFLAGS (do this before calling AX_PD_EXTERNAL!) + #test -z "$UCPPFLAGS" && UCPPFLAGS="$CPPFLAGS" + #test -z "$UCFLAGS" && UCFLAGS="$CFLAGS" + #test -z "$ULDFLAGS" && ULDFLAGS="$LDFLAGS" + + ##-- Programs, prefix + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -3101,71 +3223,6 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi - - -{ echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6; } -rm -f confinc confmf - -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi - - -if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - - depcc="$CC" am_compiler_list= @@ -3276,7 +3333,7 @@ else fi -# Find a good install program. We prefer a C program (faster), + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: # SysV /etc/install, /usr/sbin/install @@ -3356,57 +3413,154 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + { echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } +fi + + ##-- use libtool (but don't build static libraries) + ## + in Makefile.am, do: + ## pdexterns_LTLIBRARIES = ext1.la ... + ## ext1_la_SOURCES = ... + ## ext1_la_LDFLAGS = -module + ## + still unclear how to get *.$(PDEXT) targets built from *.la + ## /prerequisites + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv + ## versioning + ## /versioning + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv + ## hack EXEEXT (alternative to using libtool) + { echo "$as_me:$LINENO: checking how to hack automake EXEEXT conventions" >&5 +echo $ECHO_N "checking how to hack automake EXEEXT conventions... $ECHO_C" >&6; } + case "${am__api_version}" in + 1.[0-4]*) + { echo "$as_me:$LINENO: result: automake v${ap__api_version}: on install" >&5 +echo "${ECHO_T}automake v${ap__api_version}: on install" >&6; } + pd_buildext="" + ;; + *) + { echo "$as_me:$LINENO: result: automake v${am__api_version}: on build" >&5 +echo "${ECHO_T}automake v${am__api_version}: on build" >&6; } + pd_buildext="\$(EXEEXT)" + ;; + esac + ## /hack EXEEXT + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv + ## pd-directory/ies +# Check whether --with-pd-dir was given. +if test "${with_pd_dir+set}" = set; then + withval=$with_pd_dir; pddir="$withval" +else + pddir="\${prefix}/pd" +fi + pddocdir="${pddir}/doc/5.reference" + ##-- pdincludedir -{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } - # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +# Check whether --with-pd-include was given. +if test "${with_pd_include+set}" = set; then + withval=$with_pd_include; pdincludedir="$withval" else - USE_MAINTAINER_MODE=no + pdincludedir="" fi - { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } + if test -n "$pdincludedir" ; then + IFLAGS="$IFLAGS -I$pdincludedir" + fi -if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' + ##-- pdextdir + +# Check whether --with-pd-extdir was given. +if test "${with_pd_extdir+set}" = set; then + withval=$with_pd_extdir; pdextdir="$withval" else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= + pdextdir="$pddir/externs" fi - MAINT=$MAINTAINER_MODE_TRUE + ##-- pdextdir: aliases + pdexternsdir="$pdextdir" + pdexecdir="$pdextdir" + ## pd-directory/ies + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv + ## single-object-externals? + # Check whether --enable-object-externals was given. +if test "${enable_object_externals+set}" = set; then + enableval=$enable_object_externals; want_object_externals="$enableval" +else + want_object_externals="no" +fi -for ac_header in math.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + + { echo "$as_me:$LINENO: checking whether to build single-object externals" >&5 +echo $ECHO_N "checking whether to build single-object externals... $ECHO_C" >&6; } + if test "$want_object_externals" != "no" ; then + ##-- single-objects + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define WANT_OBJECT_EXTERNALS 1 +_ACEOF + + else + ##-- multi-lib only + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + fi + + ##-- add automake conditional for object externals + + +if test "$want_object_externals" != "no"; then + WANT_OBJECT_EXTERNALS_TRUE= + WANT_OBJECT_EXTERNALS_FALSE='#' +else + WANT_OBJECT_EXTERNALS_TRUE='#' + WANT_OBJECT_EXTERNALS_FALSE= +fi + + ## + ## single-object-externals? + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + + ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv + ## check: m_pd.h + CPPFLAGS="$CPPFLAGS $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 echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -3417,7 +3571,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* nonempty includes: compile only */ -#include <$ac_header> +#include <m_pd.h> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -3436,96 +3590,225 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" + ac_cv_header_m_pd_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + ac_cv_header_m_pd_h=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - +{ echo "$as_me:$LINENO: result: $ac_cv_header_m_pd_h" >&5 +echo "${ECHO_T}$ac_cv_header_m_pd_h" >&6; } +if test $ac_cv_header_m_pd_h = yes; then + : else - { echo "$as_me:$LINENO: WARNING: -----------------------------------------------------------------" >&5 -echo "$as_me: WARNING: -----------------------------------------------------------------" >&2;} - { echo "$as_me:$LINENO: WARNING: could not find standard C headers -- things may get ugly" >&5 -echo "$as_me: WARNING: could not find standard C headers -- things may get ugly" >&2;} - { echo "$as_me:$LINENO: WARNING: -----------------------------------------------------------------" >&5 -echo "$as_me: WARNING: -----------------------------------------------------------------" >&2;} + { { echo "$as_me:$LINENO: error: could not find Pd header file 'm_pd.h' - bailing out" >&5 +echo "$as_me: error: could not find Pd header file 'm_pd.h' - bailing out" >&2;} + { (exit 1); exit 1; }; } fi -done + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv + ## debugging + { echo "$as_me:$LINENO: checking whether to build a debug version" >&5 +echo $ECHO_N "checking whether to build a debug version... $ECHO_C" >&6; } + # Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then + enableval=$enable_debug; +fi -{ echo "$as_me:$LINENO: checking how to hack automake EXEEXT conventions" >&5 -echo $ECHO_N "checking how to hack automake EXEEXT conventions... $ECHO_C" >&6; } -case "${am__api_version}" in - 1.[0-4]*) - { echo "$as_me:$LINENO: result: automake v${am__api_version}: on install" >&5 -echo "${ECHO_T}automake v${am__api_version}: on install" >&6; } - buildext="" - ;; - *) - { echo "$as_me:$LINENO: result: automake v${am__api_version}: on build" >&5 -echo "${ECHO_T}automake v${am__api_version}: on build" >&6; } - buildext="\$(EXEEXT)" - ;; -esac -PD_OBJECT_EXTERNALS="weightmap${buildext}" + if test "$enable_debug" = "yes" ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + ENABLE_DEBUG="yes" + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + ENABLE_DEBUG="no" + fi + + ## debugging + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv + ## warning flags, gcc + if test "$GCC" = "yes"; then + { echo "$as_me:$LINENO: checking whether to set default gcc warning flags" >&5 +echo $ECHO_N "checking whether to set default gcc warning flags... $ECHO_C" >&6; } + case "$UCFLAGS" in + *-W*) + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + ;; + *) + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + PDEXT_WFLAGS="$WFLAGS -Wall -Winline -W -Wno-unused" + ;; + esac + fi + ## warning flags, gcc + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv + ## compiled +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUILD_DATE "`date`" +_ACEOF -# Check whether --with-pd-dir was given. -if test "${with_pd_dir+set}" = set; then - withval=$with_pd_dir; pddir="$withval" -else - pddir="\${prefix}/pd" -fi +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUILD_USER "$USER" +_ACEOF -pddocdir="${pddir}/doc/5.reference" + ## /compiled + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv + ## BEGIN platform-dependent variables + ## + + ##-- Defaults + LD=ld + + ##----------- `uname -m`: machine hardware name + { echo "$as_me:$LINENO: checking target machine" >&5 +echo $ECHO_N "checking target machine... $ECHO_C" >&6; } + uname_m="`uname -m`" + + ##-- alpha + if test "$uname_m" = alpha; + then + { echo "$as_me:$LINENO: result: alpha" >&5 +echo "${ECHO_T}alpha" >&6; } + PDEXT_AFLAGS="-mieee -mcpu=ev56"; + else + { echo "$as_me:$LINENO: result: $uname_m" >&5 +echo "${ECHO_T}$uname_m" >&6; } + fi + + ##----------- `uname -s`: kernel name + { echo "$as_me:$LINENO: checking target system" >&5 +echo $ECHO_N "checking target system... $ECHO_C" >&6; } + uname_s="`uname -s`" + + case "$uname_s" in + Linux) + { echo "$as_me:$LINENO: result: linux" >&5 +echo "${ECHO_T}linux" >&6; } + ;; + Darwin) + { echo "$as_me:$LINENO: result: darwin" >&5 +echo "${ECHO_T}darwin" >&6; } + ;; + IRIX64) + { echo "$as_me:$LINENO: result: irix64" >&5 +echo "${ECHO_T}irix64" >&6; } + ;; + IRIX32) + { echo "$as_me:$LINENO: result: irix32" >&5 +echo "${ECHO_T}irix32" >&6; } + ;; + *) + { echo "$as_me:$LINENO: result: $uname_s" >&5 +echo "${ECHO_T}$uname_s" >&6; } + { echo "$as_me:$LINENO: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" >&5 +echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" >&2;} + uname_s="Linux" + ;; + esac + ##-- Linux + if test "$uname_s" = "Linux" + then + PDEXT_LFLAGS="-Wl,-export-dynamic -shared" + if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then + ##-- only set OFLAGS if user CFLAGS are empty + PDEXT_OFLAGS="-O2 -pipe" + elif test "$ENABLE_DEBUG" = "yes"; then + PDEXT_OFLAGS="-g" + fi + PDEXT_OFLAGS="$PDEXT_OFLAGS -fPIC" + PDEXT_DFLAGS="$PDEXT_DFLAGS -DPIC" + PDEXT=pd_linux + fi + ##-- MacOSX (darwin) + if test "$uname_s" = "Darwin" + then + LD=cc + PDEXT_LFLAGS="-bundle -undefined suppress -flat_namespace" + PDEXT_DFLAGS="-DMACOSX" + if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then + ##-- only set OFLAGS if user CFLAGS are empty + PDEXT_OFLAGS="-O2" + elif test "$ENABLE_DEBUG" = "yes"; then + PDEXT_OFLAGS="-g" + fi + PDEXT=pd_darwin + fi + ##-- irix64 + if test "$uname_s" = "IRIX64" + then + PDEXT_LFLAGS="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \ + -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \ + -shared -rdata_shared" + PDEXT=pd_irix6 + fi + ##-- irix32 + if test "$uname_s" = "IRIX32" + then + PDEXT_LFLAGS="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared" + PDEXT=pd_irix5 + fi + ##----------- report pd extension + { echo "$as_me:$LINENO: will use pd extension \".$PDEXT\" for pd externals" >&5 +echo "$as_me: will use pd extension \".$PDEXT\" for pd externals" >&6;} -# Check whether --with-pd-include was given. -if test "${with_pd_include+set}" = set; then - withval=$with_pd_include; pdincludedir="$withval" -else - pdincludedir="" -fi + EXT=$PDEXT -if test -n "$pdincludedir" ; then - IFLAGS="$IFLAGS -I$pdincludedir" -fi + ##----------- substitute -# Check whether --with-pd-extdir was given. -if test "${with_pd_extdir+set}" = set; then - withval=$with_pd_extdir; pdexternsdir="$withval" -else - pdexternsdir="$pddir/externs" -fi -CPPFLAGS="$CPPFLAGS $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 + + + + ##-- add defaults to user flags + CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" + CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" + LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS" + + ## END platform-dependent variables + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +## /pd external common +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## Local: headers + +##-- Checks for header files. + + +for ac_header in math.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -3536,7 +3819,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* nonempty includes: compile only */ -#include <m_pd.h> +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -3555,125 +3838,58 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_m_pd_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_m_pd_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_m_pd_h" >&5 -echo "${ECHO_T}$ac_cv_header_m_pd_h" >&6; } -if test $ac_cv_header_m_pd_h = yes; then - : +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + else { echo "$as_me:$LINENO: WARNING: -----------------------------------------------------------------" >&5 echo "$as_me: WARNING: -----------------------------------------------------------------" >&2;} - { echo "$as_me:$LINENO: WARNING: could not find PD header file 'm_pd.h' -- things might get ugly." >&5 -echo "$as_me: WARNING: could not find PD header file 'm_pd.h' -- things might get ugly." >&2;} + { echo "$as_me:$LINENO: WARNING: could not find standard C headers -- things may get ugly" >&5 +echo "$as_me: WARNING: could not find standard C headers -- things may get ugly" >&2;} { echo "$as_me:$LINENO: WARNING: -----------------------------------------------------------------" >&5 echo "$as_me: WARNING: -----------------------------------------------------------------" >&2;} fi +done +## /local: headers +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -{ echo "$as_me:$LINENO: checking whether we are building a debug version" >&5 -echo $ECHO_N "checking whether we are building a debug version... $ECHO_C" >&6; } -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then - enableval=$enable_debug; -fi - -if test "$enable_debug" = "yes" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - DEBUG="yes" +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## Local: debug +if test "$enable_debug" = "yes"; then cat >>confdefs.h <<\_ACEOF #define WEIGHTMAP_DEBUG 1 _ACEOF -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - DEBUG="no" fi +## /local: debug +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +##-- local: restore user's CFLAGS (now done by AX_PD_EXTERNAL) +#CFLAGS="$UCFLAGS" +#CPPFLAGS="$UCPPFLAGS" +#LDFLAGS="$ULDFLAGS" -##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -## BEGIN machine-dependent variables - -LD=ld - -##-- Linux -if test `uname -s` = Linux; -then - LFLAGS="$LFFLAGS -Wl,-export-dynamic -shared" - if test "$DEBUG" = "no" -a -z "$UCFLAGS"; then - ##-- only set OFLAGS if user CFLAGS are empty - OFLAGS="-O2 -pipe" - else - OFLAGS="-g" - fi - OFLAGS="$OFLAGS -fPIC" - DFLAGS="$DFLAGS -DPIC" - PDEXT=pd_linux -fi - -##-- MacOSX (darwin) -if test `uname -s` = Darwin; -then - LD=cc - LFLAGS="$LFLAGS -bundle -undefined suppress -flat_namespace" - DFLAGS="$DFLAGS -DMACOSX" - if test "$DEBUG" = "no" -a -z "$UCFLAGS"; then - ##-- only set OFLAGS if user CFLAGS are empty - OFLAGS="-O2" - else - OFLAGS="-g" - fi - PDEXT=pd_darwin -fi - -##-- alpha -if test `uname -m` = alpha; -then - AFLAGS="-mieee -mcpu=ev56"; - OFLAGS="$CFLAGS" -fi - -##-- irix64 -if test `uname -s` = IRIX64; -then - LFLAGS="$LFLAGS -n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \ - -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \ - -shared -rdata_shared" - OFLAGS="$CFLAGS" - PDEXT=pd_irix6 -fi - -##-- irix32 -if test `uname -s` = IRIX32; -then - LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared" - OFLAGS="$CFLAGS" - PDEXT=pd_irix5 -fi - -EXT=$PDEXT - -## END machine-dependent variables -##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - - -CFLAGS="$UCFLAGS" -CPPFLAGS="$UCPPFLAGS" - -ac_config_files="$ac_config_files config/Makefile src/Makefile Makefile" +##-- local: output +ac_config_files="$ac_config_files src/Makefile Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3771,6 +3987,13 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -3785,10 +4008,10 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +if test -z "${WANT_OBJECT_EXTERNALS_TRUE}" && test -z "${WANT_OBJECT_EXTERNALS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WANT_OBJECT_EXTERNALS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +echo "$as_me: error: conditional \"WANT_OBJECT_EXTERNALS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -4092,7 +4315,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 weightmap $as_me 0.01, which was +This file was extended by weightmap $as_me 0.01-1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4145,7 +4368,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -weightmap config.status 0.01 +weightmap config.status 0.01-1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -4260,7 +4483,6 @@ do case $ac_config_target in "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; @@ -4383,6 +4605,9 @@ am__leading_dot!$am__leading_dot$ac_delim AMTAR!$AMTAR$ac_delim am__tar!$am__tar$ac_delim am__untar!$am__untar$ac_delim +MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim +MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim +MAINT!$MAINT$ac_delim CC!$CC$ac_delim CFLAGS!$CFLAGS$ac_delim LDFLAGS!$LDFLAGS$ac_delim @@ -4399,29 +4624,72 @@ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim CCDEPMODE!$CCDEPMODE$ac_delim am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -AFLAGS!$AFLAGS$ac_delim -DFLAGS!$DFLAGS$ac_delim -IFLAGS!$IFLAGS$ac_delim -LFLAGS!$LFLAGS$ac_delim -OFLAGS!$OFLAGS$ac_delim -WFLAGS!$WFLAGS$ac_delim -LD!$LD$ac_delim -PDEXT!$PDEXT$ac_delim +LN_S!$LN_S$ac_delim BUGREPORT!$BUGREPORT$ac_delim -MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim -MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim -MAINT!$MAINT$ac_delim -PD_OBJECT_EXTERNALS!$PD_OBJECT_EXTERNALS$ac_delim +pd_buildext!$pd_buildext$ac_delim pddir!$pddir$ac_delim pddocdir!$pddocdir$ac_delim pdincludedir!$pdincludedir$ac_delim +pdextdir!$pdextdir$ac_delim pdexternsdir!$pdexternsdir$ac_delim -DEBUG!$DEBUG$ac_delim +pdexecdir!$pdexecdir$ac_delim +WANT_OBJECT_EXTERNALS_TRUE!$WANT_OBJECT_EXTERNALS_TRUE$ac_delim +WANT_OBJECT_EXTERNALS_FALSE!$WANT_OBJECT_EXTERNALS_FALSE$ac_delim +ENABLE_DEBUG!$ENABLE_DEBUG$ac_delim +LD!$LD$ac_delim +PDEXT!$PDEXT$ac_delim +PDEXT_AFLAGS!$PDEXT_AFLAGS$ac_delim +PDEXT_DFLAGS!$PDEXT_DFLAGS$ac_delim +PDEXT_IFLAGS!$PDEXT_IFLAGS$ac_delim +PDEXT_LFLAGS!$PDEXT_LFLAGS$ac_delim +PDEXT_OFLAGS!$PDEXT_OFLAGS$ac_delim +PDEXT_WFLAGS!$PDEXT_WFLAGS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS <conf$$subs.sed +rm -f conf$$subs.sed +cat >>$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -4439,7 +4707,7 @@ if test -n "$ac_eof"; then fi cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end _ACEOF sed ' @@ -4702,7 +4970,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && diff --git a/weightmap/configure.ac b/weightmap/configure.ac index 98035e3..6f2103d 100644 --- a/weightmap/configure.ac +++ b/weightmap/configure.ac @@ -4,62 +4,34 @@ AC_PREREQ(2.5) dnl Some handy macros define([THE_PACKAGE_NAME], [weightmap]) -define([THE_PACKAGE_VERSION], [0.01]) +define([THE_PACKAGE_VERSION], [0.01-1]) define([THE_PACKAGE_AUTHOR], [moocow@ling.uni-potsdam.de]) AC_INIT(THE_PACKAGE_NAME, THE_PACKAGE_VERSION, THE_PACKAGE_AUTHOR) -dnl -dnl source & aux -dnl -AC_CONFIG_AUX_DIR(config) +##-- Additional m4 macros +AC_CONFIG_MACRO_DIR(m4) -dnl -dnl save user's CFLAGS,CPPFLAGS -dnl +##-- source & aux +AC_CONFIG_AUX_DIR(.) +dnl AC_CONFIG_AUX_DIR(config) + +##-- save user's CFLAGS,CPPFLAGS UCPPFLAGS="$CPPFLAGS" UCFLAGS="$CFLAGS" +ULDFLAGS="$LDFLAGS" -dnl -dnl use automake -dnl +##-- use automake, autoheader AM_INIT_AUTOMAKE(THE_PACKAGE_NAME, THE_PACKAGE_VERSION) - -dnl -dnl use autoheader -dnl +dnl AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(src/config.h) - -dnl -dnl Programs, prefix -dnl -AC_PROG_CC -AC_PROG_INSTALL +##-- Default prefix AC_PREFIX_DEFAULT(/usr/local) -dnl -dnl Substitutions -dnl -AC_SUBST(DEFS) -AC_SUBST(AFLAGS) -AC_SUBST(DFLAGS) -AC_SUBST(IFLAGS) -AC_SUBST(LFLAGS) -AC_SUBST(OFLAGS) -AC_SUBST(WFLAGS) -AC_SUBST(LD) - -AC_SUBST(PDEXT) - -dnl version stuff (automatically exported?) -AC_SUBST(PACKAGE_VERSION) -AC_SUBST(PACKAGE_NAME) -AC_SUBST(BUGREPORT) - dnl ----- maintainer mode dnl + enables "maintainer mode" only with ./configure --enable-maintainer-mode -dnl - causes make __never__ to invoke 'config/missing', e.g. any autotools +dnl - causes make __never__ to invoke 'config/missing' (i.e. any autotools) dnl - basically a hack to avoid version mismatches in autoconf, automake, etc. dnl for autobuilds from SVN dnl + maintainer should call ./configure --enable-maintainer-mode, and must keep @@ -67,11 +39,21 @@ dnl SVN sources consistent AM_MAINTAINER_MODE dnl -----/maintainer mode -dnl other flags +##-- other flags (?) dnl AC_ISC_POSIX -dnl Checks for header files. +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## Pd external common +AX_PD_EXTERNAL +## /pd external common +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## Local: headers + +##-- Checks for header files. dnl AC_HEADER_STDC + AC_CHECK_HEADERS([math.h], [], AC_MSG_WARN([-----------------------------------------------------------------]) @@ -79,149 +61,22 @@ AC_CHECK_HEADERS([math.h], AC_MSG_WARN([-----------------------------------------------------------------]), [/* nonempty includes: compile only */]) +## /local: headers +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -dnl PD externals -AC_MSG_CHECKING([how to hack automake EXEEXT conventions]) -case "${am__api_version}" in - 1.[[0-4]]*) - AC_MSG_RESULT([automake v${am__api_version}: on install]) - buildext="" - ;; - *) - AC_MSG_RESULT([automake v${am__api_version}: on build]) - buildext="\$(EXEEXT)" - ;; -esac -PD_OBJECT_EXTERNALS="weightmap${buildext}" -AC_SUBST(PD_OBJECT_EXTERNALS) - - -dnl -dnl pd-directory/ies -dnl -AC_ARG_WITH(pd-dir, - AC_HELP_STRING([--with-pd-dir=DIR], [PD base directory (default=PREFIX/pd)]), - [pddir="$withval"], - [pddir="\${prefix}/pd"]) -pddocdir="${pddir}/doc/5.reference" -AC_SUBST(pddir) -AC_SUBST(pddocdir) - - - -AC_ARG_WITH(pd-include, - AC_HELP_STRING([--with-pd-include=DIR], [PD include directory (default=NONE)]), - [pdincludedir="$withval"], - [pdincludedir=""]) -if test -n "$pdincludedir" ; then - IFLAGS="$IFLAGS -I$pdincludedir" -fi -AC_SUBST(pdincludedir) - -AC_ARG_WITH(pd-extdir, - AC_HELP_STRING([--with-pd-extdir=DIR], [Directory for PD externals (default=PDDIR/externs)]), - [pdexternsdir="$withval"], - [pdexternsdir="$pddir/externs"]) -AC_SUBST(pdexternsdir) - -dnl -dnl Check for m_pd.h -dnl -CPPFLAGS="$CPPFLAGS $IFLAGS" -AC_CHECK_HEADER(m_pd.h,[], - AC_MSG_WARN([-----------------------------------------------------------------]) - AC_MSG_WARN([could not find PD header file 'm_pd.h' -- things might get ugly.]) - AC_MSG_WARN([-----------------------------------------------------------------]), - [/* nonempty includes: compile only */]) - - -dnl -dnl debug version? -dnl -AC_MSG_CHECKING([whether we are building a debug version]) -AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug],[build debug version (default=no)])) -if test "$enable_debug" = "yes" ; then - AC_MSG_RESULT(yes) - DEBUG="yes" +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## Local: debug +if test "$enable_debug" = "yes"; then AC_DEFINE(WEIGHTMAP_DEBUG,1, [Define this to include debugging code for the 'weightmap' external.]) -else - AC_MSG_RESULT(no) - DEBUG="no" fi -AC_SUBST(DEBUG) - -##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -## BEGIN machine-dependent variables - -LD=ld - -##-- Linux -if test `uname -s` = Linux; -then - LFLAGS="$LFFLAGS -Wl,-export-dynamic -shared" - if test "$DEBUG" = "no" -a -z "$UCFLAGS"; then - ##-- only set OFLAGS if user CFLAGS are empty - OFLAGS="-O2 -pipe" - else - OFLAGS="-g" - fi - OFLAGS="$OFLAGS -fPIC" - DFLAGS="$DFLAGS -DPIC" - PDEXT=pd_linux -fi - -##-- MacOSX (darwin) -if test `uname -s` = Darwin; -then - LD=cc - LFLAGS="$LFLAGS -bundle -undefined suppress -flat_namespace" - DFLAGS="$DFLAGS -DMACOSX" - if test "$DEBUG" = "no" -a -z "$UCFLAGS"; then - ##-- only set OFLAGS if user CFLAGS are empty - OFLAGS="-O2" - else - OFLAGS="-g" - fi - PDEXT=pd_darwin -fi - -##-- alpha -if test `uname -m` = alpha; -then - AFLAGS="-mieee -mcpu=ev56"; - OFLAGS="$CFLAGS" -fi - -##-- irix64 -if test `uname -s` = IRIX64; -then - LFLAGS="$LFLAGS -n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \ - -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \ - -shared -rdata_shared" - OFLAGS="$CFLAGS" - PDEXT=pd_irix6 -fi - -##-- irix32 -if test `uname -s` = IRIX32; -then - LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared" - OFLAGS="$CFLAGS" - PDEXT=pd_irix5 -fi - -EXT=$PDEXT - -## END machine-dependent variables -##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - +## /local: debug +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -dnl -dnl restore user's CFLAGS -dnl -CFLAGS="$UCFLAGS" -CPPFLAGS="$UCPPFLAGS" +##-- local: restore user's CFLAGS (now done by AX_PD_EXTERNAL) +#CFLAGS="$UCFLAGS" +#CPPFLAGS="$UCPPFLAGS" +#LDFLAGS="$ULDFLAGS" -AC_OUTPUT(config/Makefile src/Makefile Makefile) +##-- local: output +AC_OUTPUT(src/Makefile Makefile) diff --git a/weightmap/config/depcomp b/weightmap/depcomp index 04701da..04701da 100755 --- a/weightmap/config/depcomp +++ b/weightmap/depcomp diff --git a/weightmap/config/install-sh b/weightmap/install-sh index 4d4a951..4d4a951 100755 --- a/weightmap/config/install-sh +++ b/weightmap/install-sh diff --git a/weightmap/m4 b/weightmap/m4 new file mode 120000 index 0000000..83ffc0c --- /dev/null +++ b/weightmap/m4 @@ -0,0 +1 @@ +../common/m4
\ No newline at end of file diff --git a/weightmap/config/missing b/weightmap/missing index 894e786..894e786 100755 --- a/weightmap/config/missing +++ b/weightmap/missing diff --git a/weightmap/pdexternal.am b/weightmap/pdexternal.am new file mode 120000 index 0000000..914f4be --- /dev/null +++ b/weightmap/pdexternal.am @@ -0,0 +1 @@ +../common/pdexternal.am
\ No newline at end of file diff --git a/weightmap/src/Makefile.am b/weightmap/src/Makefile.am index 7e6a420..44a8fda 100644 --- a/weightmap/src/Makefile.am +++ b/weightmap/src/Makefile.am @@ -1,33 +1,23 @@ # File: ./src/Makefile.am -# Package: weightmap +# Package: (pd external): weightmap # Description: # + src-level automake file -# -# Process this file with Automake to create Makefile.in. #----------------------------------------------------------------------- #----------------------------------------------------------------------- -# Options & Subdirectories +# Includes #----------------------------------------------------------------------- +include $(top_srcdir)/pdexternal.am ## --- recursion subdirectories #SUBDIRS = -## --- pseudo-deps for '.SUFFIXES' -SUFFIXES = .@PDEXT@ - -#----------------------------------------------------------------------- -# Flags and variables -#----------------------------------------------------------------------- -PDEXT = @PDEXT@ -EXEEXT = .@PDEXT@ - #----------------------------------------------------------------------- # pd externals (hacked _PROGRAMS target) #----------------------------------------------------------------------- ## --- externals -pdexterns_PROGRAMS = @PD_OBJECT_EXTERNALS@ +pdexterns_PROGRAMS = weightmap ## --- possible externals EXTRA_PROGRAMS = \ @@ -44,89 +34,4 @@ pddoc_DATA = weightmap-help.pd # sources #----------------------------------------------------------------------- -weightmap_SOURCES = \ - weightmap.c mooPdUtils.h - -#----------------------------------------------------------------------- -# external compilation : flags -#----------------------------------------------------------------------- -DEFS = @DEFS@ -AFLAGS = @AFLAGS@ -DFLAGS = @DFLAGS@ -IFLAGS = @IFLAGS@ -LFLAGS = @LFLAGS@ -OFLAGS = @OFLAGS@ -WFLAGS = -Wall -Winline - -AM_CPPFLAGS = $(IFLAGS) $(DFLAGS) -AM_CFLAGS = $(OFLAGS) $(WFLAGS) $(AFLAGS) - -weightmap_LDFLAGS = $(LFLAGS) -#weightmap_LDADD = - -#----------------------------------------------------------------------- -# Variables: cleanup -#----------------------------------------------------------------------- -## --- mostlyclean: built by 'make' & commonly rebuilt -#MOSTLYCLEANFILES = - -## --- clean: built by 'make' -CLEANFILES = *.$(PDEXT) - -## --- distclean: built by 'configure' -DISTCLEANFILES = \ - config.log \ - config.cache \ - config.status - -## -- maintainerclean: built by maintainer / by hand -MAINTAINERCLEANFILES = *~ \ - $(PODS:.pod=.txt) \ - Makefile Makefile.in \ - aclocal.m4 \ - configure \ - install-sh \ - stamp-h.in \ - config.h.in - -maintainer-clean-local: - rm -rf autom4te.cache - -#CVSCLEAN_SUBDIRS = $(SUBDIRS) - -#CVSCLEANFILES = Makefile.in Makefile - - -#----------------------------------------------------------------------- -# Variables: distribution -#----------------------------------------------------------------------- - -## --- extra distribution files -EXTRA_DIST = \ - $(pddoc_DATA) \ - $(pdexterns_DATA) - -## --- recursion subdirectories for 'make dist' -DIST_SUBDIRS = $(SUBDIRS) - -## --- dist-hook: when another 'Makefile.am' is overkill -#DISTHOOK_DIRS = foo -#DISTHOOK_FILES = foo/bar.txt foo/baz.txt -#dist-hook: -# for d in $(DISTHOOK_DIRS); do\ -# mkdir -p $(distdir)/$$d ;\ -# done -# for f in $(DISTHOOK_FILES); do\ -# cp -p $(srcdir)/$$f $(distdir)/$$f ;\ -# done - -#dist-bz2: dist-bzip2 ; - - -#----------------------------------------------------------------------- -# Rules: cleanup -#----------------------------------------------------------------------- -.PHONY: cvsclean cvsclean-hook - -cvsclean: maintainer-clean ; - +weightmap_SOURCES = weightmap.c mooPdUtils.h diff --git a/weightmap/src/Makefile.in b/weightmap/src/Makefile.in index 8a1f183..ce53fb0 100644 --- a/weightmap/src/Makefile.in +++ b/weightmap/src/Makefile.in @@ -15,18 +15,15 @@ @SET_MAKE@ # File: ./src/Makefile.am -# Package: weightmap +# Package: (pd external): weightmap # Description: # + src-level automake file -# -# Process this file with Automake to create Makefile.in. #----------------------------------------------------------------------- -#----------------------------------------------------------------------- -# Options & Subdirectories -#----------------------------------------------------------------------- +#ACLOCAL_AMFLAGS = -I m4 -#SUBDIRS = +#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip +#AUTOMAKE_OPTIONS = foreign srcdir = @srcdir@ @@ -49,14 +46,14 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -pdexterns_PROGRAMS = @PD_OBJECT_EXTERNALS@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/config.h.in $(top_srcdir)/pdexternal.am +pdexterns_PROGRAMS = weightmap$(EXEEXT) EXTRA_PROGRAMS = weightmap$(EXEEXT) subdir = src -SUBDIRS = -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -70,7 +67,7 @@ am_weightmap_OBJECTS = weightmap.$(OBJEXT) weightmap_OBJECTS = $(am_weightmap_OBJECTS) weightmap_LDADD = $(LDADD) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -depcomp = $(SHELL) $(top_srcdir)/config/depcomp +depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -78,12 +75,6 @@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(weightmap_SOURCES) DIST_SOURCES = $(weightmap_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -97,7 +88,6 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AFLAGS = @AFLAGS@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ @@ -111,35 +101,28 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ -DEBUG = @DEBUG@ - -#----------------------------------------------------------------------- -# external compilation : flags -#----------------------------------------------------------------------- DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DFLAGS = @DFLAGS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +ENABLE_DEBUG = @ENABLE_DEBUG@ EXEEXT = .@PDEXT@ -IFLAGS = @IFLAGS@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LFLAGS = @LFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ -OFLAGS = @OFLAGS@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -147,17 +130,19 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ - -#----------------------------------------------------------------------- -# Flags and variables -#----------------------------------------------------------------------- PDEXT = @PDEXT@ -PD_OBJECT_EXTERNALS = @PD_OBJECT_EXTERNALS@ +PDEXT_AFLAGS = @PDEXT_AFLAGS@ +PDEXT_DFLAGS = @PDEXT_DFLAGS@ +PDEXT_IFLAGS = @PDEXT_IFLAGS@ +PDEXT_LFLAGS = @PDEXT_LFLAGS@ +PDEXT_OFLAGS = @PDEXT_OFLAGS@ +PDEXT_WFLAGS = @PDEXT_WFLAGS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -WFLAGS = -Wall -Winline +WANT_OBJECT_EXTERNALS_FALSE = @WANT_OBJECT_EXTERNALS_FALSE@ +WANT_OBJECT_EXTERNALS_TRUE = @WANT_OBJECT_EXTERNALS_TRUE@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ @@ -185,8 +170,11 @@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pd_buildext = @pd_buildext@ pddir = @pddir@ pddocdir = @pddocdir@ +pdexecdir = @pdexecdir@ +pdextdir = @pdextdir@ pdexternsdir = @pdexternsdir@ pdfdir = @pdfdir@ pdincludedir = @pdincludedir@ @@ -197,25 +185,27 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUFFIXES = .@PDEXT@ -pdexterns_DATA = -pddoc_DATA = weightmap-help.pd - -#----------------------------------------------------------------------- -# sources -#----------------------------------------------------------------------- -weightmap_SOURCES = \ - weightmap.c mooPdUtils.h - -AM_CPPFLAGS = $(IFLAGS) $(DFLAGS) -AM_CFLAGS = $(OFLAGS) $(WFLAGS) $(AFLAGS) -weightmap_LDFLAGS = $(LFLAGS) -#weightmap_LDADD = - -#----------------------------------------------------------------------- -# Variables: cleanup -#----------------------------------------------------------------------- -#MOSTLYCLEANFILES = +DEXT = @PDEXT@ +SUFFIXES = .@PDEXT@ .pod .txt .html +EXTRA_DIST = \ + $(PODS) \ + $(PODS:.pod=.txt) \ + $(pddoc_DATA) \ + $(pdext_DATA) \ + $(pdexterns_DATA) \ + $(pdexec_DATA) \ + $(wildcard COPYING) \ + $(wildcard Changes) \ + $(wildcard ChangeLog) \ + $(wildcard README.cvs) \ + $(wildcard depcomp) \ + $(wildcard install-sh) \ + $(wildcard ltmain.sh) \ + $(wildcard mising) \ + $(wildcard mkinstalldirs) + + +#all-local: $(PODS:.pod=.txt) CLEANFILES = *.$(PDEXT) DISTCLEANFILES = \ config.log \ @@ -224,32 +214,36 @@ DISTCLEANFILES = \ MAINTAINERCLEANFILES = *~ \ $(PODS:.pod=.txt) \ - Makefile Makefile.in \ + Makefile \ + Makefile.in \ aclocal.m4 \ + compile \ configure \ + config.h.in \ + config.guess \ + config.sub \ + depcomp \ install-sh \ + ltmain.sh \ + missing \ + mkinstalldirs \ stamp-h.in \ - config.h.in - - -#CVSCLEAN_SUBDIRS = $(SUBDIRS) + texinfo.tex \ + ylwrap -#CVSCLEANFILES = Makefile.in Makefile +pdexterns_DATA = +pddoc_DATA = weightmap-help.pd #----------------------------------------------------------------------- -# Variables: distribution +# sources #----------------------------------------------------------------------- -EXTRA_DIST = \ - $(pddoc_DATA) \ - $(pdexterns_DATA) - -DIST_SUBDIRS = $(SUBDIRS) +weightmap_SOURCES = weightmap.c mooPdUtils.h all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .@PDEXT@ .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +.SUFFIXES: .@PDEXT@ .pod .txt .html .c .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -379,77 +373,6 @@ uninstall-pdexternsDATA: rm -f "$(DESTDIR)$(pdexternsdir)/$$f"; \ done -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -460,23 +383,10 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -489,7 +399,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$tags $$unique; \ fi ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ @@ -512,6 +422,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) + $(mkdir_p) $(distdir)/.. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -538,38 +449,22 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done check-am: all-am -check: check-recursive +check: check-am all-am: Makefile $(PROGRAMS) $(DATA) config.h -installdirs: installdirs-recursive -installdirs-am: +installdirs: for dir in "$(DESTDIR)$(pdexternsdir)" "$(DESTDIR)$(pddocdir)" "$(DESTDIR)$(pdexternsdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-recursive +installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -588,23 +483,23 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-recursive +clean: clean-am clean-am: clean-generic clean-pdexternsPROGRAMS mostlyclean-am -distclean: distclean-recursive +distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-tags -dvi: dvi-recursive +dvi: dvi-am dvi-am: -html: html-recursive +html: html-am -info: info-recursive +info: info-am info-am: @@ -613,71 +508,57 @@ install-data-am: install-pddocDATA install-pdexternsDATA \ install-exec-am: -install-info: install-info-recursive +install-info: install-info-am install-man: installcheck-am: -maintainer-clean: maintainer-clean-recursive +maintainer-clean: maintainer-clean-am -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic \ maintainer-clean-local -mostlyclean: mostlyclean-recursive +mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic -pdf: pdf-recursive +pdf: pdf-am pdf-am: -ps: ps-recursive +ps: ps-am ps-am: uninstall-am: uninstall-info-am uninstall-pddocDATA \ uninstall-pdexternsDATA uninstall-pdexternsPROGRAMS -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-pdexternsPROGRAMS clean-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-hdr distclean-recursive \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-pddocDATA install-pdexternsDATA \ - install-pdexternsPROGRAMS install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-local \ - maintainer-clean-recursive mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am \ +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-pdexternsPROGRAMS ctags distclean distclean-compile \ + distclean-generic distclean-hdr distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-pddocDATA \ + install-pdexternsDATA install-pdexternsPROGRAMS install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic maintainer-clean-local mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-info-am \ uninstall-pddocDATA uninstall-pdexternsDATA \ uninstall-pdexternsPROGRAMS -maintainer-clean-local: - rm -rf autom4te.cache +.pod.txt: + pod2text $< $@ -#DISTHOOK_DIRS = foo -#DISTHOOK_FILES = foo/bar.txt foo/baz.txt -#dist-hook: -# for d in $(DISTHOOK_DIRS); do\ -# mkdir -p $(distdir)/$$d ;\ -# done -# for f in $(DISTHOOK_FILES); do\ -# cp -p $(srcdir)/$$f $(distdir)/$$f ;\ -# done +.pod.html: + pod2html $< --outfile=$@ -#dist-bz2: dist-bzip2 ; +maintainer-clean-local: + rm -rf autom4te.cache -#----------------------------------------------------------------------- -# Rules: cleanup -#----------------------------------------------------------------------- .PHONY: cvsclean cvsclean-hook cvsclean: maintainer-clean ; diff --git a/weightmap/src/config.h.in b/weightmap/src/config.h.in index 7c6bd70..cf84752 100644 --- a/weightmap/src/config.h.in +++ b/weightmap/src/config.h.in @@ -9,6 +9,12 @@ /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT +/* Date this package was configured */ +#undef PACKAGE_BUILD_DATE + +/* User who configured this package */ +#undef PACKAGE_BUILD_USER + /* Define to the full name of this package. */ #undef PACKAGE_NAME @@ -24,5 +30,8 @@ /* Version number of package */ #undef VERSION +/* Define this if you are building single-object externals */ +#undef WANT_OBJECT_EXTERNALS + /* Define this to include debugging code for the 'weightmap' external. */ #undef WEIGHTMAP_DEBUG diff --git a/weightmap/src/weightmap.c b/weightmap/src/weightmap.c index 7e33dfd..8bedb07 100644 --- a/weightmap/src/weightmap.c +++ b/weightmap/src/weightmap.c @@ -30,19 +30,12 @@ #include <m_pd.h> -#include "mooPdUtils.h" - -/* black magic */ -#ifdef NT -#pragma warning( disable : 4244 ) -#pragma warning( disable : 4305 ) -#endif - #include <math.h> #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include "mooPdUtils.h" /*-------------------------------------------------------------------- * DEBUG @@ -60,7 +53,10 @@ * Structures and Types *=====================================================================*/ -static char *weightmap_banner = "weightmap version %s by Bryan Jurish : map probabilities to associated integers"; +static char *weightmap_banner = +"\n" +"weightmap: stochastic selection v" PACKAGE_VERSION " by Bryan Jurish\n" +"weightmap: compiled by " PACKAGE_BUILD_USER " on " PACKAGE_BUILD_DATE ""; static t_class *weightmap_class; @@ -120,7 +116,7 @@ void weightmap_map(t_weightmap *x, MOO_UNUSED t_symbol *s, int argc, t_atom *arg idx = atom_getint(argv+i); if (idx <= 0 || idx > x->x_nvalues) { // sanity check: index-range - error("weightmap : map : index out of range : %d", idx); + pd_error(x,"weightmap : map : index out of range : %d", idx); continue; } idx--; @@ -167,7 +163,7 @@ void weightmap_set(t_weightmap *x, MOO_UNUSED t_symbol *s, int argc, t_atom *arg } x->x_weights = (t_float *)getbytes(x->x_nvalues*sizeof(t_float)); if (!x->x_weights) { - error("weightmap : failed to allocate new weight vector"); + pd_error(x,"weightmap : failed to allocate new weight vector"); return; } } @@ -209,7 +205,7 @@ void weightmap_resize(t_weightmap *x, t_floatarg f) { // allocate new weight-vector x->x_weights = (t_float *)getbytes(x->x_nvalues*sizeof(t_float)); if (!x->x_weights) { - error("weightmap : resize : failed to allocate new weight vector"); + pd_error(x,"weightmap : resize : failed to allocate new weight vector"); return; } @@ -241,7 +237,7 @@ void weightmap_max(t_weightmap *x, t_floatarg f) { if (f > 0) { x->x_wmax = f; } else { - error("weightmap : invalid maximum weight : %f", f); + pd_error(x,"weightmap : invalid maximum weight : %f", f); } } @@ -261,7 +257,7 @@ void weightmap_dump(t_weightmap *x) { // allocate dump-list dumpus = (t_atom *)getbytes(x->x_nvalues*sizeof(t_atom)); if (!dumpus) { - error("weightmap : failed to allocate dump list"); + pd_error(x,"weightmap : failed to allocate dump list"); return; } @@ -306,7 +302,7 @@ static void *weightmap_new(t_floatarg f, t_floatarg max) // allocate weight-vector x->x_weights = (t_float *)getbytes(x->x_nvalues*sizeof(t_float)); if (!x->x_weights) { - error("weightmap : failed to allocate weight vector"); + pd_error(x,"weightmap : failed to allocate weight vector"); return NULL; } @@ -340,7 +336,8 @@ static void weightmap_free(t_weightmap *x) { * setup *--------------------------------------------------------------------*/ void weightmap_setup(void) { - post(weightmap_banner, PACKAGE_VERSION); + post(weightmap_banner); + weightmap_class = class_new(gensym("weightmap"), /* name */ (t_newmethod)weightmap_new, /* newmethod */ (t_method)weightmap_free, /* freemethod */ |