aboutsummaryrefslogtreecommitdiff
path: root/weightmap/src
diff options
context:
space:
mode:
authorBryan Jurish <mukau@users.sourceforge.net>2009-02-15 20:41:13 +0000
committerBryan Jurish <mukau@users.sourceforge.net>2009-02-15 20:41:13 +0000
commita154d88d889a40dc8fd5641aa0d2458d777c4c5a (patch)
treece2e3e952bceaf578c4b27d5841ff33757e997a8 /weightmap/src
parentc9ad45306352cb29d341409fa7123a6ae62cb57f (diff)
+ finished centralization of build logic
svn path=/trunk/externals/moocow/; revision=10779
Diffstat (limited to 'weightmap/src')
-rw-r--r--weightmap/src/Makefile.am105
-rw-r--r--weightmap/src/Makefile.in319
-rw-r--r--weightmap/src/config.h.in9
-rw-r--r--weightmap/src/weightmap.c29
4 files changed, 127 insertions, 335 deletions
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 */