pd/src configure, 1.6.2.14.2.6, 1.6.2.14.2.7 configure.in, 1.5.4.5.2.16.2.8, 1.5.4.5.2.16.2.9 makefile.in, 1.4.4.2.2.21.2.10, 1.4.4.2.2.21.2.11 - Pd-cvs

8 Dec 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16355
Modified Files:
      Tag: desiredata
    configure configure.in makefile.in 
Log Message:
added 0.40-style CPPFLAGS
Index: makefile.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
retrieving revision 1.4.4.2.2.21.2.10
retrieving revision 1.4.4.2.2.21.2.11
diff -C2 -d -r1.4.4.2.2.21.2.10 -r1.4.4.2.2.21.2.11
*** makefile.in	8 Dec 2006 18:17:46 -0000	1.4.4.2.2.21.2.10
--- makefile.in	8 Dec 2006 18:31:31 -0000	1.4.4.2.2.21.2.11
***************
*** 10,16 ****
  LDFLAGS = @LDFLAGS@
  LDSOFLAGS = @LDSOFLAGS@
! OPT_CFLAGS = @OPT_CFLAGS@
! ARCH_CFLAGS = -DPD
! CFLAGS = -DDESIRE -DDONTUSESIMD @CFLAGS@ $(ARCH_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS)
  CFLAGS += -Wall -Wno-unused-parameter -I.
  CFLAGS += -DINSTALL_PREFIX="$(INSTALL_PREFIX)"
--- 10,15 ----
  LDFLAGS = @LDFLAGS@
  LDSOFLAGS = @LDSOFLAGS@
! CPPFLAGS = -DDESIRE -DDONTUSESIMD -DPD @CPPFLAGS@
! CFLAGS = $(CPPFLAGS) @CFLAGS@ $(MORECFLAGS)
  CFLAGS += -Wall -Wno-unused-parameter -I.
  CFLAGS += -DINSTALL_PREFIX="$(INSTALL_PREFIX)"
***************
*** 122,126 ****
makefile.deps: makefile
! 	$(CC) $(CFLAGS) -MM $(SRC) > makefile.deps
uninstall:
--- 121,125 ----
makefile.deps: makefile
! 	$(CC) $(CPPFLAGS) -MM $(SRC) > makefile.deps
uninstall:
Index: configure
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v
retrieving revision 1.6.2.14.2.6
retrieving revision 1.6.2.14.2.7
diff -C2 -d -r1.6.2.14.2.6 -r1.6.2.14.2.7
*** configure	8 Dec 2006 17:49:50 -0000	1.6.2.14.2.6
--- configure	8 Dec 2006 18:31:31 -0000	1.6.2.14.2.7
***************
*** 310,314 ****
  #endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi fftw MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS AUDIOSRC MIDISRC STRIPFLAG EXTERNTARGET LIBSUFFIX LDSOFLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS'
  ac_subst_files=''
--- 310,314 ----
  #endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi fftw CPPFLAGS MORECFLAGS EXT USE_DEBUG_CFLAGS AUDIOSRC MIDISRC STRIPFLAG EXTERNTARGET LIBSUFFIX LDSOFLAGS CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS'
  ac_subst_files=''
***************
*** 4315,4319 ****
      EXT=pd_linux
      LIBSUFFIX=.so
!     MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing"
      STRIPFLAG=-s
      LDSOFLAGS="-shared"
--- 4315,4320 ----
      EXT=pd_linux
      LIBSUFFIX=.so
!     CPPFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD"
!     MORECFLAGS="-fno-strict-aliasing"
      STRIPFLAG=-s
      LDSOFLAGS="-shared"
***************
*** 4324,4329 ****
      EXT=pd_darwin
      LIBSUFFIX=.dylib
!     MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO"
!     MORECFLAGS=$MORECFLAGS" -DDL_OPEN" # 0.40
      STRIPFLAG=""
  #    LDSOFLAGS="-dylib -bundle -flat_namespace -undefined suppress"
--- 4325,4331 ----
      EXT=pd_darwin
      LIBSUFFIX=.dylib
!     CPPFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO"
!     CPPFLAGS=$CPPFLAGS" -DDL_OPEN" # 0.40
!     MORECFLAGS=""
      STRIPFLAG=""
  #    LDSOFLAGS="-dylib -bundle -flat_namespace -undefined suppress"
