[PD-cvs] pd/src makefile, 1.22.2.2, 1.22.2.3 makefile.dependencies, 1.10.4.2, 1.10.4.3 u_main.tk, 1.17.2.20, 1.17.2.21

Hans-Christoph Steiner eighthave at users.sourceforge.net
Mon Jul 23 22:49:16 CEST 2007


Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31171

Modified Files:
      Tag: branch-v0-39-2-extended
	makefile makefile.dependencies u_main.tk 
Log Message:

Made the Pd window location setting explicit so that the user can easily
modify it on their own install following this suggestion by Bjoern Hartmann:

http://lists.puredata.info/pipermail/pd-list/2007-07/052342.html


Index: makefile
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/makefile,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -C2 -d -r1.22.2.2 -r1.22.2.3
*** makefile	8 Jan 2007 14:47:16 -0000	1.22.2.2
--- makefile	23 Jul 2007 20:49:13 -0000	1.22.2.3
***************
*** 1,33 ****
  VPATH = ../obj:./
  OBJ_DIR = ../obj
  BIN_DIR = ../bin
  PDEXEC = $(BIN_DIR)/pd
! EXT= pd_linux
! GUINAME= pd-gui
  
! INSTALL_PREFIX = /usr/local
! GFLAGS = -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\"
  
! MANDIR = ${prefix}/man
  
! MORECFLAGS = -DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD    	 -DUSEAPI_OSS         -I../portaudio/pa_common -I../portaudio/pablio         -I../portmidi/pm_common         -I../portmidi/pm_linux 	-fno-strict-aliasing -DPA_USE_ALSA -DUSEAPI_ALSA
  
  INCLUDE = -I.
! GINCLUDE = $(INCLUDE) 
  GLIB = -ltk8.4 -ltcl8.4 
  
! LDFLAGS = -Wl,-export-dynamic -lasound
! LIB =   -ldl -lpthread -lasound
  
! OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
  WARN_CFLAGS = -Wall -W -Wstrict-prototypes \
      -Wno-unused -Wno-parentheses -Wno-switch
  ARCH_CFLAGS = -DPD 
  
! CFLAGS = -Werror -Wdeclaration-after-statement $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS)
  
  # the sources
  
! SYSSRC += s_midi_oss.c s_audio_oss.c s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c
  
  SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \
--- 1,52 ----
+ # On Mac OS X, this needs to be defined to enable dlopen and weak linking
+ # support.  Its safe on other platforms since gcc only checks this env var on
+ # Apple's gcc.  <hans at at.or.at>
+ export MACOSX_DEPLOYMENT_TARGET = 10.3
+ 
  VPATH = ../obj:./
  OBJ_DIR = ../obj
  BIN_DIR = ../bin
  PDEXEC = $(BIN_DIR)/pd
! EXT= pd_darwin
! GUINAME= libPdTcl.dylib
  
! prefix = /usr/local
! exec_prefix = ${prefix}
! bindir = ${exec_prefix}/bin
! includedir = ${prefix}/include
! libdir = ${exec_prefix}/lib
! mandir = ${prefix}/share/man
  
! GFLAGS = -DINSTALL_PREFIX=\"$(prefix)\"
  
! # varibles to match packages/Makefile.buildlayout so that they can be easily
! # overridden when building Pd-extended builds. <hans at at.or.at>
! libpddir = $(libdir)/pd
! pddocdir = $(libpddir)/doc
! libpdbindir = $(libpddir)/bin
! 
! MORECFLAGS = -DMACOSX -DUNISTD -I/usr/X11R6/include 	 -I../portaudio/pa_common -I../portaudio/pablio 	-I../portmidi/pm_common -I../portmidi/pm_mac 	-I../portmidi/porttime 	-Wno-error 	-DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -DPA_LITTLE_ENDIAN -DUSEAPI_JACK
  
  INCLUDE = -I.
! GINCLUDE = $(INCLUDE) -F/Library/Frameworks -framework Tcl -framework Tk         -I/Library/Frameworks/Tk.framework/Versions/Current/Headers         -I/Library/Frameworks/Tcl.framework/Versions/Current/Headers         -I/Library/Frameworks/Tcl.framework/Versions/8.4/PrivateHeaders
  GLIB = -ltk8.4 -ltcl8.4 
  
! LDFLAGS = -Wl -framework CoreAudio         -framework AudioUnit -framework AudioToolbox         -framework Carbon -framework CoreMIDI -weak_framework Jack
! LIB =   -ldl -lm -lpthread
  
