From d6e8cff18b7895847b3a0890bd2a2b7c3015718e Mon Sep 17 00:00:00 2001 From: Bryan Jurish Date: Sun, 15 Feb 2009 20:41:13 +0000 Subject: + finished centralization of build logic svn path=/trunk/externals/moocow/pdstring/; revision=10779 --- Makefile.am | 82 +----- Makefile.in | 122 ++++---- aclocal.m4 | 30 +- config/Makefile.am | 62 +--- config/Makefile.in | 120 +++++--- configure | 844 +++++++++++++++++++++++++++-------------------------- configure.ac | 245 ++-------------- m4 | 1 + pdexternal.am | 1 + src/Makefile.am | 141 ++------- src/Makefile.in | 427 ++++++++++----------------- src/any2bytes.c | 2 +- src/bytes2any.c | 4 +- src/config.h.in | 18 +- src/pdstring.c | 6 +- 15 files changed, 811 insertions(+), 1294 deletions(-) create mode 120000 m4 create mode 120000 pdexternal.am diff --git a/Makefile.am b/Makefile.am index d0318b3..d3eeb8e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,93 +6,33 @@ # Process this file with Automake to create Makefile.in. #----------------------------------------------------------------------- -#----------------------------------------------------------------------- -# Options & Subdirectories -#----------------------------------------------------------------------- +##----------------------------------------------------------------------- +## Options & Subdirectories + +##-- aclocal options (top level only) +ACLOCAL_AMFLAGS = -I m4 -## --- automake options +## --- automake options (top level only) #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip AUTOMAKE_OPTIONS = foreign ## --- recursion subdirectories SUBDIRS = config src -## --- pseudo-deps for '.SUFFIXES' -SUFFIXES = .pod .txt - #----------------------------------------------------------------------- -# Variables: cleanup +# Includes #----------------------------------------------------------------------- -## --- mostlyclean: built by 'make' & commonly rebuilt -#MOSTLYCLEANFILES = - -## --- clean: built by 'make' -#CLEANFILES = - -## --- 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 - +include $(top_srcdir)/pdexternal.am #----------------------------------------------------------------------- # Additional Variables & Rules: PODS #----------------------------------------------------------------------- PODS = README.pod -.pod.txt: - pod2text $< $@ - all-local: $(PODS:.pod=.txt) -#----------------------------------------------------------------------- -# Variables: distribution -#----------------------------------------------------------------------- +##----------------------------------------------------------------------- +## 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/Makefile.in b/Makefile.in index 467b14b..81d2283 100644 --- a/Makefile.in +++ b/Makefile.in @@ -22,9 +22,10 @@ # 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 +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,32 +96,25 @@ 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@ @@ -128,13 +123,18 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PDEXT = @PDEXT@ +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@ WANT_OBJECT_EXTERNALS_FALSE = @WANT_OBJECT_EXTERNALS_FALSE@ WANT_OBJECT_EXTERNALS_TRUE = @WANT_OBJECT_EXTERNALS_TRUE@ -WFLAGS = @WFLAGS@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ @@ -162,8 +162,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@ @@ -174,18 +177,22 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +ACLOCAL_AMFLAGS = -I m4 #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) $(PODS:.pod=.txt) + +#all-local: $(PODS:.pod=.txt) +CLEANFILES = *.$(PDEXT) DISTCLEANFILES = \ config.log \ config.cache \ @@ -193,37 +200,39 @@ 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 #----------------------------------------------------------------------- -# Additional Variables & Rules: PODS +# Includes #----------------------------------------------------------------------- -PODS = README.pod #----------------------------------------------------------------------- -# Variables: distribution +# Additional Variables & Rules: PODS #----------------------------------------------------------------------- -EXTRA_DIST = \ - $(PODS:.pod=.txt) autogen.sh configure \ - README.cvs COPYING - +PODS = README.pod 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: $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -250,9 +259,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) uninstall-info-am: @@ -391,7 +400,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/src + $(mkdir_p) $(distdir)/m4 $(distdir)/src @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -552,6 +561,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) @@ -629,34 +639,20 @@ 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) - -#DIST_SUBDIRS = $(SUBDIRS) +.pod.html: + pod2html $< --outfile=$@ -#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) # 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/aclocal.m4 b/aclocal.m4 index b7a0e85..76c661d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -501,35 +501,6 @@ fi rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering - -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file 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. - -# serial 4 - -AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl -] -) - -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. @@ -889,3 +860,4 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/ax_pd_external.m4]) diff --git a/config/Makefile.am b/config/Makefile.am index 4df45b6..96aac87 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -1,66 +1,10 @@ ## File: config/Makefile.am -## Package: +## Package: (pd external) ## 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 +# Includes #----------------------------------------------------------------------- -.PHONY: cvsclean cvsclean-hook - -cvsclean: maintainer-clean ; +include $(top_srcdir)/pdexternal.am diff --git a/config/Makefile.in b/config/Makefile.in index 49efd34..6e37f47 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -14,11 +14,10 @@ @SET_MAKE@ -#MOSTLYCLEANFILES = +#ACLOCAL_AMFLAGS = -I m4 -#CLEANFILES = - -#DISTCLEANFILES = +#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip +#AUTOMAKE_OPTIONS = foreign srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -39,11 +38,12 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/pdexternal.am depcomp install-sh missing 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__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 @@ -53,7 +53,6 @@ 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@ @@ -67,32 +66,25 @@ 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@ @@ -101,13 +93,18 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PDEXT = @PDEXT@ +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@ WANT_OBJECT_EXTERNALS_FALSE = @WANT_OBJECT_EXTERNALS_FALSE@ WANT_OBJECT_EXTERNALS_TRUE = @WANT_OBJECT_EXTERNALS_TRUE@ -WFLAGS = @WFLAGS@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ @@ -135,8 +132,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@ @@ -147,9 +147,41 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -MAINTAINERCLEANFILES = \ - *~ .*~ \ - compile Makefile Makefile.in \ +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 \ + config.status + +MAINTAINERCLEANFILES = *~ \ + $(PODS:.pod=.txt) \ + Makefile \ + Makefile.in \ + aclocal.m4 \ + compile \ + configure \ + config.h.in \ config.guess \ config.sub \ depcomp \ @@ -157,20 +189,15 @@ MAINTAINERCLEANFILES = \ ltmain.sh \ missing \ mkinstalldirs \ + stamp-h.in \ 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) +.SUFFIXES: .@PDEXT@ .pod .txt .html +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -195,9 +222,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(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) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: tags: TAGS @@ -208,6 +235,7 @@ CTAGS: 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 \ @@ -255,9 +283,11 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -293,7 +323,8 @@ installcheck-am: maintainer-clean: maintainer-clean-am -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local mostlyclean: mostlyclean-am @@ -314,24 +345,27 @@ uninstall-am: uninstall-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 + maintainer-clean maintainer-clean-generic \ + maintainer-clean-local mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-info-am -# config.guess -# config.sub -# ltmain.sh -# texinfo.tex +.pod.txt: + pod2text $< $@ -#DIST_SUBDIRS = $(SUBDIRS) +.pod.html: + pod2html $< --outfile=$@ + +maintainer-clean-local: + rm -rf autom4te.cache -#----------------------------------------------------------------------- -# Rules: cleanup -#----------------------------------------------------------------------- .PHONY: cvsclean cvsclean-hook cvsclean: maintainer-clean ; + +#----------------------------------------------------------------------- +# Includes +#----------------------------------------------------------------------- # 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/configure b/configure index 144a696..607c632 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for pdstring 0.10. +# Generated by GNU Autoconf 2.61 for pdstring 0.10-1. # # Report bugs to . # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='pdstring' PACKAGE_TARNAME='pdstring' -PACKAGE_VERSION='0.10' -PACKAGE_STRING='pdstring 0.10' +PACKAGE_VERSION='0.10-1' +PACKAGE_STRING='pdstring 0.10-1' PACKAGE_BUGREPORT='moocow@ling.uni-potsdam.de' ac_default_prefix=/usr/local @@ -654,25 +654,25 @@ CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S -AFLAGS -DFLAGS -IFLAGS -LFLAGS -OFLAGS -WFLAGS -LD -PDEXT BUGREPORT -MAINTAINER_MODE_TRUE -MAINTAINER_MODE_FALSE -MAINT -WANT_OBJECT_EXTERNALS_TRUE -WANT_OBJECT_EXTERNALS_FALSE +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='' @@ -1186,7 +1186,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 pdstring 0.10 to adapt to many kinds of systems. +\`configure' configures pdstring 0.10-1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1252,7 +1252,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pdstring 0.10:";; + short | recursive ) echo "Configuration of pdstring 0.10-1:";; esac cat <<\_ACEOF @@ -1261,8 +1261,6 @@ Optional Features: --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 --enable-object-externals Whether to build single-object externals (default=no) @@ -1271,9 +1269,9 @@ Optional Features: 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 @@ -1348,7 +1346,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pdstring configure 0.10 +pdstring configure 0.10-1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1362,7 +1360,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 pdstring $as_me 0.10, which was +It was created by pdstring $as_me 0.10-1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1716,6 +1714,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +##-- Additional m4 macros + + +##-- source & aux ac_aux_dir= for ac_dir in config "$srcdir"/config; do if test -f "$ac_dir/install-sh"; then @@ -1748,9 +1750,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 @@ -2037,7 +2042,7 @@ fi # Define the identity of the package. PACKAGE=pdstring - VERSION=0.10 + VERSION=0.10-1 cat >>confdefs.h <<_ACEOF @@ -2183,12 +2188,95 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - ac_config_headers="$ac_config_headers src/config.h" +##-- Default prefix -ac_ext=c + + +##-- other flags (?) + +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## Pd external checks +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' @@ -3106,71 +3194,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= @@ -3281,7 +3304,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 @@ -3361,7 +3384,7 @@ 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 "$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 @@ -3373,140 +3396,142 @@ 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 + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 -echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } -if test "${ac_cv_search_strerror+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + ##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 - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + want_object_externals="no" +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char strerror (); -int -main () -{ -return strerror (); - ; - return 0; -} + + { 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 -for ac_lib in '' cposix; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_search_strerror=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + else + ##-- multi-lib only + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + fi -fi + ##-- add automake conditional for object externals -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_strerror+set}" = set; then - break -fi -done -if test "${ac_cv_search_strerror+set}" = set; then - : -else - ac_cv_search_strerror=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 -echo "${ECHO_T}$ac_cv_search_strerror" >&6; } -ac_res=$ac_cv_search_strerror -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +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? + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -for ac_header in string.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 + ##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 @@ -3517,7 +3542,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* nonempty includes: compile only */ -#include <$ac_header> +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -3536,134 +3561,223 @@ 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 - - - -##------- PD externals: hack EXEEXT? -{ 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; } - 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 + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -##------- Enable single-object externals? -# Check whether --enable-object-externals was given. -if test "${enable_object_externals+set}" = set; then - enableval=$enable_object_externals; want_objext="$enableval" -else - want_objext="no" + ##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 whether to build single-object externals" >&5 -echo $ECHO_N "checking whether to build single-object externals... $ECHO_C" >&6; } - -if test "$want_objext" != "no" ; then - ##-- single-objects + 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 + ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -cat >>confdefs.h <<\_ACEOF -#define PDSTRING_OBJECT_EXTERNALS 1 + ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv + ## compiled + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUILD_DATE "`date`" _ACEOF -else - ##-- lib only - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi -##-- add automake conditional for object externals +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUILD_USER "$USER" +_ACEOF + ## /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 -if test "$want_objext" != "no"; then - WANT_OBJECT_EXTERNALS_TRUE= - WANT_OBJECT_EXTERNALS_FALSE='#' -else - WANT_OBJECT_EXTERNALS_TRUE='#' - WANT_OBJECT_EXTERNALS_FALSE= -fi + ##-- 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 -# 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 + ##----------- 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;} -pddocdir="${pddir}/doc/5.reference" + EXT=$PDEXT + ##----------- substitute -# Check whether --with-pd-include was given. -if test "${with_pd_include+set}" = set; then - withval=$with_pd_include; pdincludedir="$withval" -else - pdincludedir="" -fi -if test -n "$pdincludedir" ; then - IFLAGS="$IFLAGS -I$pdincludedir" -fi -# 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 + ##-- 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 +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -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 + +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## Local: headers + +for ac_header in string.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 @@ -3674,7 +3788,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* nonempty includes: compile only */ -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -3693,43 +3807,40 @@ 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 - +##-- local: debugging if test "$enable_debug" = "yes" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - DEBUG="yes" cat >>confdefs.h <<\_ACEOF #define ANY2BYTES_DEBUG 1 @@ -3740,103 +3851,15 @@ cat >>confdefs.h <<\_ACEOF #define BYTES2ANY_DEBUG 1 _ACEOF -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - DEBUG="no" fi -if test "$GCC" = "yes"; then - WFLAGS="-Wall -Winline -W -Wno-unused" -fi - -##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -## compiled - -cat >>confdefs.h <<_ACEOF -#define PDSTRING_DATE "`date`" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PDSTRING_USER "$USER" -_ACEOF - -## /compiled -##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - - - -##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" +##-- local: restore user's CFLAGS (now done by AX_PD_EXTERNAL) +#CFLAGS="$UCFLAGS" +#CPPFLAGS="$UCPPFLAGS" +#LDFLAGS="$ULDFLAGS" +##-- local: output ac_config_links="$ac_config_links src/any2string-help.pd:src/any2bytes-help.pd" ac_config_links="$ac_config_links src/string2any-help.pd:src/bytes2any-help.pd" @@ -3953,13 +3976,6 @@ 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. -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 "${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 @@ -4267,7 +4283,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 pdstring $as_me 0.10, which was +This file was extended by pdstring $as_me 0.10-1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4324,7 +4340,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -pdstring config.status 0.10 +pdstring config.status 0.10-1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -4582,25 +4598,25 @@ CCDEPMODE!$CCDEPMODE$ac_delim am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim LN_S!$LN_S$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 BUGREPORT!$BUGREPORT$ac_delim -MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim -MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim -MAINT!$MAINT$ac_delim -WANT_OBJECT_EXTERNALS_TRUE!$WANT_OBJECT_EXTERNALS_TRUE$ac_delim -WANT_OBJECT_EXTERNALS_FALSE!$WANT_OBJECT_EXTERNALS_FALSE$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 LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF diff --git a/configure.ac b/configure.ac index 1e0f21d..2ae2d97 100644 --- a/configure.ac +++ b/configure.ac @@ -2,62 +2,31 @@ dnl Process this file with autoconf to produce a configure script. dnl -- for a clean build, run: aclocal && autoheader && automake -a && autoconf AC_PREREQ(2.5) -dnl Some handy macros +##-- Some handy macros define([THE_PACKAGE_NAME], [pdstring]) -define([THE_PACKAGE_VERSION], [0.10]) +define([THE_PACKAGE_VERSION], [0.10-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 +##-- Additional m4 macros +AC_CONFIG_MACRO_DIR(m4) + +##-- source & aux AC_CONFIG_AUX_DIR(config) -dnl -dnl save user's CFLAGS,CPPFLAGS -dnl +##-- 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 AM_CONFIG_HEADER(src/config.h) - -dnl -dnl Programs, prefix -dnl -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_LN_S +##-- 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' (i.e. any autotools) @@ -65,15 +34,21 @@ 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 dnl SVN sources consistent -AM_MAINTAINER_MODE +dnl AM_MAINTAINER_MODE dnl -----/maintainer mode -dnl ----- begin imported rsynth configuration stuff +##-- other flags (?) +dnl AC_ISC_POSIX + +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## Pd external checks +AX_PD_EXTERNAL +## /pd external common +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -dnl other flags -AC_ISC_POSIX -dnl Checks for header files. +##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +## Local: headers dnl AC_HEADER_STDC AC_CHECK_HEADERS([string.h], [], @@ -81,186 +56,24 @@ AC_CHECK_HEADERS([string.h], AC_MSG_WARN([could not find standard C headers -- things may get ugly]) AC_MSG_WARN([-----------------------------------------------------------------]), [/* nonempty includes: compile only */]) +## /local: headers +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - - -##------- PD externals: hack EXEEXT? -AC_MSG_CHECKING([how to hack automake EXEEXT conventions]) -case "${am__api_version}" in - 1.[[0-4]]*) - AC_MSG_RESULT([automake v${ap__api_version}: on install]) - buildext="" - ;; - *) - AC_MSG_RESULT([automake v${am__api_version}: on build]) - buildext="\$(EXEEXT)" - ;; -esac - -##------- Enable single-object externals? -AC_ARG_ENABLE(object-externals, - AC_HELP_STRING([--enable-object-externals], [Whether to build single-object externals (default=no)]), - [want_objext="$enableval"], - [want_objext="no"]) -AC_MSG_CHECKING([whether to build single-object externals]) - -if test "$want_objext" != "no" ; then - ##-- single-objects - AC_MSG_RESULT(yes) - AC_DEFINE(PDSTRING_OBJECT_EXTERNALS,1, - [Define this if you are building single-object externals]) -else - ##-- lib only - AC_MSG_RESULT(no) -fi - -##-- add automake conditional for object externals -AM_CONDITIONAL(WANT_OBJECT_EXTERNALS, [test "$want_objext" != "no"]) - - -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)])) +##-- local: debugging if test "$enable_debug" = "yes" ; then - AC_MSG_RESULT(yes) - DEBUG="yes" AC_DEFINE(ANY2BYTES_DEBUG,1, [Define this to include debugging code for the 'bytes2any' external.]) AC_DEFINE(BYTES2ANY_DEBUG,1, [Define this to include debugging code for the 'any2bytes' external.]) -else - AC_MSG_RESULT(no) - DEBUG="no" fi -AC_SUBST(DEBUG) - -if test "$GCC" = "yes"; then - WFLAGS="-Wall -Winline -W -Wno-unused" -fi - -##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -## compiled -AC_DEFINE_UNQUOTED(PDSTRING_DATE, "`date`", [Date this external was configured]) -AC_DEFINE_UNQUOTED(PDSTRING_USER, "$USER", [User who configured this external]) -## /compiled -##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - - - -##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 -##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -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" +##-- local: output AC_CONFIG_LINKS([src/any2string-help.pd:src/any2bytes-help.pd]) AC_CONFIG_LINKS([src/string2any-help.pd:src/bytes2any-help.pd]) AC_OUTPUT(config/Makefile src/Makefile Makefile) diff --git a/m4 b/m4 new file mode 120000 index 0000000..83ffc0c --- /dev/null +++ b/m4 @@ -0,0 +1 @@ +../common/m4 \ No newline at end of file diff --git a/pdexternal.am b/pdexternal.am new file mode 120000 index 0000000..914f4be --- /dev/null +++ b/pdexternal.am @@ -0,0 +1 @@ +../common/pdexternal.am \ No newline at end of file diff --git a/src/Makefile.am b/src/Makefile.am index 275a330..a215164 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,26 +10,20 @@ # Options & Subdirectories #----------------------------------------------------------------------- -## --- recursion subdirectories -#SUBDIRS = - -## --- pseudo-deps for '.SUFFIXES' -SUFFIXES = .@PDEXT@ +##--- common includes +include $(top_srcdir)/pdexternal.am -#----------------------------------------------------------------------- -# Flags and variables -#----------------------------------------------------------------------- -PDEXT = @PDEXT@ -EXEEXT = .@PDEXT@ +##--- recursion subdirectories +#SUBDIRS = #----------------------------------------------------------------------- -# pd externals (hacked _PROGRAMS target) +# sources (using PROGRAMS) #----------------------------------------------------------------------- -## --- externals -pdexterns_PROGRAMS = pdstring +## --- externals (as _PROGRAMS) +pdexec_PROGRAMS = pdstring if WANT_OBJECT_EXTERNALS - pdexterns_PROGRAMS += \ + pdexec_PROGRAMS += \ any2bytes \ bytes2any \ bytes2wchars \ @@ -38,7 +32,7 @@ if WANT_OBJECT_EXTERNALS printwchars endif -## --- possible externals +## --- possible single-object externals (as _PROGRAMS) EXTRA_PROGRAMS = \ pdstring \ any2bytes \ @@ -48,6 +42,18 @@ EXTRA_PROGRAMS = \ printbytes \ printwchars +any2bytes_SOURCES = any2bytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c +bytes2any_SOURCES = bytes2any.c mooPdUtils.h pdstringUtils.h pdstringUtils.c +bytes2wchars_SOURCES = bytes2wchars.c mooPdUtils.h pdstringUtils.h pdstringUtils.c +wchars2bytes_SOURCES = wchars2bytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c +printbytes_SOURCES = printbytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c +printwchars_SOURCES = printwchars.c mooPdUtils.h pdstringUtils.h pdstringUtils.c +pdstring_SOURCES = pdstring.c mooPdUtils.h pdstringUtils.h pdstringUtils.c + +#----------------------------------------------------------------------- +# patches, etc. +#----------------------------------------------------------------------- + ## --- patches pdexterns_DATA = \ any2wchars.pd \ @@ -70,24 +76,6 @@ pddoc_DATA = \ printwchars-help.pd -#----------------------------------------------------------------------- -# sources -#----------------------------------------------------------------------- - -any2bytes_SOURCES = any2bytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c - -bytes2any_SOURCES = bytes2any.c mooPdUtils.h pdstringUtils.h pdstringUtils.c - -bytes2wchars_SOURCES = bytes2wchars.c mooPdUtils.h pdstringUtils.h pdstringUtils.c - -wchars2bytes_SOURCES = wchars2bytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c - -printbytes_SOURCES = printbytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c - -printwchars_SOURCES = printwchars.c mooPdUtils.h pdstringUtils.h pdstringUtils.c - -pdstring_SOURCES = pdstring.c mooPdUtils.h pdstringUtils.h pdstringUtils.c - #----------------------------------------------------------------------- # aliases via install hook #----------------------------------------------------------------------- @@ -96,109 +84,30 @@ if WANT_OBJECT_EXTERNALS all-local: rm -f any2string.$(PDEXT) rm -f string2any.$(PDEXT) -# $(LN_S) any2bytes.$(PDEXT) any2string.$(PDEXT) -# $(LN_S) bytes2any.$(PDEXT) string2any.$(PDEXT) endif install-data-hook: rm -f $(pdexternsdir)/any2string.$(PDEXT) rm -f $(pdexternsdir)/string2any.$(PDEXT) -if WANT_OBJECT_EXTERNALS -# $(LN_S) any2bytes.$(PDEXT) $(pdexternsdir)/any2string.$(PDEXT) -# $(LN_S) bytes2any.$(PDEXT) $(pdexternsdir)/string2any.$(PDEXT) -endif uninstall-local: rm -f $(pdexternsdir)/any2string.$(PDEXT) rm -f $(pdexternsdir)/string2any.$(PDEXT) - #----------------------------------------------------------------------- # external compilation : flags +# + now handled by AX_PD_EXTERNAL #----------------------------------------------------------------------- -DEFS = @DEFS@ -AFLAGS = @AFLAGS@ -DFLAGS = @DFLAGS@ -IFLAGS = @IFLAGS@ -LFLAGS = @LFLAGS@ -OFLAGS = @OFLAGS@ -WFLAGS = @WFLAGS@ - -#GLIB_IFLAGS = @GLIB_IFLAGS@ -#GLIB_LFLAGS = @GLIB_LFLAGS@ - -AM_CPPFLAGS = $(IFLAGS) $(GLIB_IFLAGS) $(DFLAGS) -AM_CFLAGS = $(OFLAGS) $(WFLAGS) $(AFLAGS) - -AM_LDFLAGS ?= $(LFLAGS) - -#pdstring_LDFLAGS = $(LFLAGS) -#bytes2any_LDFLAGS = $(LFLAGS) -##string2any_LDFLAGS = $(bytes2any_LDFLAGS) #----------------------------------------------------------------------- # 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 - +# + should be handled by pdexternal.am #----------------------------------------------------------------------- # 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 ; - +# + should be handled by pdexternal.am #----------------------------------------------------------------------- # Rules: cleanup -#----------------------------------------------------------------------- -.PHONY: cvsclean cvsclean-hook - -cvsclean: maintainer-clean ; +# + should be handled by pdexternal.am diff --git a/src/Makefile.in b/src/Makefile.in index 25fb64b..6c5b157 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -26,7 +26,10 @@ # Options & Subdirectories #----------------------------------------------------------------------- -#SUBDIRS = +#ACLOCAL_AMFLAGS = -I m4 + +#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip +#AUTOMAKE_OPTIONS = foreign srcdir = @srcdir@ @@ -49,7 +52,10 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -pdexterns_PROGRAMS = pdstring$(EXEEXT) $(am__EXEEXT_1) +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/any2bytes-help.pd $(srcdir)/bytes2any-help.pd \ + $(srcdir)/config.h.in $(top_srcdir)/pdexternal.am +pdexec_PROGRAMS = pdstring$(EXEEXT) $(am__EXEEXT_1) @WANT_OBJECT_EXTERNALS_TRUE@am__append_1 = \ @WANT_OBJECT_EXTERNALS_TRUE@ any2bytes \ @WANT_OBJECT_EXTERNALS_TRUE@ bytes2any \ @@ -62,12 +68,9 @@ EXTRA_PROGRAMS = pdstring$(EXEEXT) any2bytes$(EXEEXT) \ bytes2any$(EXEEXT) bytes2wchars$(EXEEXT) wchars2bytes$(EXEEXT) \ printbytes$(EXEEXT) printwchars$(EXEEXT) subdir = src -SUBDIRS = -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/any2bytes-help.pd $(srcdir)/bytes2any-help.pd \ - $(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 @@ -79,10 +82,10 @@ CONFIG_CLEAN_FILES = any2string-help.pd string2any-help.pd @WANT_OBJECT_EXTERNALS_TRUE@ wchars2bytes$(EXEEXT) \ @WANT_OBJECT_EXTERNALS_TRUE@ printbytes$(EXEEXT) \ @WANT_OBJECT_EXTERNALS_TRUE@ printwchars$(EXEEXT) -am__installdirs = "$(DESTDIR)$(pdexternsdir)" "$(DESTDIR)$(pddocdir)" \ +am__installdirs = "$(DESTDIR)$(pdexecdir)" "$(DESTDIR)$(pddocdir)" \ "$(DESTDIR)$(pdexternsdir)" -pdexternsPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(pdexterns_PROGRAMS) +pdexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(pdexec_PROGRAMS) am_any2bytes_OBJECTS = any2bytes.$(OBJEXT) pdstringUtils.$(OBJEXT) any2bytes_OBJECTS = $(am_any2bytes_OBJECTS) any2bytes_LDADD = $(LDADD) @@ -121,12 +124,6 @@ DIST_SOURCES = $(any2bytes_SOURCES) $(bytes2any_SOURCES) \ $(bytes2wchars_SOURCES) $(pdstring_SOURCES) \ $(printbytes_SOURCES) $(printwchars_SOURCES) \ $(wchars2bytes_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/||"`;; \ @@ -140,7 +137,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@ @@ -154,36 +150,25 @@ 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@ @@ -191,18 +176,19 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ - -#----------------------------------------------------------------------- -# Flags and variables -#----------------------------------------------------------------------- PDEXT = @PDEXT@ +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@ WANT_OBJECT_EXTERNALS_FALSE = @WANT_OBJECT_EXTERNALS_FALSE@ WANT_OBJECT_EXTERNALS_TRUE = @WANT_OBJECT_EXTERNALS_TRUE@ -WFLAGS = @WFLAGS@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ @@ -230,8 +216,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@ @@ -242,7 +231,63 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUFFIXES = .@PDEXT@ +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 \ + config.status + +MAINTAINERCLEANFILES = *~ \ + $(PODS:.pod=.txt) \ + Makefile \ + Makefile.in \ + aclocal.m4 \ + compile \ + configure \ + config.h.in \ + config.guess \ + config.sub \ + depcomp \ + install-sh \ + ltmain.sh \ + missing \ + mkinstalldirs \ + stamp-h.in \ + texinfo.tex \ + ylwrap + +any2bytes_SOURCES = any2bytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c +bytes2any_SOURCES = bytes2any.c mooPdUtils.h pdstringUtils.h pdstringUtils.c +bytes2wchars_SOURCES = bytes2wchars.c mooPdUtils.h pdstringUtils.h pdstringUtils.c +wchars2bytes_SOURCES = wchars2bytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c +printbytes_SOURCES = printbytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c +printwchars_SOURCES = printwchars.c mooPdUtils.h pdstringUtils.h pdstringUtils.c +pdstring_SOURCES = pdstring.c mooPdUtils.h pdstringUtils.h pdstringUtils.c + +#----------------------------------------------------------------------- +# patches, etc. +#----------------------------------------------------------------------- pdexterns_DATA = \ any2wchars.pd \ wchars2any.pd \ @@ -262,64 +307,12 @@ pddoc_DATA = \ printbytes-help.pd \ printwchars-help.pd - -#----------------------------------------------------------------------- -# sources -#----------------------------------------------------------------------- -any2bytes_SOURCES = any2bytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c -bytes2any_SOURCES = bytes2any.c mooPdUtils.h pdstringUtils.h pdstringUtils.c -bytes2wchars_SOURCES = bytes2wchars.c mooPdUtils.h pdstringUtils.h pdstringUtils.c -wchars2bytes_SOURCES = wchars2bytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c -printbytes_SOURCES = printbytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c -printwchars_SOURCES = printwchars.c mooPdUtils.h pdstringUtils.h pdstringUtils.c -pdstring_SOURCES = pdstring.c mooPdUtils.h pdstringUtils.h pdstringUtils.c - -#GLIB_IFLAGS = @GLIB_IFLAGS@ -#GLIB_LFLAGS = @GLIB_LFLAGS@ -AM_CPPFLAGS = $(IFLAGS) $(GLIB_IFLAGS) $(DFLAGS) -AM_CFLAGS = $(OFLAGS) $(WFLAGS) $(AFLAGS) - -#pdstring_LDFLAGS = $(LFLAGS) -#bytes2any_LDFLAGS = $(LFLAGS) - -#----------------------------------------------------------------------- -# Variables: cleanup -#----------------------------------------------------------------------- -#MOSTLYCLEANFILES = -CLEANFILES = *.$(PDEXT) -DISTCLEANFILES = \ - config.log \ - config.cache \ - config.status - -MAINTAINERCLEANFILES = *~ \ - $(PODS:.pod=.txt) \ - Makefile Makefile.in \ - aclocal.m4 \ - configure \ - install-sh \ - stamp-h.in \ - config.h.in - - -#CVSCLEAN_SUBDIRS = $(SUBDIRS) - -#CVSCLEANFILES = Makefile.in Makefile - -#----------------------------------------------------------------------- -# Variables: distribution -#----------------------------------------------------------------------- -EXTRA_DIST = \ - $(pddoc_DATA) \ - $(pdexterns_DATA) - -DIST_SUBDIRS = $(SUBDIRS) 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: $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -344,9 +337,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(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) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh config.h: stamp-h1 @@ -358,36 +351,36 @@ config.h: stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status src/config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(srcdir)/config.h.in: $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) rm -f stamp-h1 touch $@ distclean-hdr: -rm -f config.h stamp-h1 -install-pdexternsPROGRAMS: $(pdexterns_PROGRAMS) +install-pdexecPROGRAMS: $(pdexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(pdexternsdir)" || $(mkdir_p) "$(DESTDIR)$(pdexternsdir)" - @list='$(pdexterns_PROGRAMS)'; for p in $$list; do \ + test -z "$(pdexecdir)" || $(mkdir_p) "$(DESTDIR)$(pdexecdir)" + @list='$(pdexec_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(pdexternsPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(pdexternsdir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(pdexternsPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(pdexternsdir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(pdexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(pdexecdir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(pdexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(pdexecdir)/$$f" || exit 1; \ else :; fi; \ done -uninstall-pdexternsPROGRAMS: +uninstall-pdexecPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(pdexterns_PROGRAMS)'; for p in $$list; do \ + @list='$(pdexec_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(pdexternsdir)/$$f'"; \ - rm -f "$(DESTDIR)$(pdexternsdir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(pdexecdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pdexecdir)/$$f"; \ done -clean-pdexternsPROGRAMS: - -test -z "$(pdexterns_PROGRAMS)" || rm -f $(pdexterns_PROGRAMS) +clean-pdexecPROGRAMS: + -test -z "$(pdexec_PROGRAMS)" || rm -f $(pdexec_PROGRAMS) any2bytes$(EXEEXT): $(any2bytes_OBJECTS) $(any2bytes_DEPENDENCIES) @rm -f any2bytes$(EXEEXT) $(LINK) $(any2bytes_LDFLAGS) $(any2bytes_OBJECTS) $(any2bytes_LDADD) $(LIBS) @@ -474,77 +467,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 \ @@ -555,23 +477,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; \ @@ -584,7 +493,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`; \ @@ -607,6 +516,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 \ @@ -633,39 +543,23 @@ 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 @WANT_OBJECT_EXTERNALS_FALSE@all-local: all-am: Makefile $(PROGRAMS) $(DATA) config.h all-local -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(pdexternsdir)" "$(DESTDIR)$(pddocdir)" "$(DESTDIR)$(pdexternsdir)"; do \ +installdirs: + for dir in "$(DESTDIR)$(pdexecdir)" "$(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 \ @@ -684,79 +578,87 @@ 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 +clean-am: clean-generic clean-pdexecPROGRAMS 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: -install-data-am: install-pddocDATA install-pdexternsDATA \ - install-pdexternsPROGRAMS +install-data-am: install-pddocDATA install-pdexternsDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook -install-exec-am: +install-exec-am: install-pdexecPROGRAMS -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-local uninstall-pddocDATA \ - uninstall-pdexternsDATA uninstall-pdexternsPROGRAMS + uninstall-pdexecPROGRAMS uninstall-pdexternsDATA -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \ - check-am clean clean-generic clean-pdexternsPROGRAMS \ - clean-recursive ctags ctags-recursive distclean \ +.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ + clean-generic clean-pdexecPROGRAMS ctags 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-data-hook 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 uninstall-local uninstall-pddocDATA \ - uninstall-pdexternsDATA uninstall-pdexternsPROGRAMS + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-hook install-exec install-exec-am install-info \ + install-info-am install-man install-pddocDATA \ + install-pdexecPROGRAMS install-pdexternsDATA 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-local \ + uninstall-pddocDATA uninstall-pdexecPROGRAMS \ + uninstall-pdexternsDATA + + +.pod.txt: + pod2text $< $@ + +.pod.html: + pod2html $< --outfile=$@ + +maintainer-clean-local: + rm -rf autom4te.cache + +.PHONY: cvsclean cvsclean-hook +cvsclean: maintainer-clean ; #----------------------------------------------------------------------- # aliases via install hook @@ -765,42 +667,31 @@ uninstall-info: uninstall-info-recursive @WANT_OBJECT_EXTERNALS_TRUE@all-local: @WANT_OBJECT_EXTERNALS_TRUE@ rm -f any2string.$(PDEXT) @WANT_OBJECT_EXTERNALS_TRUE@ rm -f string2any.$(PDEXT) -# $(LN_S) any2bytes.$(PDEXT) any2string.$(PDEXT) -# $(LN_S) bytes2any.$(PDEXT) string2any.$(PDEXT) install-data-hook: rm -f $(pdexternsdir)/any2string.$(PDEXT) rm -f $(pdexternsdir)/string2any.$(PDEXT) -# $(LN_S) any2bytes.$(PDEXT) $(pdexternsdir)/any2string.$(PDEXT) -# $(LN_S) bytes2any.$(PDEXT) $(pdexternsdir)/string2any.$(PDEXT) uninstall-local: rm -f $(pdexternsdir)/any2string.$(PDEXT) rm -f $(pdexternsdir)/string2any.$(PDEXT) -AM_LDFLAGS ?= $(LFLAGS) - -maintainer-clean-local: - rm -rf autom4te.cache +#----------------------------------------------------------------------- +# external compilation : flags +# + now handled by AX_PD_EXTERNAL +#----------------------------------------------------------------------- -#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 +#----------------------------------------------------------------------- +# Variables: cleanup +# + should be handled by pdexternal.am -#dist-bz2: dist-bzip2 ; +#----------------------------------------------------------------------- +# Variables: distribution +# + should be handled by pdexternal.am #----------------------------------------------------------------------- # Rules: cleanup -#----------------------------------------------------------------------- -.PHONY: cvsclean cvsclean-hook - -cvsclean: maintainer-clean ; +# + should be handled by pdexternal.am # 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/src/any2bytes.c b/src/any2bytes.c index df2376a..72966c4 100644 --- a/src/any2bytes.c +++ b/src/any2bytes.c @@ -165,7 +165,7 @@ void any2bytes_setup_guts(void) 0); //-- alias -#ifndef PDSTRING_OBJECT_EXTERNALS +#ifndef WANT_OBJECT_EXTERNALS class_addcreator((t_newmethod)any2bytes_new, gensym("any2string"), A_GIMME, 0); #endif diff --git a/src/bytes2any.c b/src/bytes2any.c index 2d7ccb4..1ed38d1 100644 --- a/src/bytes2any.c +++ b/src/bytes2any.c @@ -175,7 +175,7 @@ static void *bytes2any_new(MOO_UNUSED t_symbol *sel, int argc, t_atom *argv) x->x_outlet_done = outlet_new(&x->x_obj, &s_bang); //-- debug - S2ADEBUG(post("bytes2any_new: x=%p, size=%d, eos=%d, binbuf=%p, text=%p", x, x->x_size, x->x_eos, x->x_binbuf, x->x_text)); + S2ADEBUG(post("bytes2any_new: x=%p, binbuf=%p, bytes.alloc=%d", x, x->x_eos, x->x_binbuf, x->x_bytes.b_alloc)); return (void *)x; } @@ -210,7 +210,7 @@ void bytes2any_setup_guts(void) 0); //-- alias -#ifndef PDSTRING_OBJECT_EXTERNALS +#ifndef WANT_OBJECT_EXTERNALS class_addcreator((t_newmethod)bytes2any_new, gensym("string2any"), A_GIMME, 0); #endif diff --git a/src/config.h.in b/src/config.h.in index 748fa6a..4e57271 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -15,6 +15,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 @@ -27,14 +33,8 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Date this external was configured */ -#undef PDSTRING_DATE - -/* Define this if you are building single-object externals */ -#undef PDSTRING_OBJECT_EXTERNALS - -/* User who configured this external */ -#undef PDSTRING_USER - /* Version number of package */ #undef VERSION + +/* Define this if you are building single-object externals */ +#undef WANT_OBJECT_EXTERNALS diff --git a/src/pdstring.c b/src/pdstring.c index cfef6ff..fbe7b40 100644 --- a/src/pdstring.c +++ b/src/pdstring.c @@ -54,7 +54,7 @@ typedef struct _pdstring /*===================================================================== * External declarations *=====================================================================*/ -#ifndef PDSTRING_OBJECT_EXTERNALS +#ifndef WANT_OBJECT_EXTERNALS # include "any2bytes.c" # include "bytes2any.c" @@ -84,7 +84,7 @@ static void pdstring_help(MOO_UNUSED t_pdstring *x) { post(""); post("pdstring: byte-string externals version " PACKAGE_VERSION " by Bryan Jurish"); - post("pdstring: compiled by " PDSTRING_USER " on " PDSTRING_DATE); + post("pdstring: compiled by " PACKAGE_BUILD_USER " on " PACKAGE_BUILD_DATE); } /*===================================================================== @@ -94,7 +94,7 @@ void pdstring_setup(void) { pdstring_help(NULL); -#ifndef PDSTRING_OBJECT_EXTERNALS +#ifndef WANT_OBJECT_EXTERNALS any2bytes_setup_guts(); bytes2any_setup_guts(); -- cgit v1.2.1