***************
*** 4332,4339 ****
  ### this comes from pd 0.40
      if test `uname -r` = 7.9.0; then
! 	MORECFLAGS=$MORECFLAGS" -DMACOSX3"
  #	EXTERNTARGET=d_ppc
      else
! 	MORECFLAGS=$MORECFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
  #	EXTERNTARGET=d_fat
    LDFLAGS=$LDFLAGS" -arch i386 -arch ppc"
--- 4334,4341 ----
  ### this comes from pd 0.40
      if test `uname -r` = 7.9.0; then
! 	CPPFLAGS=$CPPFLAGS" -DMACOSX3"
  #	EXTERNTARGET=d_ppc
      else
! 	CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
  #	EXTERNTARGET=d_fat
    LDFLAGS=$LDFLAGS" -arch i386 -arch ppc"
***************
*** 4345,4349 ****
      EXT=pd_linux
      LIBSUFFIX=.dll
!     MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing"
      STRIPFLAG=-s
      LDSOFLAGS="-shared"
--- 4347,4352 ----
      EXT=pd_linux
      LIBSUFFIX=.dll
!     CPPFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD"
!     MORECFLAGS="-fno-strict-aliasing"
      STRIPFLAG=-s
      LDSOFLAGS="-shared"
***************
*** 5269,5275 ****
if test x$USE_DEBUG_CFLAGS == xyes; then
!     OPT_CFLAGS="-O1 -g"
  else
!     OPT_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer"
  fi
--- 5272,5278 ----
if test x$USE_DEBUG_CFLAGS == xyes; then
!     MORECFLAGS=$MORECFLAGS" -O1 -g"
  else
!     MORECFLAGS=$MORECFLAGS" -O3 -funroll-loops -fomit-frame-pointer"
  fi
***************
*** 5277,5281 ****
      AUDIOSRC=$AUDIOSRC" s_audio_oss.c"
      MIDISRC="s_midi_oss.c"
!     MORECFLAGS=$MORECFLAGS" -DUSEAPI_OSS"
  fi
--- 5280,5284 ----
      AUDIOSRC=$AUDIOSRC" s_audio_oss.c"
      MIDISRC="s_midi_oss.c"
!     CPPFLAGS=$CPPFLAGS" -DUSEAPI_OSS"
  fi
***************
*** 5283,5287 ****
      # the alsa midi is weird, it needs to have another MIDI module at once, so i put it in "audio" instead.
      AUDIOSRC=$AUDIOSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c"
!     MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA"
      LDFLAGS=$LDFLAGS" -lasound"
  fi
--- 5286,5290 ----
      # the alsa midi is weird, it needs to have another MIDI module at once, so i put it in "audio" instead.
      AUDIOSRC=$AUDIOSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c"
!     CPPFLAGS=$CPPFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA"
      LDFLAGS=$LDFLAGS" -lasound"
  fi
***************
*** 5300,5310 ****
            LIBS="$LIBS -ljack"
        fi
!       MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK"
    fi
!   if test x$jack == "xrun"; then MORECFLAGS=$MORECFLAGS" -DJACK_XRUN"; fi
  fi
if test x$portaudio == xyes; then
!     MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19"
      AUDIOSRC=$AUDIOSRC" s_audio_portaudio.c"
      if test `uname -s` = Darwin; then
--- 5303,5313 ----
            LIBS="$LIBS -ljack"
        fi
!       CPPFLAGS=$CPPFLAGS" -DUSEAPI_JACK"
    fi
!   if test x$jack == "xrun"; then CPPFLAGS=$CPPFLAGS" -DJACK_XRUN"; fi
  fi
if test x$portaudio == xyes; then
!     CPPFLAGS=$CPPFLAGS" -DUSEAPI_PORTAUDIO -DPA19"
      AUDIOSRC=$AUDIOSRC" s_audio_portaudio.c"
      if test `uname -s` = Darwin; then
***************
*** 5321,5325 ****
  fi
! MORECFLAGS=$MORECFLAGS" $MIDIFLAGS"
if test x$fftw == "xyes"; then
--- 5324,5328 ----
  fi
! CPPFLAGS=$CPPFLAGS" $MIDIFLAGS"
if test x$fftw == "xyes"; then
***************
*** 5615,5619 ****
if test x$bigendian = "xyes"; then
!     MORECFLAGS=$MORECFLAGS" -DBIGENDIAN"
  fi