! OPT_CFLAGS = -O2
  WARN_CFLAGS = -Wall -W -Wstrict-prototypes \
      -Wno-unused -Wno-parentheses -Wno-switch
  ARCH_CFLAGS = -DPD 
  
! CFLAGS = -g -O2 $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS)
  
  # the sources
  
! SYSSRC += s_midi_pm.c s_audio_pa.c     	s_audio_pablio.c     	s_audio_paring.c     	../portaudio/pa_common/pa_allocation.c  	../portaudio/pa_common/pa_converters.c  	../portaudio/pa_common/pa_cpuload.c     	../portaudio/pa_common/pa_dither.c      	../portaudio/pa_common/pa_front.c       	../portaudio/pa_common/pa_process.c     	../portaudio/pa_common/pa_skeleton.c    	../portaudio/pa_common/pa_stream.c      	../portaudio/pa_common/pa_trace.c       	../portaudio/pa_unix/pa_unix_util.c     	../portaudio/pa_mac_core/pa_mac_core.c  	../portaudio/pa_mac/pa_mac_hostapis.c           ../portmidi/pm_mac/pmmac.c         ../portmidi/pm_mac/pmmacosxcm.c         ../portmidi/pm_common/pmutil.c         ../portmidi/pm_common/portmidi.c         ../portmidi/porttime/ptmacosx_cf.c  s_audio_jack.c
! 
! ASIOSRC = 
! 
! ASIOOBJ = $(ASIOSRC:.cpp=.o)
  
  SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \
***************
*** 53,56 ****
--- 72,89 ----
  GOBJ = $(GSRC:.c=.o)
  
+ # get version from m_pd.h to use in doc/1.manual/1.introduction.txt
+ PD_MAJOR_VERSION := $(shell grep PD_MAJOR_VERSION m_pd.h | \
+ 	sed 's|^.define *PD_MAJOR_VERSION *\([0-9]*\).*|\1|' )
+ PD_MINOR_VERSION := $(shell grep PD_MINOR_VERSION m_pd.h | \
+ 	sed 's|^.define *PD_MINOR_VERSION *\([0-9]*\).*|\1|' )
+ PD_BUGFIX_VERSION := $(shell grep PD_BUGFIX_VERSION m_pd.h | \
+ 	sed 's|^.define *PD_BUGFIX_VERSION *\([0-9]*\).*|\1|' )
+ PD_TEST_VERSION := $(shell grep PD_TEST_VERSION m_pd.h | \
+ 	sed 's|^.define *PD_TEST_VERSION *"\(.*\)".*|\1|' )
+ PD_VERSION := $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION)
+ ifneq ($(PD_TEST_VERSION),)
+ 	PD_VERSION := $(PD_VERSION)-$(PD_TEST_VERSION)
+ endif
+ 
  #
  #  ------------------ targets ------------------------------------
***************
*** 71,74 ****
--- 104,110 ----
  	$(CC) $(CFLAGS) $(GFLAGS) $(GINCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c 
  
+ $(ASIOOBJ): %.o : %.cpp
+ 	$(CXX) $(CFLAGS) $(INCLUDE) -c -o $(OBJ_DIR)/$*.o $*.cpp
+ 
  pd: $(PDEXEC)
  
***************
*** 78,91 ****
  
  $(BIN_DIR)/pd-watchdog: s_watchdog.c
! 	$(CC) -O2 $(STRIPFLAG) -o $(BIN_DIR)/pd-watchdog s_watchdog.c
  
  $(BIN_DIR)/pdsend: u_pdsend.c
! 	$(CC) $(CFLAGS)  $(STRIPFLAG) -o $(BIN_DIR)/pdsend u_pdsend.c
  
  $(BIN_DIR)/pdreceive: u_pdreceive.c
! 	$(CC) $(CFLAGS)  $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c
  
! $(PDEXEC): $(OBJ) 
! 	cd ../obj;  $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) \
  	$(LIB)
  
--- 114,127 ----
  
  $(BIN_DIR)/pd-watchdog: s_watchdog.c
! 	$(CC) -O2 $(STRIPFLAG) -o $(BIN_DIR)/pd-watchdog s_watchdog.c $(LIB)
  
  $(BIN_DIR)/pdsend: u_pdsend.c
! 	$(CC) $(CFLAGS)  $(STRIPFLAG) -o $(BIN_DIR)/pdsend u_pdsend.c $(LIB)
  
  $(BIN_DIR)/pdreceive: u_pdreceive.c
! 	$(CC) $(CFLAGS)  $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c $(LIB)
  
