[Freeswitch-svn] [commit] r4617 - in freeswitch/trunk: . src src/mod

Author: mikej Date: Fri Mar 16 15:20:24 2007 New Revision: 4617 Added: freeswitch/trunk/src/Makefile.am freeswitch/trunk/src/Makefile.in Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in freeswitch/trunk/configure freeswitch/trunk/configure.in freeswitch/trunk/src/ (props changed) freeswitch/trunk/src/mod/Makefile.am freeswitch/trunk/src/mod/Makefile.in Log: Fix bootstrap with automake 1.7 fix generation of modules.conf from modules.conf.in on first build some more steps towards removing gmake specific stuff from our makefiles. Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Mar 16 15:20:24 2007 @@ -1,5 +1,5 @@ EXTRA_DIST = -SUBDIRS = . src/mod +SUBDIRS = . src AUTOMAKE_OPTS = foreign NAME=freeswitch PREFIX=$(prefix) @@ -8,7 +8,7 @@ AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS) AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) BASE = $(switch_srcdir) -OSARCH=$(shell uname -s) +OSARCH=`uname -s` LIBTOOL=$(switch_builddir)/libtool LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) @@ -65,8 +65,8 @@ src/include/switch_log.h\ src/include/switch_xml.h -CORE_CFLAGS = $(shell $(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags --includes) -CORE_CFLAGS += $(shell $(switch_srcdir)/libs/apr-util/apu-1-config --includes) +CORE_CFLAGS = `$(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags --includes` +CORE_CFLAGS += `$(switch_srcdir)/libs/apr-util/apu-1-config --includes` CORE_CFLAGS += -I$(switch_srcdir)/libs/sqlite CORE_CFLAGS += -I$(switch_srcdir)/libs/pcre CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/include @@ -85,7 +85,7 @@ libfreeswitch_la_LIBADD = $(CORE_LIBS) nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h -$(libfreeswitch_la_SOURCES): $(CORE_LIBS) +$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(library_include_HEADERS) MOD_LINK = $(BASE)/libfreeswitch.la @@ -153,7 +153,7 @@ cd libs/libresample && $(MAKE) cd libs/libteletone && $(MAKE) -core: deps libfreeswitch.la +core: $(CORE_LIBS) libfreeswitch.la install_core: install-libLTLIBRARIES Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Fri Mar 16 15:20:24 2007 @@ -289,7 +289,7 @@ uint64_t_fmt = @uint64_t_fmt@ voidp_size = @voidp_size@ EXTRA_DIST = -SUBDIRS = . src/mod +SUBDIRS = . src AUTOMAKE_OPTS = foreign NAME = freeswitch PREFIX = $(prefix) @@ -297,7 +297,7 @@ AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS) AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) BASE = $(switch_srcdir) -OSARCH = $(shell uname -s) +OSARCH = `uname -s` LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) libfreeswitch_la_SOURCES = \ src/switch_apr.c \ @@ -346,9 +346,9 @@ src/include/switch_log.h\ src/include/switch_xml.h -CORE_CFLAGS = $(shell $(switch_srcdir)/libs/apr/apr-1-config --cflags \ - --cppflags --includes) $(shell \ - $(switch_srcdir)/libs/apr-util/apu-1-config --includes) \ +CORE_CFLAGS = `$(switch_srcdir)/libs/apr/apr-1-config --cflags \ + --cppflags --includes` \ + `$(switch_srcdir)/libs/apr-util/apu-1-config --includes` \ -I$(switch_srcdir)/libs/sqlite -I$(switch_srcdir)/libs/pcre \ -I$(switch_srcdir)/libs/srtp/include \ -I$(switch_srcdir)/libs/srtp/crypto/include \ @@ -1085,7 +1085,7 @@ uninstall-libLTLIBRARIES uninstall-library_includeHEADERS -$(libfreeswitch_la_SOURCES): $(CORE_LIBS) +$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(library_include_HEADERS) install-data-local: @echo Installing $(NAME) @@ -1142,7 +1142,7 @@ cd libs/libresample && $(MAKE) cd libs/libteletone && $(MAKE) -core: deps libfreeswitch.la +core: $(CORE_LIBS) libfreeswitch.la install_core: install-libLTLIBRARIES Modified: freeswitch/trunk/configure ============================================================================== --- freeswitch/trunk/configure (original) +++ freeswitch/trunk/configure Fri Mar 16 15:20:24 2007 @@ -25769,7 +25769,7 @@ fi - ac_config_files="$ac_config_files Makefile src/mod/Makefile src/include/switch_am_config.h build/getlib.sh build/modmake.rules" + ac_config_files="$ac_config_files Makefile src/Makefile src/mod/Makefile src/include/switch_am_config.h build/getlib.sh build/modmake.rules" @@ -26493,6 +26493,7 @@ case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/mod/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/mod/Makefile" ;; "src/include/switch_am_config.h" ) CONFIG_FILES="$CONFIG_FILES src/include/switch_am_config.h" ;; "build/getlib.sh" ) CONFIG_FILES="$CONFIG_FILES build/getlib.sh" ;; Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri Mar 16 15:20:24 2007 @@ -291,6 +291,7 @@ AM_CONDITIONAL([CRASHPROT],[test "x$enable_crash_prot" != "xno"]) AC_CONFIG_FILES([Makefile + src/Makefile src/mod/Makefile src/include/switch_am_config.h build/getlib.sh Added: freeswitch/trunk/src/Makefile.am ============================================================================== --- (empty file) +++ freeswitch/trunk/src/Makefile.am Fri Mar 16 15:20:24 2007 @@ -0,0 +1,3 @@ +SUBDIRS = mod + + Added: freeswitch/trunk/src/Makefile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/src/Makefile.in Fri Mar 16 15:20:24 2007 @@ -0,0 +1,503 @@ +# Makefile.in generated by automake 1.9.2 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = \ + $(top_srcdir)/build/config/ax_compiler_vendor.m4 \ + $(top_srcdir)/build/config/ax_cflags_warn_all_ansi.m4 \ + $(top_srcdir)/build/config/ax_cc_maxopt.m4 \ + $(top_srcdir)/build/config/ax_check_compiler_flags.m4 \ + $(top_srcdir)/build/config/ac_gcc_archflag.m4 \ + $(top_srcdir)/build/config/ac_gcc_x86_cpuid.m4 \ + $(top_srcdir)/libs/apr/build/apr_common.m4 \ + $(top_srcdir)/libs/curl/docs/libcurl/libcurl.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_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 +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CRASHPROT_FALSE = @CRASHPROT_FALSE@ +CRASHPROT_TRUE = @CRASHPROT_TRUE@ +CURL = @CURL@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GETLIB = @GETLIB@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +IS64BITLINUX_FALSE = @IS64BITLINUX_FALSE@ +IS64BITLINUX_TRUE = @IS64BITLINUX_TRUE@ +ISLINUX_FALSE = @ISLINUX_FALSE@ +ISLINUX_TRUE = @ISLINUX_TRUE@ +ISMAC_FALSE = @ISMAC_FALSE@ +ISMAC_TRUE = @ISMAC_TRUE@ +LDFLAGS = @LDFLAGS@ +LIBCURL = @LIBCURL@ +LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ +LIBCURL_DEPS = @LIBCURL_DEPS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PRTDIAG = @PRTDIAG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SOLINK = @SOLINK@ +STRIP = @STRIP@ +SWITCH_AM_CFLAGS = @SWITCH_AM_CFLAGS@ +SWITCH_AM_CXXFLAGS = @SWITCH_AM_CXXFLAGS@ +SWITCH_AM_LDFLAGS = @SWITCH_AM_LDFLAGS@ +TAR = @TAR@ +VERSION = @VERSION@ +WANT_DEBUG_FALSE = @WANT_DEBUG_FALSE@ +WANT_DEBUG_TRUE = @WANT_DEBUG_TRUE@ +WGET = @WGET@ +ZCAT = @ZCAT@ +_libcurl_config = @_libcurl_config@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +int64_t_fmt = @int64_t_fmt@ +int64_value = @int64_value@ +int_value = @int_value@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +long_value = @long_value@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moddir = @moddir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +short_value = @short_value@ +size_t_fmt = @size_t_fmt@ +size_t_value = @size_t_value@ +ssize_t_fmt = @ssize_t_fmt@ +ssize_t_value = @ssize_t_value@ +subdirs = @subdirs@ +switch_builddir = @switch_builddir@ +switch_srcdir = @switch_srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +uint64_t_fmt = @uint64_t_fmt@ +voidp_size = @voidp_size@ +SUBDIRS = mod +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +# 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): + @set fnord $$MAKEFLAGS; amf=$$2; \ + 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) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + 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: + @set fnord $$MAKEFLAGS; amf=$$2; \ + 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) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + 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 \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(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) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + 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 +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool \ + distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-recursive + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-info-am + +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-libtool clean-recursive ctags \ + ctags-recursive distclean distclean-generic distclean-libtool \ + distclean-recursive distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-libtool \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-info-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: Modified: freeswitch/trunk/src/mod/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/Makefile.am (original) +++ freeswitch/trunk/src/mod/Makefile.am Fri Mar 16 15:20:24 2007 @@ -1,15 +1,16 @@ -CONF_MODULES=$(shell grep -v "\#" $(switch_builddir)/modules.conf) -FOUND_MODULES=$(shell find . -type d -name mod_\*) -OUR_MODULES=`if test -z "$(MODULES)" ; then echo $(CONF_MODULES) ; else echo $(MODULES) ; fi ;` -OUR_CLEAN_MODULES=`if test -z "$(MODULES)" ; then echo $(CONF_MODULES) $(FOUND_MODULES) ; else echo $(MODULES) ; fi ;` +CONF_MODULES=if test ! -f $(switch_builddir)/modules.conf ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi ; conf_modules=`grep -v "\#" $(switch_builddir)/modules.conf` ; +FOUND_MODULES=found_modules=`find . -type d -name mod_\*` ; +OUR_MODULES=if test -z "$(MODULES)" ; then our_modules=$$conf_modules ; else our_modules=$(MODULES) ; fi ; +OUR_CLEAN_MODULES=if test -z "$(MODULES)" ; then our_clean_modules=`echo $$conf_modules $$found_modules` ; else our_clean_modules=$(MODULES) ; fi ; MOD_NAME=`echo $$i | sed -e 's|^.*/||'` MOD_DIR=`if test -d $(switch_srcdir)/src/mod/$$i ; then echo $(switch_srcdir)/src/mod/$$i ; else echo $$i ; fi;` all: - @if [ ! -f $(switch_builddir)/modules.conf ] ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi - @echo making modules - @for i in $(OUR_MODULES) ; do \ + @$(CONF_MODULES) \ + $(OUR_MODULES) \ + echo making modules ; \ + for i in $$our_modules ; do \ echo making $$i ; \ moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ @@ -19,7 +20,11 @@ done clean: - @for i in $(OUR_CLEAN_MODULES) ; do \ + @$(CONF_MODULES) \ + $(FOUND_MODULES) \ + $(OUR_CLEAN_MODULES) \ + echo making clean modules ; \ + for i in $$our_clean_modules ; do \ echo making clean $$i ; \ moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ @@ -29,8 +34,10 @@ done install: - @echo Installing Modules - @for i in $(OUR_MODULES) ; do \ + @$(CONF_MODULES) \ + $(OUR_MODULES) \ + echo Installing Modules ; \ + for i in $$our_modules ; do \ echo making install $$i ; \ moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ @@ -41,8 +48,10 @@ @echo done uninstall: - @echo Uninstalling Modules - @for i in $(OUR_MODULES) ; do \ + @$(CONF_MODULES) \ + $(OUR_MODULES) \ + echo Uninstalling Modules ; \ + for i in $$our_modules ; do \ echo making uninstall $$i ; \ moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ Modified: freeswitch/trunk/src/mod/Makefile.in ============================================================================== --- freeswitch/trunk/src/mod/Makefile.in (original) +++ freeswitch/trunk/src/mod/Makefile.in Fri Mar 16 15:20:24 2007 @@ -165,10 +165,10 @@ target_alias = @target_alias@ uint64_t_fmt = @uint64_t_fmt@ voidp_size = @voidp_size@ -CONF_MODULES = $(shell grep -v "\#" $(switch_builddir)/modules.conf) -FOUND_MODULES = $(shell find . -type d -name mod_\*) -OUR_MODULES = `if test -z "$(MODULES)" ; then echo $(CONF_MODULES) ; else echo $(MODULES) ; fi ;` -OUR_CLEAN_MODULES = `if test -z "$(MODULES)" ; then echo $(CONF_MODULES) $(FOUND_MODULES) ; else echo $(MODULES) ; fi ;` +CONF_MODULES = if test ! -f $(switch_builddir)/modules.conf ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi ; conf_modules=`grep -v "\#" $(switch_builddir)/modules.conf` ; +FOUND_MODULES = found_modules=`find . -type d -name mod_\*` ; +OUR_MODULES = if test -z "$(MODULES)" ; then our_modules=$$conf_modules ; else our_modules=$(MODULES) ; fi ; +OUR_CLEAN_MODULES = if test -z "$(MODULES)" ; then our_clean_modules=`echo $$conf_modules $$found_modules` ; else our_clean_modules=$(MODULES) ; fi ; MOD_NAME = `echo $$i | sed -e 's|^.*/||'` MOD_DIR = `if test -d $(switch_srcdir)/src/mod/$$i ; then echo $(switch_srcdir)/src/mod/$$i ; else echo $$i ; fi;` all: all-am @@ -319,9 +319,10 @@ all: - @if [ ! -f $(switch_builddir)/modules.conf ] ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi - @echo making modules - @for i in $(OUR_MODULES) ; do \ + @$(CONF_MODULES) \ + $(OUR_MODULES) \ + echo making modules ; \ + for i in $$our_modules ; do \ echo making $$i ; \ moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ @@ -331,7 +332,11 @@ done clean: - @for i in $(OUR_CLEAN_MODULES) ; do \ + @$(CONF_MODULES) \ + $(FOUND_MODULES) \ + $(OUR_CLEAN_MODULES) \ + echo making clean modules ; \ + for i in $$our_clean_modules ; do \ echo making clean $$i ; \ moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ @@ -341,8 +346,10 @@ done install: - @echo Installing Modules - @for i in $(OUR_MODULES) ; do \ + @$(CONF_MODULES) \ + $(OUR_MODULES) \ + echo Installing Modules ; \ + for i in $$our_modules ; do \ echo making install $$i ; \ moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \ @@ -353,8 +360,10 @@ @echo done uninstall: - @echo Uninstalling Modules - @for i in $(OUR_MODULES) ; do \ + @$(CONF_MODULES) \ + $(OUR_MODULES) \ + echo Uninstalling Modules ; \ + for i in $$our_modules ; do \ echo making uninstall $$i ; \ moddir=$(MOD_DIR); \ if test -f $$moddir/Makefile ; then \