--- 5618,5622 ----
if test x$bigendian = "xyes"; then
!     CPPFLAGS=$CPPFLAGS" -DBIGENDIAN"
  fi
***************
*** 6260,6266 ****
  s,@portmidi@,$portmidi,;t t
  s,@fftw@,$fftw,;t t
  s,@MORECFLAGS@,$MORECFLAGS,;t t
  s,@EXT@,$EXT,;t t
- s,@OPT_CFLAGS@,$OPT_CFLAGS,;t t
  s,@USE_DEBUG_CFLAGS@,$USE_DEBUG_CFLAGS,;t t
  s,@AUDIOSRC@,$AUDIOSRC,;t t
--- 6263,6269 ----
  s,@portmidi@,$portmidi,;t t
  s,@fftw@,$fftw,;t t
+ s,@CPPFLAGS@,$CPPFLAGS,;t t
  s,@MORECFLAGS@,$MORECFLAGS,;t t
  s,@EXT@,$EXT,;t t
  s,@USE_DEBUG_CFLAGS@,$USE_DEBUG_CFLAGS,;t t
  s,@AUDIOSRC@,$AUDIOSRC,;t t
***************
*** 6273,6277 ****
  s,@CFLAGS@,$CFLAGS,;t t
  s,@LDFLAGS@,$LDFLAGS,;t t
- s,@CPPFLAGS@,$CPPFLAGS,;t t
  s,@ac_ct_CC@,$ac_ct_CC,;t t
  s,@EXEEXT@,$EXEEXT,;t t
--- 6276,6279 ----
Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.5.4.5.2.16.2.8
retrieving revision 1.5.4.5.2.16.2.9
diff -C2 -d -r1.5.4.5.2.16.2.8 -r1.5.4.5.2.16.2.9
*** configure.in	8 Dec 2006 17:49:49 -0000	1.5.4.5.2.16.2.8
--- configure.in	8 Dec 2006 18:31:31 -0000	1.5.4.5.2.16.2.9
***************
*** 13,19 ****
  AC_SUBST(portmidi, yes)
  AC_SUBST(fftw, yes)
  AC_SUBST(MORECFLAGS)
  AC_SUBST(EXT)
- AC_SUBST(OPT_CFLAGS)
  AC_SUBST(USE_DEBUG_CFLAGS, no)
  AC_SUBST(AUDIOSRC)
--- 13,19 ----
  AC_SUBST(portmidi, yes)
  AC_SUBST(fftw, yes)
+ AC_SUBST(CPPFLAGS)
  AC_SUBST(MORECFLAGS)
  AC_SUBST(EXT)
  AC_SUBST(USE_DEBUG_CFLAGS, no)
  AC_SUBST(AUDIOSRC)
***************
*** 65,69 ****
      EXT=pd_linux
      LIBSUFFIX=.so
!     MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing"
      STRIPFLAG=-s
      LDSOFLAGS="-shared"
--- 65,70 ----
      EXT=pd_linux
      LIBSUFFIX=.so
!     CPPFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD"
!     MORECFLAGS="-fno-strict-aliasing"
      STRIPFLAG=-s
      LDSOFLAGS="-shared"
***************
*** 74,79 ****
      EXT=pd_darwin
      LIBSUFFIX=.dylib
!     MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO"
!     MORECFLAGS=$MORECFLAGS" -DDL_OPEN" # 0.40
      STRIPFLAG=""
  #    LDSOFLAGS="-dylib -bundle -flat_namespace -undefined suppress"
--- 75,81 ----
      EXT=pd_darwin
      LIBSUFFIX=.dylib
!     CPPFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO"
!     CPPFLAGS=$CPPFLAGS" -DDL_OPEN" # 0.40
!     MORECFLAGS=""
      STRIPFLAG=""
  #    LDSOFLAGS="-dylib -bundle -flat_namespace -undefined suppress"
***************
*** 82,89 ****
  ### this comes from pd 0.40
      if test `uname -r` = 7.9.0; then
! 	MORECFLAGS=$MORECFLAGS" -DMACOSX3"
  #	EXTERNTARGET=d_ppc
      else
! 	MORECFLAGS=$MORECFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
  #	EXTERNTARGET=d_fat
    LDFLAGS=$LDFLAGS" -arch i386 -arch ppc"