! $(PDEXEC): $(OBJ) $(ASIOOBJ)
! 	cd ../obj;  $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(ASIOOBJ) $(OBJ) \
  	$(LIB)
  
***************
*** 101,150 ****
  	cd ../obj && $(CC) -dynamiclib -read_only_relocs warning  \
  		-o $(BIN_DIR)/libPdTcl.dylib $(GOBJ)  \
! 		-F \
  		-framework Tcl  -framework Tk  -framework System  \
  		-Wl,-install_name, at executable_path/../Resources/bin/libPdTcl.dylib
! 	install_name_tool -change /Tcl.framework/Versions/8.4/Tcl\
  		 @executable_path/../Frameworks/Tcl.framework/Versions/8.4/Tcl \
! 		 -change /Tk.framework/Versions/8.4/Tk \
  		 @executable_path/../Frameworks/Tk.framework/Versions/8.4/Tk \
  		../bin/libPdTcl.dylib
  
  externs: 
! 	cd ../extra/bonk~;make 
! 	cd ../extra/choice;make 
! 	cd ../extra/expr~;make 
! 	cd ../extra/fiddle~;make 
! 	cd ../extra/loop~;make 
! 	cd ../extra/lrshift~;make 
! 	cd ../extra/pique;make 
  
- INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)
- MANINSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)/$(MANDIR)
  BINARYMODE=-m755
  
  install:  all
