diff options
| -rw-r--r-- | common/m4/ax_pd_external.m4 | 6 | ||||
| -rwxr-xr-x | deque/configure | 6 | ||||
| -rwxr-xr-x | flite/configure | 6 | ||||
| -rw-r--r-- | hello/Makefile.am | 11 |
4 files changed, 15 insertions, 14 deletions
diff --git a/common/m4/ax_pd_external.m4 b/common/m4/ax_pd_external.m4 index 66c770b..580ba02 100644 --- a/common/m4/ax_pd_external.m4 +++ b/common/m4/ax_pd_external.m4 @@ -291,7 +291,7 @@ AC_DEFUN([AX_PD_EXTERNAL], if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then ##-- only set OFLAGS if user CFLAGS are empty PDEXT_OFLAGS="-O2 -pipe" - else + elif test "$ENABLE_DEBUG" = "yes"; then PDEXT_OFLAGS="-g" fi PDEXT_OFLAGS="$PDEXT_OFLAGS -fPIC" @@ -308,7 +308,7 @@ AC_DEFUN([AX_PD_EXTERNAL], if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then ##-- only set OFLAGS if user CFLAGS are empty PDEXT_OFLAGS="-O2" - else + elif test "$ENABLE_DEBUG" = "yes"; then PDEXT_OFLAGS="-g" fi PDEXT=pd_darwin @@ -347,7 +347,7 @@ AC_DEFUN([AX_PD_EXTERNAL], ##-- add defaults to user flags CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" - CFLAGS="$UCFLAGS $PDEXT_FLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" + CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS" ## END platform-dependent variables diff --git a/deque/configure b/deque/configure index 2e20a07..eb8e3d8 100755 --- a/deque/configure +++ b/deque/configure @@ -3729,7 +3729,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then ##-- only set OFLAGS if user CFLAGS are empty PDEXT_OFLAGS="-O2 -pipe" - else + elif test "$ENABLE_DEBUG" = "yes"; then PDEXT_OFLAGS="-g" fi PDEXT_OFLAGS="$PDEXT_OFLAGS -fPIC" @@ -3746,7 +3746,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then ##-- only set OFLAGS if user CFLAGS are empty PDEXT_OFLAGS="-O2" - else + elif test "$ENABLE_DEBUG" = "yes"; then PDEXT_OFLAGS="-g" fi PDEXT=pd_darwin @@ -3786,7 +3786,7 @@ echo "$as_me: will use pd extension \".$PDEXT\" for pd externals" >&6;} ##-- add defaults to user flags CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" - CFLAGS="$UCFLAGS $PDEXT_FLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" + CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS" ## END platform-dependent variables diff --git a/flite/configure b/flite/configure index d44b1a0..7ce92e6 100755 --- a/flite/configure +++ b/flite/configure @@ -3736,7 +3736,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then ##-- only set OFLAGS if user CFLAGS are empty PDEXT_OFLAGS="-O2 -pipe" - else + elif test "$ENABLE_DEBUG" = "yes"; then PDEXT_OFLAGS="-g" fi PDEXT_OFLAGS="$PDEXT_OFLAGS -fPIC" @@ -3753,7 +3753,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then ##-- only set OFLAGS if user CFLAGS are empty PDEXT_OFLAGS="-O2" - else + elif test "$ENABLE_DEBUG" = "yes"; then PDEXT_OFLAGS="-g" fi PDEXT=pd_darwin @@ -3793,7 +3793,7 @@ echo "$as_me: will use pd extension \".$PDEXT\" for pd externals" >&6;} ##-- add defaults to user flags CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" - CFLAGS="$UCFLAGS $PDEXT_FLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" + CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS" ## END platform-dependent variables diff --git a/hello/Makefile.am b/hello/Makefile.am index 46b4286..4575483 100644 --- a/hello/Makefile.am +++ b/hello/Makefile.am @@ -6,8 +6,14 @@ # Process this file with Automake to create Makefile.in. #----------------------------------------------------------------------- +#----------------------------------------------------------------------- +# Includes +#----------------------------------------------------------------------- +include $(top_srcdir)/pdexternal.am + ##----------------------------------------------------------------------- ## Options & Subdirectories +##----------------------------------------------------------------------- ##-- aclocal options (top level only) ACLOCAL_AMFLAGS = -I m4 @@ -19,11 +25,6 @@ AUTOMAKE_OPTIONS = foreign ## --- recursion subdirectories #SUBDIRS = config src -#----------------------------------------------------------------------- -# Includes -#----------------------------------------------------------------------- -include $(top_srcdir)/pdexternal.am - ##----------------------------------------------------------------------- ## Pd Externals: hacked _PROGRAMS #----------------------------------------------------------------------- |