pd/src configure.in, 1.5.4.5.2.11, 1.5.4.5.2.12 configure, 1.6.2.9, 1.6.2.10 makefile.in, 1.4.4.2.2.8, 1.4.4.2.2.9 - Pd-cvs

22 Nov 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13592
Modified Files:
      Tag: devel_0_39
    configure.in configure makefile.in 
Log Message:
finished removing unneeded Tcl detection
Index: makefile.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
retrieving revision 1.4.4.2.2.8
retrieving revision 1.4.4.2.2.9
diff -C2 -d -r1.4.4.2.2.8 -r1.4.4.2.2.9
*** makefile.in	21 Nov 2006 22:36:43 -0000	1.4.4.2.2.8
--- makefile.in	22 Nov 2006 21:46:24 -0000	1.4.4.2.2.9
***************
*** 10,15 ****
  MORECFLAGS = @MORECFLAGS@
  INCLUDE = -I.
- GINCLUDE = $(INCLUDE) @GUIFLAGS@
- GLIB = @LIBS@
  LDFLAGS = @LDFLAGS@
  LIB =  @PDLIB@
--- 10,13 ----
***************
*** 56,62 ****
    $(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c
- $(GOBJ) : %.o : %.c
- 	$(CC) $(CFLAGS) $(GFLAGS) $(GINCLUDE) -c -o $*.o $*.c
- 
  pd: $(PDEXEC)
--- 54,57 ----
***************
*** 72,76 ****
    $(CC) $(CFLAGS)  $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c
! $(PDEXEC): $(OBJ) 
    $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(LIB)
--- 67,71 ----
    $(CC) $(CFLAGS)  $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c
! $(PDEXEC): $(OBJ)
    $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(LIB)
***************
*** 78,94 ****
    cp u_main.tk $(BIN_DIR)/pd.tk
- #this is for Mac OSX only...
- $(BIN_DIR)/libPdTcl.dylib: $(GOBJ) $(GSRC)
- 	$(CC) -dynamiclib -read_only_relocs warning  \
- 		-o $(BIN_DIR)/libPdTcl.dylib $(GOBJ)  \
- 		-F@TCLTK_FRAMEWORKS_PATH@ \
- 		-framework Tcl  -framework Tk  -framework System  \
- 		-Wl,-install_name,@executable_path/../Resources/bin/libPdTcl.dylib
- 	install_name_tool -change @TCLTK_FRAMEWORKS_PATH@/Tcl.framework/Versions/8.4/Tcl\
- 		 @executable_path/../Frameworks/Tcl.framework/Versions/8.4/Tcl \
- 		 -change @TCLTK_FRAMEWORKS_PATH@/Tk.framework/Versions/8.4/Tk \
- 		 @executable_path/../Frameworks/Tk.framework/Versions/8.4/Tk \
- 		../bin/libPdTcl.dylib
- 
  externs:
    cd ../extra/bonk~   ;make @EXTERNTARGET@
--- 73,76 ----
Index: configure
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v
retrieving revision 1.6.2.9
retrieving revision 1.6.2.10
diff -C2 -d -r1.6.2.9 -r1.6.2.10
*** configure	22 Nov 2006 03:44:52 -0000	1.6.2.9
--- configure	22 Nov 2006 21:46:24 -0000	1.6.2.10
***************
*** 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 binarymode PDLIB MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS SYSSRC TCLTK_FRAMEWORKS_PATH STRIPFLAG GUIFLAGS OSNUMBER EXTERNTARGET 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 binarymode PDLIB MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS SYSSRC STRIPFLAG EXTERNTARGET 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=''
***************
*** 1318,1325 ****
- 
- 
- 
- 
  # Check whether --enable-alsa or --disable-alsa was given.
  if test "${enable_alsa+set}" = set; then
--- 1318,1321 ----
***************
*** 5095,5099 ****
      SYSSRC=$SYSSRC" s_midi_oss.c s_audio_oss.c"
      STRIPFLAG=-s
-     OSNUMBER=0
      if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
      if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
--- 5091,5094 ----
***************
*** 5105,5125 ****
      MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -Wno-error -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN -DPA19 -DPA_USE_COREAUDIO"
      STRIPFLAG=""
- 
-     # find the Tcl/Tk Frameworks
-     if test -d "../../Frameworks"; then
-         # Miller's location
-         TCLTK_FRAMEWORKS_PATH="../../Frameworks"
-     elif test -d "/Library/Frameworks"; then
-         # get it from the default install location
-         TCLTK_FRAMEWORKS_PATH="/Library/Frameworks"
-     else
-         # Panther has Tcl here; Tiger has Tcl and Tk here
-         TCLTK_FRAMEWORKS_PATH="/System/Library/Frameworks"
-     fi
-     GUIFLAGS="-F$TCLTK_FRAMEWORKS_PATH -framework Tcl -framework Tk \
-         -I$TCLTK_FRAMEWORKS_PATH/Tk.framework/Versions/Current/Headers \
-         -I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/Current/Headers \
-         -I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/8.4/PrivateHeaders"
-     OSNUMBER=2
      EXTERNTARGET=pd_darwin
  fi
--- 5100,5103 ----
***************
*** 5792,5799 ****
  s,@USE_DEBUG_CFLAGS@,$USE_DEBUG_CFLAGS,;t t
  s,@SYSSRC@,$SYSSRC,;t t
- s,@TCLTK_FRAMEWORKS_PATH@,$TCLTK_FRAMEWORKS_PATH,;t t
  s,@STRIPFLAG@,$STRIPFLAG,;t t
- s,@GUIFLAGS@,$GUIFLAGS,;t t
- s,@OSNUMBER@,$OSNUMBER,;t t
  s,@EXTERNTARGET@,$EXTERNTARGET,;t t
  s,@CC@,$CC,;t t
--- 5770,5774 ----
Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.5.4.5.2.11
retrieving revision 1.5.4.5.2.12
diff -C2 -d -r1.5.4.5.2.11 -r1.5.4.5.2.12
*** configure.in	22 Nov 2006 03:44:52 -0000	1.5.4.5.2.11
--- configure.in	22 Nov 2006 21:46:24 -0000	1.5.4.5.2.12
***************
*** 21,29 ****
  AC_SUBST(USE_DEBUG_CFLAGS, no)
  AC_SUBST(SYSSRC)
- AC_SUBST(TCLTK_FRAMEWORKS_PATH)
- AC_SUBST(TCLTK_FRAMEWORKS_PATH)
  AC_SUBST(STRIPFLAG)
- AC_SUBST(GUIFLAGS)
- AC_SUBST(OSNUMBER)
  AC_SUBST(EXTERNTARGET)
--- 21,25 ----
***************
*** 109,113 ****
      SYSSRC=$SYSSRC" s_midi_oss.c s_audio_oss.c"
      STRIPFLAG=-s
-     OSNUMBER=0
      if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
      if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi
--- 105,108 ----
***************
*** 119,139 ****
      MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -Wno-error -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN -DPA19 -DPA_USE_COREAUDIO"
      STRIPFLAG=""
- 
-     # find the Tcl/Tk Frameworks
-     if test -d "../../Frameworks"; then
-         # Miller's location
-         TCLTK_FRAMEWORKS_PATH="../../Frameworks"
-     elif test -d "/Library/Frameworks"; then
-         # get it from the default install location
-         TCLTK_FRAMEWORKS_PATH="/Library/Frameworks"
-     else
-         # Panther has Tcl here; Tiger has Tcl and Tk here
-         TCLTK_FRAMEWORKS_PATH="/System/Library/Frameworks"
-     fi
-     GUIFLAGS="-F$TCLTK_FRAMEWORKS_PATH -framework Tcl -framework Tk \
-         -I$TCLTK_FRAMEWORKS_PATH/Tk.framework/Versions/Current/Headers \
-         -I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/Current/Headers \
-         -I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/8.4/PrivateHeaders"
-     OSNUMBER=2
      EXTERNTARGET=pd_darwin
  fi
--- 114,117 ----