! 	install -d $(INSTDIR)/lib/pd/bin
! 	install $(BIN_DIR)/$(GUINAME) $(INSTDIR)/lib/pd/bin/$(GUINAME)
! 	install $(BIN_DIR)/pd-watchdog $(INSTDIR)/lib/pd/bin/pd-watchdog
! 	install -m644 $(BIN_DIR)/pd.tk $(INSTDIR)/lib/pd/bin/pd.tk
! 	install -d $(INSTDIR)/bin
! 	install $(BINARYMODE) $(PDEXEC) $(INSTDIR)/bin/pd
! 	install -m755 $(BIN_DIR)/pdsend $(INSTDIR)/bin/pdsend
! 	install -m755 $(BIN_DIR)/pdreceive $(INSTDIR)/bin/pdreceive 
! 	cp -pr ../doc ../extra $(INSTDIR)/lib/pd/
! 	rm -f $(INSTDIR)/extra/*/*.o
! 	install -d $(INSTDIR)/include
! 	install -m644 m_pd.h $(INSTDIR)/include/m_pd.h
! 	install -d $(MANINSTDIR)/man1
! 	gzip < ../man/pd.1 >  $(MANINSTDIR)/man1/pd.1.gz
! 	chmod 644 $(MANINSTDIR)/man1/pd.1.gz
! 	gzip < ../man/pdsend.1 >  $(MANINSTDIR)/man1/pdsend.1.gz
! 	chmod 644 $(MANINSTDIR)/man1/pdsend.1.gz
! 	gzip < ../man/pdreceive.1 >  $(MANINSTDIR)/man1/pdreceive.1.gz
! 	chmod 644 $(MANINSTDIR)/man1/pdreceive.1.gz
  
  local-clean:
! 	-rm -f ../obj/* $(BIN_DIR)/pd $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \
! 	    $(BIN_DIR)/pdreceive $(BIN_DIR)/pd-watchdog m_stamp.c
  	-rm -f `find ../portaudio ../portaudio_v18 -name "*.o"` 
  	-rm -f *~
--- 137,207 ----
  	cd ../obj && $(CC) -dynamiclib -read_only_relocs warning  \
  		-o $(BIN_DIR)/libPdTcl.dylib $(GOBJ)  \
! 		-F/Library/Frameworks \
  		-framework Tcl  -framework Tk  -framework System  \
  		-Wl,-install_name, at executable_path/../Resources/bin/libPdTcl.dylib
! 	install_name_tool -change /Library/Frameworks/Tcl.framework/Versions/8.4/Tcl\
  		 @executable_path/../Frameworks/Tcl.framework/Versions/8.4/Tcl \
! 		 -change /Library/Frameworks/Tk.framework/Versions/8.4/Tk \
  		 @executable_path/../Frameworks/Tk.framework/Versions/8.4/Tk \
  		../bin/libPdTcl.dylib
  
+ # this is for Windows/MinGW (only?)
+ $(BIN_DIR)/pdtcl.dll: $(GOBJ)
+ 	cd $(BIN_DIR); dllwrap --export-all-symbols --output-def pdtcl.def \
+ 	--output-lib=pdtcl.a --dllname=$(GUINAME) $(OBJ_DIR)/t_tkcmd.o $(LIB) $(GLIB)
+ 	strip --strip-unneeded $(BIN_DIR)/pdtcl.dll
+ 
  externs: 
! 	cd ../extra/bonk~;make pd_darwin
! 	cd ../extra/choice;make pd_darwin
! 	cd ../extra/expr~;make pd_darwin
! 	cd ../extra/fiddle~;make pd_darwin
! 	cd ../extra/loop~;make pd_darwin
! 	cd ../extra/lrshift~;make pd_darwin
! 	cd ../extra/pique;make pd_darwin
  
  BINARYMODE=-m755
  
+ ABOUT_FILE=$(pddocdir)/1.manual/1.introduction.txt
  install:  all
! 	install -d $(libpdbindir)
! 	install $(BIN_DIR)/$(GUINAME) $(libpdbindir)/$(GUINAME)
! 	install $(BIN_DIR)/pd-watchdog $(libpdbindir)/pd-watchdog
! 	install -m644 $(BIN_DIR)/pd.tk $(libpdbindir)/pd.tk
! 	install -d $(DESTDIR)$(bindir)
! 	install $(BINARYMODE) $(PDEXEC) $(DESTDIR)$(bindir)/pd
! 	install -m755 $(BIN_DIR)/pdsend $(DESTDIR)$(bindir)/pdsend
! 	install -m755 $(BIN_DIR)/pdreceive $(DESTDIR)$(bindir)/pdreceive 
! 	for dir in $(shell ls -1 ../doc | grep -v CVS); do \
! 		echo "installing $$dir"; \
! 		install -d $(pddocdir)/$$dir ; \
! 		install -p ../doc/$$dir/*.* $(pddocdir)/$$dir ; \
! 	done
! 	for dir in $(shell ls -1 ../doc/7.stuff | grep -v CVS); do \
! 		echo "installing 7.stuff/$$dir"; \
! 		install -d $(pddocdir)/7.stuff/$$dir ; \
! 		install -p ../doc/7.stuff/$$dir/*.* $(pddocdir)/7.stuff/$$dir ; \
! 	done
! 	mv $(ABOUT_FILE) $(ABOUT_FILE).tmp
! 	cat $(ABOUT_FILE).tmp | sed 's|PD_VERSION|Pd version $(PD_VERSION)|' \
! 		> $(ABOUT_FILE)
! 	rm $(ABOUT_FILE).tmp
! 	cp -pr ../extra $(libpddir)/
! 	rm -f $(libpddir)/extra/*/*.o
! 	install -d $(DESTDIR)$(includedir)
! 	install -m644 m_pd.h $(DESTDIR)$(includedir)/m_pd.h
! 	install -d $(DESTDIR)$(mandir)/man1
! 	gzip < ../man/pd.1 >  $(DESTDIR)$(mandir)/man1/pd.1.gz
! 	chmod 644 $(DESTDIR)$(mandir)/man1/pd.1.gz
! 	gzip < ../man/pdsend.1 >  $(DESTDIR)$(mandir)/man1/pdsend.1.gz
! 	chmod 644 $(DESTDIR)$(mandir)/man1/pdsend.1.gz
! 	gzip < ../man/pdreceive.1 >  $(DESTDIR)$(mandir)/man1/pdreceive.1.gz
! 	chmod 644 $(DESTDIR)$(mandir)/man1/pdreceive.1.gz
! 	@echo "Pd install succeeded."
  
  local-clean:
