[svn-commits] qwell: branch 1.6.2 r279657 - in /branches/1.6.2: ./ include/asterisk/ sounds/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Jul 26 17:59:55 CDT 2010
Author: qwell
Date: Mon Jul 26 17:59:52 2010
New Revision: 279657
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=279657
Log:
Really fix sounds Makefile (and make it readableish).
There was a rather large syntax error that should have caused ALL versions of GNU make to fail.
I don't know how it worked.
Added:
branches/1.6.2/sounds/Makefile
- copied, changed from r279656, branches/1.6.2/sounds/Makefile.381
Removed:
branches/1.6.2/sounds/Makefile.380
branches/1.6.2/sounds/Makefile.381
Modified:
branches/1.6.2/configure
branches/1.6.2/configure.ac
branches/1.6.2/include/asterisk/autoconfig.h.in
Modified: branches/1.6.2/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/configure.ac?view=diff&rev=279657&r1=279656&r2=279657
==============================================================================
--- branches/1.6.2/configure.ac (original)
+++ branches/1.6.2/configure.ac Mon Jul 26 17:59:52 2010
@@ -175,12 +175,6 @@
AC_PROG_LN_S
AC_PROG_RANLIB
AST_CHECK_GNU_MAKE
-
-if test ${ac_cv_GNU_MAKE_VERSION_MAJOR} -gt 2 -a ${ac_cv_GNU_MAKE_VERSION_MINOR} -gt 80; then
- $LN_S -f Makefile.381 sounds/Makefile
-else
- $LN_S -f Makefile.380 sounds/Makefile
-fi
AC_CHECK_TOOLS([STRIP], [strip gstrip], :)
AC_CHECK_TOOLS([AR], [ar gar], :)
Modified: branches/1.6.2/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/include/asterisk/autoconfig.h.in?view=diff&rev=279657&r1=279656&r2=279657
==============================================================================
--- branches/1.6.2/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.2/include/asterisk/autoconfig.h.in Mon Jul 26 17:59:52 2010
@@ -692,7 +692,7 @@
/* Define to 1 if you have the `strtoq' function. */
#undef HAVE_STRTOQ
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
/* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -924,11 +924,11 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@@ -948,11 +948,6 @@
/* Define to the type of arg 5 for `select'. */
#undef SELECT_TYPE_ARG5
-
-/* Define to 1 if the `setvbuf' function takes the buffering type as its
- second argument and the buffer pointer as the third, as on System V before
- release 3. */
-#undef SETVBUF_REVERSED
/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
@@ -974,20 +969,30 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
-/* Define to 1 if on AIX 3.
- System headers sometimes define this.
- We just want to avoid a redefinition error message. */
+/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
#undef _LARGEFILE_SOURCE
@@ -1004,20 +1009,6 @@
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
-
-/* Enable extensions on Solaris. */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
Copied: branches/1.6.2/sounds/Makefile (from r279656, branches/1.6.2/sounds/Makefile.381)
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/sounds/Makefile?view=diff&rev=279657&p1=branches/1.6.2/sounds/Makefile.381&r1=279656&p2=branches/1.6.2/sounds/Makefile&r2=279657
==============================================================================
--- branches/1.6.2/sounds/Makefile.381 (original)
+++ branches/1.6.2/sounds/Makefile Mon Jul 26 17:59:52 2010
@@ -75,30 +75,38 @@
define sound_format_lang_rule
$$($(1))/.asterisk-$(2)$(if $(3),-$(3),)-%: have_download
- $(CMD_PREFIX)PACKAGE=$$(subst $$($(1))/.asterisk,asterisk,$$@).tar.gz; $(BS)
- if test ! -f $$$${PACKAGE}; then $(BS)
- if test ! -f $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}; then $(BS)
- (cd $$(SOUNDS_CACHE_DIR); ($$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$$${PACKAGE} $$(SOUNDS_URL)/$$$${PACKAGE}.sha1 $(BS)
- && sha1sum -c --status $$$${PACKAGE}.sha1) || $(BS)
- (echo "Bad checksum: $$$${PACKAGE}" 1>&2; exit 1)); $(BS)
- fi; $(BS)
- $(LN) -sf $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE} .; $(BS)
- fi; $(BS)
-$(if $($(4)_VERSION),\
-$(EMPTY) rm -f $$(subst -$$($(4)_VERSION),,$$@)-* && $(BS)
-,) (cd $$($(1))$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && $(BS)
- touch $$@
+ $(CMD_PREFIX)PACKAGE=$$(subst $$($(1))/.asterisk,asterisk,$$@).tar.gz; \
+ if test ! -f $$$${PACKAGE}; then \
+ if test ! -f $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}; then \
+ (cd $$(SOUNDS_CACHE_DIR); \
+ ( \
+ $$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$$${PACKAGE} && \
+ $$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$$${PACKAGE}.sha1 && \
+ $$(SHA1SUM) -c --status $$$${PACKAGE}.sha1 \
+ ) || \
+ (echo "Bad checksum: $$$${PACKAGE}" 1>&2; exit 1) \
+ ); \
+ fi; \
+ $(LN) -sf $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE} .; \
+ fi; \
+ $(if $($(4)_VERSION),rm -f $$(subst -$$($(4)_VERSION),,$$@)-*,); \
+ (cd $$($(1))$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && touch $$@
endef
define sound_download_rule
asterisk-$(1)-%.tar.gz: have_download
- $(CMD_PREFIX)if test ! -f $$@ && test ! -f $$(SOUNDS_DIR)/.$$(subst .tar.gz,,$/$@); then $(BS)
- if test ! -f $$(SOUNDS_CACHE_DIR)/$$@; then $(BS)
- (cd $$(SOUNDS_CACHE_DIR); ($$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$@ $$(SOUNDS_URL)/$$@.sha1 $(BS)
- && sha1sum -c --status $$@.sha1) || $(BS)
- (echo "Bad checksum: $$@" 1>&2; exit 1)); $(BS)
- fi; $(BS)
- $(LN) -sf $$(SOUNDS_CACHE_DIR)/$$@ .; $(BS)
+ $(CMD_PREFIX)if test ! -f $$@ && test ! -f $$(SOUNDS_DIR)/.$$(subst .tar.gz,,$/$@); then \
+ if test ! -f $$(SOUNDS_CACHE_DIR)/$$@; then \
+ (cd $$(SOUNDS_CACHE_DIR); \
+ ( \
+ $$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$@ && \
+ $$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$@.sha1 && \
+ $$(SHA1SUM) -c --status $$@.sha1 \
+ ) || \
+ (echo "Bad checksum: $$@" 1>&2; exit 1) \
+ ); \
+ fi; \
+ $(LN) -sf $$(SOUNDS_CACHE_DIR)/$$@ .; \
fi
endef
@@ -106,20 +114,18 @@
define sound_format_lang_rule
$$($(1))/.asterisk-$(2)$(if $(3),-$(3),)-%: have_download
- $(CMD_PREFIX)PACKAGE=$$(subst $$($(1))/.asterisk,asterisk,$$@).tar.gz; $(BS)
- if test ! -f $$$${PACKAGE}; then $(BS)
- ($$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$$${PACKAGE} || exit 1); $(BS)
- fi; $(BS)
-$(if $($(4)_VERSION),\
-$(EMPTY) rm -f $$(subst -$$($(4)_VERSION),,$$@)-* && $(BS)
-,) (cd $$($(1))$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && $(BS)
- touch $$@
+ $(CMD_PREFIX)PACKAGE=$$(subst $$($(1))/.asterisk,asterisk,$$@).tar.gz; \
+ if test ! -f $$$${PACKAGE}; then \
+ ($$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$$${PACKAGE} || exit 1); \
+ fi; \
+ $(if $($(4)_VERSION),rm -f $$(subst -$$($(4)_VERSION),,$$@)-*,); \
+ (cd $$($(1))$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && touch $$@
endef
define sound_download_rule
asterisk-$(1)-%.tar.gz: have_download
- $(CMD_PREFIX)if test ! -f $$@ && test ! -f $$(SOUNDS_DIR)/.$$(subst .tar.gz,,$$@); then $(BS)
- $$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$@; $(BS)
+ $(CMD_PREFIX)if test ! -f $$@ && test ! -f $$(SOUNDS_DIR)/.$$(subst .tar.gz,,$$@); then \
+ $$(DOWNLOAD) $$(WGET_ARGS) $$(SOUNDS_URL)/$$@; \
fi
endef
More information about the svn-commits
mailing list