diff options
| author | Bryan Jurish <mukau@users.sourceforge.net> | 2007-08-05 23:04:15 +0000 |
|---|---|---|
| committer | Bryan Jurish <mukau@users.sourceforge.net> | 2007-08-05 23:04:15 +0000 |
| commit | 7e86a65ef0665a4aca2884411715b2c6184d031f (patch) | |
| tree | 08395bd43db244bd72f97a87ada1c6e2481b402a /externals | |
| parent | abd053645d63e693001c21eeef2ef43cdf8163c1 (diff) | |
+ automake-1.4 fixes
svn path=/trunk/; revision=8424
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/sprinkler/Makefile.am | 5 | ||||
| -rw-r--r-- | externals/sprinkler/configure.in | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/externals/sprinkler/Makefile.am b/externals/sprinkler/Makefile.am index 4a36c81e..af90188e 100644 --- a/externals/sprinkler/Makefile.am +++ b/externals/sprinkler/Makefile.am @@ -37,7 +37,7 @@ DISTCLEANFILES = \ ## -- maintainerclean: built by maintainer / by hand MAINTAINERCLEANFILES = \ - *$(EXEEXT) \ + *.$(PDEXT) \ .*~ *~ \ Makefile Makefile.in \ aclocal.m4 \ @@ -156,9 +156,6 @@ LFLAGS = @LFLAGS@ OFLAGS = @OFLAGS@ WFLAGS = -Wall -Winline -#GLIB_IFLAGS = @GLIB_IFLAGS@ -#GLIB_LFLAGS = @GLIB_LFLAGS@ - AM_CPPFLAGS = $(IFLAGS) $(DFLAGS) AM_CFLAGS = $(OFLAGS) $(WFLAGS) $(AFLAGS) diff --git a/externals/sprinkler/configure.in b/externals/sprinkler/configure.in index ebe444cc..b83e36b3 100644 --- a/externals/sprinkler/configure.in +++ b/externals/sprinkler/configure.in @@ -61,7 +61,18 @@ dnl AC_ISC_POSIX ##-------------------------------------------------------------- ## Pd external objects -PD_OBJECT_EXTERNALS="sprinkler\$(EXEEXT)" +AC_MSG_CHECKING([how to hack automake EXEEXT conventions]) +case "${am__api_version}" in + 1.[[0-4]]*) + AC_MSG_RESULT([automake v${am__api_version}: on install]) + buildext="" + ;; + *) + AC_MSG_RESULT([automake v${am__api_version}: on build]) + buildext="\$(EXEEXT)" + ;; +esac +PD_OBJECT_EXTERNALS="sprinkler${buildext}" AC_SUBST(PD_OBJECT_EXTERNALS) |