--- 84,91 ----
  ### this comes from pd 0.40
      if test `uname -r` = 7.9.0; then
! 	CPPFLAGS=$CPPFLAGS" -DMACOSX3"
  #	EXTERNTARGET=d_ppc
      else
! 	CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
  #	EXTERNTARGET=d_fat
    LDFLAGS=$LDFLAGS" -arch i386 -arch ppc"
***************
*** 95,99 ****
      EXT=pd_linux
      LIBSUFFIX=.dll
!     MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing"
      STRIPFLAG=-s
      LDSOFLAGS="-shared"
--- 97,102 ----
      EXT=pd_linux
      LIBSUFFIX=.dll
!     CPPFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD"
!     MORECFLAGS="-fno-strict-aliasing"
      STRIPFLAG=-s
      LDSOFLAGS="-shared"
***************
*** 141,147 ****
if test x$USE_DEBUG_CFLAGS == xyes; then
!     OPT_CFLAGS="-O1 -g"
  else
!     OPT_CFLAGS="-O3 -funroll-loops -fomit-frame-pointer"
  fi
--- 144,150 ----
if test x$USE_DEBUG_CFLAGS == xyes; then
!     MORECFLAGS=$MORECFLAGS" -O1 -g"
  else
!     MORECFLAGS=$MORECFLAGS" -O3 -funroll-loops -fomit-frame-pointer"
  fi
***************
*** 149,153 ****
      AUDIOSRC=$AUDIOSRC" s_audio_oss.c"
      MIDISRC="s_midi_oss.c"
!     MORECFLAGS=$MORECFLAGS" -DUSEAPI_OSS"
  fi
--- 152,156 ----
      AUDIOSRC=$AUDIOSRC" s_audio_oss.c"
      MIDISRC="s_midi_oss.c"
!     CPPFLAGS=$CPPFLAGS" -DUSEAPI_OSS"
  fi
***************
*** 155,159 ****
      # the alsa midi is weird, it needs to have another MIDI module at once, so i put it in "audio" instead.
      AUDIOSRC=$AUDIOSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c"
!     MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA"
      LDFLAGS=$LDFLAGS" -lasound"
  fi
--- 158,162 ----
      # the alsa midi is weird, it needs to have another MIDI module at once, so i put it in "audio" instead.
      AUDIOSRC=$AUDIOSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c"
!     CPPFLAGS=$CPPFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA"
      LDFLAGS=$LDFLAGS" -lasound"
  fi
***************
*** 172,182 ****
            LIBS="$LIBS -ljack"
        fi
!       MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK"
    fi
!   if test x$jack == "xrun"; then MORECFLAGS=$MORECFLAGS" -DJACK_XRUN"; fi
  fi
if test x$portaudio == xyes; then
!     MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19"
      AUDIOSRC=$AUDIOSRC" s_audio_portaudio.c"
      if test `uname -s` = Darwin; then
--- 175,185 ----
            LIBS="$LIBS -ljack"
        fi
!       CPPFLAGS=$CPPFLAGS" -DUSEAPI_JACK"
    fi
!   if test x$jack == "xrun"; then CPPFLAGS=$CPPFLAGS" -DJACK_XRUN"; fi
  fi
if test x$portaudio == xyes; then
!     CPPFLAGS=$CPPFLAGS" -DUSEAPI_PORTAUDIO -DPA19"
      AUDIOSRC=$AUDIOSRC" s_audio_portaudio.c"
      if test `uname -s` = Darwin; then
***************
*** 193,197 ****
  fi
! MORECFLAGS=$MORECFLAGS" $MIDIFLAGS"
if test x$fftw == "xyes"; then
--- 196,200 ----
  fi
! CPPFLAGS=$CPPFLAGS" $MIDIFLAGS"
if test x$fftw == "xyes"; then
***************
*** 201,205 ****
  AC_C_BIGENDIAN(bigendian=yes,bigendian=no,bigendian=maybe)
  if test x$bigendian = "xyes"; then
!     MORECFLAGS=$MORECFLAGS" -DBIGENDIAN"
  fi
--- 204,208 ----
  AC_C_BIGENDIAN(bigendian=yes,bigendian=no,bigendian=maybe)
  if test x$bigendian = "xyes"; then
!     CPPFLAGS=$CPPFLAGS" -DBIGENDIAN"
  fi