Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24370
Modified Files: Makefile.buildlayout Makefile Log Message: preparing for RC6, bug fixes and tweaks, things are look ing good
Index: Makefile.buildlayout =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile.buildlayout,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.buildlayout 28 Nov 2005 06:54:19 -0000 1.8 --- Makefile.buildlayout 30 Nov 2005 07:03:00 -0000 1.9 *************** *** 41,45 **** OS_NAME = linux EXTENSION = pd_linux - prefix = /usr/local else ifeq ($(UNAME),Darwin) --- 41,44 ---- *************** *** 151,155 ****
# release version for this distro ! PACKAGE_VERSION = extended-RC5 PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION)
--- 150,154 ----
# release version for this distro ! PACKAGE_VERSION = extended-RC6 PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION)
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 28 Nov 2005 06:54:19 -0000 1.10 --- Makefile 30 Nov 2005 07:03:00 -0000 1.11 *************** *** 38,45 **** #==============================================================================#
#------------------------------------------------------------------------------# ! # BUILD all: pre_all_$(OS_NAME) creb cyclone iemabs iemlib iemmatrix pddp pdp pmpd \ ! toxy vbap zexy @echo "Compiling objects for $(OS_NAME) aka $(UNAME)" # try it this way so that it'll recognize files that have already been built --- 38,102 ---- #==============================================================================#
+ CFLAGS = -DPD -DUNIX -Dunix $(OPTIM_FLAGS) \ + -Wall -W -Wno-unused -Wno-parentheses -Wno-switch -Wno-shadow + INCLUDES = -I$(pd_src)/src + LDFLAGS = + STRIP = strip --strip-unneeded -R .note -R .comment + #------------------------------------------------------------------------------# ! # DARWIN ! DARWIN_CFLAGS = $(CFLAGS) ! DARWIN_INCLUDES = $(INCLUDES) -I/sw/include ! DARWIN_LDFLAGS = $(LDFLAGS) -bundle -bundle_loader $(pd_src)/bin/pd -L/sw/lib ! %.pd_darwin: %.c ! $(CC) $(DARWIN_CFLAGS) $(DARWIN_INCLUDES) -o "$*.o" -c "$*.c" ! $(CC) $(DARWIN_LDFLAGS) -o "$*.pd_darwin" "$*.o" -lc -lm ! chmod a-x "$*.pd_darwin" ! rm -f "$*.o" ! ! ! #------------------------------------------------------------------------------# ! # LINUX ! LINUX_CFLAGS = $(CFLAGS) -fPIC ! LINUX_INCLUDES = $(INCLUDES) ! LINUX_LDFLAGS = $(LDFLAGS) -Wl,-export_dynamic -shared ! %.pd_linux: %.c ! $(CC) $(CFLAGS) $(INCLUDES) -o "$*.o" -c "../src/$*.c" ! gcc $(LINUX_LDFLAGS) -o "$*.pd_linux" "$*.o" -lc -lm ! chmod a-x "$*.pd_linux" ! $(STRIP) $*.pd_linux ! rm -f "$*.o" ! ! ! #------------------------------------------------------------------------------# ! # WIN (MinGW) ! WIN_CFLAGS = -mms-bitfields $(CFLAGS) ! WIN_INCLUDES = $-I. -I.. -I$(PD_PATH)/src -IC:/msys/1.0/include ! WIN_LDFLAGS = $(LDFLAGS) -shared -LC:/msys/1.0/lib -L$(PD_PATH)/bin -lpd ! # these are for compatibility ! WIN_DEFINES = \ ! -D'drand48()=((double)rand()/RAND_MAX)' \ ! -D'srand48(n)=srand((n))' \ ! -D'O_NONBLOCK=1' \ ! # These don't seem to be needed: ! # -D'bzero(p,n)=memset(p,0,n)' \ ! # -D'PROT_READ=1' \ ! # -D'MAP_PRIVATE=2' \ ! # -D'O_NDELAY=O_NONBLOCK' ! %.dll: %.c ! $(CC) $(WIN_CFLAGS) $(WIN_DEFINES) $(WIN_INCLUDES) \ ! -o "$*.o" -c "../src/$*.c" ! gcc $(LDFLAGS) -o "$*.dll" "$*.o" ! chmod a-x "$*.pd_linux" ! $(STRIP) "$*.dll" ! rm "$*.o" ! ! ! ! ! #------------------------------------------------------------------------------# ! # ALL all: pre_all_$(OS_NAME) creb cyclone iemabs iemlib iemmatrix pddp pdp pmpd \ ! smlib toxy vbap zexy @echo "Compiling objects for $(OS_NAME) aka $(UNAME)" # try it this way so that it'll recognize files that have already been built *************** *** 98,101 **** --- 155,159 ---- $(externals_src)/ext13/doc/*.pd \ $(externals_src)/ggee/*/*-help.pd \ + $(externals_src)/ggee/*/*.gif \ $(externals_src)/gem2pdp/*.pd \ $(externals_src)/ff/*.pd \ *************** *** 363,366 **** --- 421,450 ----
+ #------------------------------------------------------------------------------# + # SMLIB + SMLIB_NAME=smlib + # exclude SMlib.c since its just for the compiled library + SMLIB_OBJECTS = $(wildcard $(externals_src)/smlib/source/[a-z]*.c) + smlib: $(SMLIB_OBJECTS:.c=.$(EXTENSION)) + + smlib_install: smlib + install -d $(objectsdir)/$(SMLIB_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(SMLIB_NAME) \ + --author "Johannes Taelman johannes.taelman@rug.ac.be" \ + --license "GNU GPL" \ + --description "vector processing, vector analysis, vector synthesis, number stream analysis, number stream filters" + install -p $(SMLIB_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(SMLIB_NAME) + install -d $(helpdir)/$(SMLIB_NAME) + install -p $(wildcard $(externals_src)/smlib/help/*.pd )\ + $(helpdir)/$(SMLIB_NAME) + install -d $(manualsdir)/$(SMLIB_NAME) + install -p $(externals_src)/smlib/readme.txt $(manualsdir)/$(SMLIB_NAME) + install -d $(examplesdir)/$(SMLIB_NAME) + install -p $(wildcard $(externals_src)/smlib/examples/*.pd) \ + $(examplesdir)/$(SMLIB_NAME) + + smlib_clean: + rm $(SMLIB_OBJECTS:.c=.$(EXTENSION)) +
#------------------------------------------------------------------------------# *************** *** 378,383 **** --license "BSD" \ --description "objects for working with Tcl and Pd's Tk GUI" ! # [tow] is currently broken, it doesn't compile ! -cd $(externals_src)/miXed/toxy && $(MAKE) OUT_DIR=$(TOXY_OUT_DIR) install -d $(helpdir)/$(TOXY_NAME) install -p $(externals_src)/miXed/doc/help/toxy/*.* \ --- 462,466 ---- --license "BSD" \ --description "objects for working with Tcl and Pd's Tk GUI" ! cd $(externals_src)/miXed/toxy && $(MAKE) OUT_DIR=$(TOXY_OUT_DIR) install -d $(helpdir)/$(TOXY_NAME) install -p $(externals_src)/miXed/doc/help/toxy/*.* \ *************** *** 401,404 **** --- 484,491 ---- -cd $(externals_src)/unauthorized && $(MAKE) -k install -d $(objectsdir)/$(UNAUTHORIZED_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(UNAUTHORIZED_NAME) \ + --author "Yves Degoyon" \ + --license "GNU GPL" \ + --description "GUI and streaming objects" install -p $(externals_src)/unauthorized/*/*.$(EXTENSION) \ $(objectsdir)/$(UNAUTHORIZED_NAME) *************** *** 506,510 ****
# the destination-specific clean targets are in Makefile.buildlayout ! clean: install_clean cd $(externals_src)/build/$(OS_NAME) && make $(DEST_PATHS) clean cd $(externals_src)/hcs/hid && make $(DEST_PATHS) clean --- 593,597 ----
# the destination-specific clean targets are in Makefile.buildlayout ! clean: smlib_clean install_clean cd $(externals_src)/build/$(OS_NAME) && make $(DEST_PATHS) clean cd $(externals_src)/hcs/hid && make $(DEST_PATHS) clean