! 	-rm -f ../obj/* $(BIN_DIR)/pd $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend* \
! 	    $(BIN_DIR)/pdreceive* $(BIN_DIR)/pd-watchdog* m_stamp.c \
! 		 $(BIN_DIR)/pd.exe $(BIN_DIR)/pdtcl.* $(BIN_DIR)/pd.tk
  	-rm -f `find ../portaudio ../portaudio_v18 -name "*.o"` 
  	-rm -f *~
***************
*** 161,169 ****
  
  distclean: clean
! 	rm -rf config.cache config.log config.status makefile tags \
! 	     autom4te-*.cache
! 	echo all: > makefile
! 	echo -e  "\t./configure" >> makefile
! 	echo -e "\tmake" >> makefile
  
  tags: $(SRC) $(GSRC); ctags *.[ch]
--- 218,225 ----
  
  distclean: clean
! 	-rm -f config.cache config.log config.status makefile configure tags \
! 		autom4te.cache/output.* autom4te.cache/traces.* autom4te.cache/requests
! 	-rmdir autom4te.cache
! 	-rm -rf autom4te-*.cache
  
  tags: $(SRC) $(GSRC); ctags *.[ch]
***************
*** 175,186 ****
  
  uninstall:
! 	rm -f -r $(INSTDIR)/lib/pd
! 	rm -f $(INSTDIR)/bin/pd
! 	rm -f $(INSTDIR)/bin/pdsend
! 	rm -f $(INSTDIR)/bin/pdreceive
! 	rm -f $(INSTDIR)/include/m_pd.h
! 	rm -f $(MANINSTDIR)/man1/pd.1.gz
! 	rm -f $(MANINSTDIR)/man1/pdsend.1.gz
! 	rm -f $(MANINSTDIR)/man1/pdreceive.1.gz
  
  include makefile.dependencies
--- 231,242 ----
  
  uninstall:
! 	rm -f -r $(libpddir)
! 	rm -f $(DESTDIR)$(bindir)/pd
! 	rm -f $(DESTDIR)$(bindir)/pdsend
! 	rm -f $(DESTDIR)$(bindir)/pdreceive
! 	rm -f $(DESTDIR)$(includedir)/m_pd.h
! 	rm -f $(DESTDIR)$(mandir)/man1/pd.1.gz
! 	rm -f $(DESTDIR)$(mandir)/man1/pdsend.1.gz
! 	rm -f $(DESTDIR)$(mandir)/man1/pdreceive.1.gz
  
  include makefile.dependencies

Index: makefile.dependencies
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.dependencies,v
retrieving revision 1.10.4.2
retrieving revision 1.10.4.3
diff -C2 -d -r1.10.4.2 -r1.10.4.3
*** makefile.dependencies	8 Jan 2007 14:47:16 -0000	1.10.4.2
--- makefile.dependencies	23 Jul 2007 20:49:13 -0000	1.10.4.3
***************
*** 0 ****
--- 1,1872 ----
+ g_canvas.o: g_canvas.c /usr/include/stdlib.h /usr/include/sys/cdefs.h \
+   /usr/include/_types.h /usr/include/sys/_types.h \
+   /usr/include/machine/_types.h /usr/include/i386/_types.h \
+   /usr/include/sys/wait.h /usr/include/sys/signal.h \
+   /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+   /usr/include/i386/signal.h /usr/include/sys/resource.h \
+   /usr/include/machine/endian.h /usr/include/i386/endian.h \
+   /usr/include/sys/_endian.h \
+   /usr/lib/gcc/i686-apple-darwin8/4.0.1/include/stdint.h \
[...1843 lines suppressed...]
+   /usr/include/mach/mach_time.h /usr/include/mach/clock.h \
+   ../portmidi/porttime/porttime.h
+ s_audio_jack.o: s_audio_jack.c /usr/include/stdio.h /usr/include/_types.h \
+   /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
+   /usr/include/machine/_types.h /usr/include/i386/_types.h \
+   /usr/include/stdlib.h /usr/include/sys/wait.h /usr/include/sys/signal.h \
+   /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
+   /usr/include/i386/signal.h /usr/include/sys/resource.h \
+   /usr/include/machine/endian.h /usr/include/i386/endian.h \
+   /usr/include/sys/_endian.h \
+   /usr/lib/gcc/i686-apple-darwin8/4.0.1/include/stdint.h \
+   /usr/include/libkern/OSByteOrder.h \
+   /usr/include/libkern/i386/OSByteOrder.h /usr/include/alloca.h \
+   /usr/include/machine/types.h /usr/include/i386/types.h \
+   /usr/include/string.h m_pd.h s_stuff.h /usr/local/include/jack/jack.h \
+   /usr/include/pthread.h /usr/include/pthread_impl.h /usr/include/sched.h \
+   /usr/include/time.h /usr/include/machine/_limits.h \
+   /usr/include/i386/_limits.h /usr/local/include/jack/types.h \
+   /usr/include/inttypes.h /usr/local/include/jack/transport.h \
+   /usr/include/regex.h

Index: u_main.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
retrieving revision 1.17.2.20
retrieving revision 1.17.2.21
diff -C2 -d -r1.17.2.20 -r1.17.2.21
*** u_main.tk	11 Jul 2007 21:55:45 -0000	1.17.2.20
--- u_main.tk	23 Jul 2007 20:49:13 -0000	1.17.2.21
***************
*** 226,229 ****
--- 226,231 ----
  
  wm title . "Pd"
+ # initial location of Pd window (+x+y)
+ wm geometry . +20+70
  . configure -menu .mbar -width 200 -height 150
  





More information about the Pd-cvs mailing list