diff options
author | Ralph Giles <giles@mozilla.com> | 2011-08-02 11:43:43 -0700 |
---|---|---|
committer | Ralph Giles <giles@mozilla.com> | 2011-08-02 11:43:43 -0700 |
commit | 2852cb1486ca68fe418bdebcda7ecc9581127b4d (patch) | |
tree | 9fdeb21985c6bf9df8ef8d947ba1ac3aa2416ef2 /autogen.sh | |
parent | 5840aaf26c83f0e6beff57ced047a31be995dd20 (diff) | |
download | opus-2852cb1486ca68fe418bdebcda7ecc9581127b4d.tar.gz |
Tell automake to put object files in subdirectories.
Previously the autotools build litered whatever directory
'make' was invoked from with intermediate files. Adding
'subdir-objects' to AUTOMAKE_OPTIONS tells it to put them
in subdirectories according to the relative paths to the
source files, .i.e. silk/schur.o for $(srcdir)/silk/schur.c
The change to autogen.sh is necessary to handle the
(apparently new) case where an AUTOMAKE_OPTIONS line is
given without a minimum version number.
Diffstat (limited to 'autogen.sh')
-rwxr-xr-x | autogen.sh | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -22,10 +22,14 @@ echo "checking for autoconf... " VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]*\).*/\1/" VERSIONMKINT="sed -e s/[^0-9]//" - + # do we need automake? if test -r Makefile.am; then - AM_NEEDED=`fgrep AUTOMAKE_OPTIONS Makefile.am | $VERSIONGREP` + AM_OPTIONS=`fgrep AUTOMAKE_OPTIONS Makefile.am` + AM_NEEDED=`echo $AM_OPTIONS | $VERSIONGREP` + if test "$AM_NEEDED" = "$AM_OPTIONS"; then + AM_NEEDED="" + fi if test -z $AM_NEEDED; then echo -n "checking for automake... " AUTOMAKE=automake |