Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15186
Modified Files: Makefile Log Message: fixed the bugs carmen reported and added unauthorized
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Makefile 8 Dec 2005 06:42:23 -0000 1.17 --- Makefile 9 Dec 2005 06:26:57 -0000 1.18 *************** *** 38,82 **** #==============================================================================#
- 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 "$*.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)' \ --- 38,58 ---- #==============================================================================#
+ CFLAGS = -DPD -DUNIX -Dunix $(OPTIM_FLAGS) -I$(pd_src)/src\ + -Wall -W -Wno-unused -Wno-parentheses -Wno-switch -Wno-shadow \ + -I$(pd_src)/src + LDFLAGS = + LIBS =
! ifeq ($(OS_NAME),darwin) ! CFLAGS += -I/sw/include ! LDFLAGS += -bundle -bundle_loader $(pd_src)/bin/pd -L/sw/lib ! STRIP = strip -u -r ! else ! ifeq ($(OS_NAME),win) ! CFLAGS += -mms-bitfields -D'O_NONBLOCK=1' \ ! -D'drand48()=((double)rand()/RAND_MAX)' -D'srand48(n)=srand((n))' ! LDFLAGS += -shared ! LIBS += -L$(PD_PATH)/bin -lpd # These don't seem to be needed: # -D'bzero(p,n)=memset(p,0,n)' \ *************** *** 84,105 **** # -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 cxc cyclone ext13 freeverb iemabs iemlib \ ! iemmatrix loaders markex maxlib mjlib motex 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 ! -cd $(externals_src)/build/$(OS_NAME) && make -k
# these targets are for platform-specific needs that run before objects: --- 60,98 ---- # -D'MAP_PRIVATE=2' \ # -D'O_NDELAY=O_NONBLOCK' ! STRIP = strip --strip-unneeded -R .note -R .comment ! else ! CFLAGS += -fPIC ! LDFLAGS += -Wl,-export_dynamic -shared ! STRIP = strip --strip-unneeded -R .note -R .comment ! endif ! endif
+ %.o: %.c + $(CC) $(CFLAGS) -o "$*.o" -c "$*.c"
+ %.$(EXTENSION): %.o + $(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o" -lc -lm $(LIBS) \ + `test -f $*.libs && cat $*.libs` \ + `test -f $(dir $*)../$(OS_NAME)/$(notdir $*).libs && \ + cat $(dir $*)../$(OS_NAME)/$(notdir $*).libs` + chmod a-x "$*.$(EXTENSION)" + $(STRIP) $*.$(EXTENSION) + rm -f -- $*.o
#------------------------------------------------------------------------------# # ALL ! ! #TARGETS = creb cxc cyclone ext13 freeverb hid iemabs iemlib \ ! #iemmatrix loaders markex maxlib mjlib motex pddp pdp pmpd smlib toxy vbap zexy ! #$(patsubst %, %_install,$(TARGETS)) ! ! BUILDSRC_OBJECTS = $(wildcard $(externals_src)/build/src/*.c) ! all: pre_all_$(OS_NAME) $(BUILDSRC_OBJECTS:.c=.$(EXTENSION)) \ ! creb cxc cyclone ext13 freeverb \ ! hid iemabs iemlib iemmatrix loaders markex maxlib mjlib motex pddp pdp \ ! pmpd smlib toxy vbap zexy ! @echo " " ! @echo "Compiled objects for $(OS_NAME) aka $(UNAME)"
# these targets are for platform-specific needs that run before objects: *************** *** 116,120 **** #------------------------------------------------------------------------------# # INSTALL ! install: all $(objectsdir) help_install objects_install unfiltered_install \ creb_install cxc_install cyclone_install ext13_install freeverb_install\ iemabs_install iemabs_install iemlib_install iemmatrix_install loaders_install \ --- 109,113 ---- #------------------------------------------------------------------------------# # INSTALL ! install: $(objectsdir) all help_install objects_install unfiltered_install \ creb_install cxc_install cyclone_install ext13_install freeverb_install\ iemabs_install iemabs_install iemlib_install iemmatrix_install loaders_install \ *************** *** 126,131 ****
objects_install: ! cd $(externals_src)/build/$(OS_NAME)/ && \ ! install -p *.$(EXTENSION) $(objectsdir)
--- 119,123 ----
objects_install: ! install -p $(BUILDSRC_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)
*************** *** 162,166 **** install -p \ $(externals_src)/hcs/*/doc/*.pd \ - $(externals_src)/hcs/hid/examples/*.pd \ $(externals_src)/hcs/pan/*-help.pd \ $(externals_src)/iem/comport/*/*-help.pd \ --- 154,157 ---- *************** *** 205,209 **** install -p $(TEMPLATE_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(TEMPLATE_NAME) install -d $(helpdir)/$(TEMPLATE_NAME) ! install -p $(wildcard $(externals_src)/template/help/*.pd) \ $(helpdir)/$(TEMPLATE_NAME) install -d $(manualsdir)/$(TEMPLATE_NAME) --- 196,200 ---- install -p $(TEMPLATE_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(TEMPLATE_NAME) install -d $(helpdir)/$(TEMPLATE_NAME) ! install -p $(externals_src)/template/help/*.pd \ $(helpdir)/$(TEMPLATE_NAME) install -d $(manualsdir)/$(TEMPLATE_NAME) *************** *** 211,220 **** $(manualsdir)/$(TEMPLATE_NAME)/README.txt install -d $(examplesdir)/$(TEMPLATE_NAME) ! install -p $(wildcard $(externals_src)/template/examples/*.pd) \ $(examplesdir)/$(TEMPLATE_NAME)
template_clean: -rm -f -- $(externals_src)/template/*.$(EXTENSION) ! -rm -f -- $(externals_src)/template/*.bak *.*~
--- 202,213 ---- $(manualsdir)/$(TEMPLATE_NAME)/README.txt install -d $(examplesdir)/$(TEMPLATE_NAME) ! install -p $(externals_src)/template/examples/*.pd \ $(examplesdir)/$(TEMPLATE_NAME)
template_clean: -rm -f -- $(externals_src)/template/*.$(EXTENSION) ! -rm -f -- $(externals_src)/template/*.o ! -rm -f -- $(externals_src)/template/*.bak ! -rm -f -- $(externals_src)/template/*.*~
*************** *** 236,240 **** creb_clean: -rm -f -- $(externals_src)/creb/*.$(EXTENSION) ! -rm -f -- $(externals_src)/creb/*.bak *.*~
--- 229,235 ---- creb_clean: -rm -f -- $(externals_src)/creb/*.$(EXTENSION) ! -rm -f -- $(externals_src)/creb/*.o ! -rm -f -- $(externals_src)/creb/*.bak ! -rm -f -- $(externals_src)/creb/*.*~
*************** *** 262,266 **** cxc_clean: -rm -f -- $(CXC_OBJECTS:.c=.$(EXTENSION)) ! -rm -f -- $(externals_src)/cxc/*.bak *.*~
--- 257,263 ---- cxc_clean: -rm -f -- $(CXC_OBJECTS:.c=.$(EXTENSION)) ! -rm -f -- $(externals_src)/cxc/*.o ! -rm -f -- $(externals_src)/cxc/*.bak ! -rm -f -- $(externals_src)/cxc/*.*~
*************** *** 328,332 **** ext13_clean: -rm -f -- $(externals_src)/ext13/*.$(EXTENSION) ! -rm -f -- $(externals_src)/ext13/*.bak *.*~
--- 325,331 ---- ext13_clean: -rm -f -- $(externals_src)/ext13/*.$(EXTENSION) ! -rm -f -- $(externals_src)/ext13/*.o ! -rm -f -- $(externals_src)/ext13/*.bak ! -rm -f -- $(externals_src)/ext13/*.*~
*************** *** 355,359 **** freeverb_clean: -rm -f -- $(externals_src)/freeverb/*.$(EXTENSION) ! -rm -f -- $(externals_src)/freeverb/*.bak *.*~
--- 354,399 ---- freeverb_clean: -rm -f -- $(externals_src)/freeverb/*.$(EXTENSION) ! -rm -f -- $(externals_src)/freeverb/*.o ! -rm -f -- $(externals_src)/freeverb/*.bak ! -rm -f -- $(externals_src)/freeverb/*.*~ ! ! ! ! ! #------------------------------------------------------------------------------# ! # HID ! HID_NAME = hid ! HID_INCLUDES = -I./ -I../../../pd/src -I./HID\ Utilities\ Source ! HID_CFLAGS = ! ! # this build method doesn't work yet hans@at.or.at ! HID_OBJECTS = $(wildcard $(externals_src)/hcs/hid/*.c) ! hid: ! # $(CC) $(CFLAGS) -c $(HID_OBJECTS:.c=.$(EXTENSION)) ! # $(CC) $(LDFLAGS) -o hid.$(EXTENSION) $(externals_src)/hcs/hid/*.o ! -cd $(externals_src)/hcs/hid && make ! ! hid_install: hid ! install -d $(objectsdir)/$(HID_NAME) ! $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(HID_NAME) \ ! --author "Hans-Christoph Steiner" \ ! --description "" \ ! --license "GNU GPL" \ ! --version "" ! -install -p $(externals_src)/hcs/hid/hid.$(EXTENSION) \ ! $(objectsdir)/$(HID_NAME) ! install -p $(externals_src)/hcs/hid/*.pd $(objectsdir)/$(HID_NAME) ! install -d $(helpdir)/$(HID_NAME) ! install -p $(externals_src)/hcs/hid/doc/*.pd $(helpdir)/$(HID_NAME) ! install -p $(externals_src)/hcs/hid/examples/*.pd) $(helpdir)/$(HID_NAME) ! install -d $(examplesdir)/$(HID_NAME) ! install -p $(externals_src)/hcs/hid/examples/*.pd $(examplesdir)/$(HID_NAME) ! ! hid_clean: ! -rm -f -- $(externals_src)/hcs/hid/*.o ! -rm -f -- $(externals_src)/hcs/hid/*.$(EXTENSION) ! -rm -f -- $(externals_src)/hcs/hid/*.bak ! -rm -f -- $(externals_src)/hcs/hid/*.*~ !
*************** *** 437,441 **** loaders_clean: -rm -f -- $(externals_src)/loaders/*.$(EXTENSION) ! -rm -f -- $(externals_src)/loaders/*.bak *.*~
--- 477,483 ---- loaders_clean: -rm -f -- $(externals_src)/loaders/*.$(EXTENSION) ! -rm -f -- $(externals_src)/loaders/*.o ! -rm -f -- $(externals_src)/loaders/*.bak ! -rm -f -- $(externals_src)/loaders/*.*~
*************** *** 461,465 **** markex_clean: -rm -f -- $(externals_src)/markex/*.$(EXTENSION) ! -rm -f -- $(externals_src)/markex/*.bak *.*~
--- 503,509 ---- markex_clean: -rm -f -- $(externals_src)/markex/*.$(EXTENSION) ! -rm -f -- $(externals_src)/markex/*.o ! -rm -f -- $(externals_src)/markex/*.bak ! -rm -f -- $(externals_src)/markex/*.*~
*************** *** 486,490 **** maxlib_clean: -rm -f -- $(externals_src)/maxlib/src/*.$(EXTENSION) ! -rm -f -- $(externals_src)/maxlib/*/*.bak *.*~ */*.*~
--- 530,537 ---- maxlib_clean: -rm -f -- $(externals_src)/maxlib/src/*.$(EXTENSION) ! -rm -f -- $(externals_src)/maxlib/src/*.o ! -rm -f -- $(externals_src)/maxlib/*/*.bak ! -rm -f -- $(externals_src)/maxlib/*/*.*~ ! -rm -f -- $(externals_src)/maxlib/*.*~
*************** *** 512,516 **** mjlib_clean: -rm -f -- $(externals_src)/mjlib/*.$(EXTENSION) ! -rm -f -- $(externals_src)/mjlib/*.bak *.*~
--- 559,565 ---- mjlib_clean: -rm -f -- $(externals_src)/mjlib/*.$(EXTENSION) ! -rm -f -- $(externals_src)/mjlib/*.o ! -rm -f -- $(externals_src)/mjlib/*.bak ! -rm -f -- $(externals_src)/mjlib/*.*~
*************** *** 538,542 **** motex_clean: -rm -f -- $(externals_src)/motex/*.$(EXTENSION) ! -rm -f -- $(externals_src)/motex/*.bak *.*~
--- 587,614 ---- motex_clean: -rm -f -- $(externals_src)/motex/*.$(EXTENSION) ! -rm -f -- $(externals_src)/motex/*.o ! -rm -f -- $(externals_src)/motex/*.bak ! -rm -f -- $(externals_src)/motex/*.*~ ! ! ! ! #---------------------------------------------------------------------------- ! # OSCx ! oscx: ! test -e $(externals_src)/OSCx/Makefile || \ ! (cd $(externals_src)/OSCx && ./configure) ! # these don't work on Windows yet ! -cd $(externals_src)/OSCx && $(MAKE) CC=gcc ! ! oscx_install: ! install -d $(objectsdir) ! -install -p $(externals_src)/OSCx/src/*.$(EXTENSION) $(objectsdir) ! install -d $(helpdir) ! install -p $(externals_src)/OSCx/doc/*.* $(helpdir) ! ! ! oscx_clean: ! -cd $(externals_src)/OSCx && make $(DEST_PATHS) clean ! -cd $(externals_src)/OSCx && $(MAKE) CC=gcc clean
*************** *** 663,667 **** smlib_clean: -rm -f -- $(SMLIB_OBJECTS:.c=.$(EXTENSION)) ! -rm -f -- $(externals_src)/smlib/*.bak *.*~
--- 735,741 ---- smlib_clean: -rm -f -- $(SMLIB_OBJECTS:.c=.$(EXTENSION)) ! -rm -f -- $(externals_src)/smlib/*.o ! -rm -f -- $(externals_src)/smlib/*.bak ! -rm -f -- $(externals_src)/smlib/*.*~
*************** *** 697,706 **** # UNAUTHORIZED UNAUTHORIZED_NAME=unauthorized ! unauthorized:
unauthorized_install: unauthorized - # this needs to go here since it produces errors - -cd $(externals_src)/unauthorized && $(MAKE) -k install -d $(objectsdir)/$(UNAUTHORIZED_NAME) $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(UNAUTHORIZED_NAME) \ --- 771,788 ---- # UNAUTHORIZED UNAUTHORIZED_NAME=unauthorized ! # these need to be created before compiling the C ! UNAUTHORIZED_TKFILES = $(wildcard $(externals_src)/unauthorized/*/*.tk) ! %.tk2c: %.tk ! bash $(externals_src)/unauthorized/tk2c.bash < $*.tk > $*.tk2c
+ UNAUTHORIZED_OBJECTS = $(wildcard $(externals_src)/unauthorized/[a-sw-z]*/*.c) + # [vocoder~] to be built separately + UNAUTHORIZED_VOCODER = $(wildcard $(externals_src)/unauthorized/vocoder*/*.c) + unauthorized: $(UNAUTHORIZED_VOCODER:.c=.o) \ + $(UNAUTHORIZED_TKFILES:.tk=.tk2c) $(UNAUTHORIZED_OBJECTS:.c=.$(EXTENSION)) + $(CC) $(LDFLAGS) -o $(externals_src)/unauthorized/vocoder~/vocoder~.$(EXTENSION) \ + $(UNAUTHORIZED_VOCODER:.c=.o)
unauthorized_install: unauthorized install -d $(objectsdir)/$(UNAUTHORIZED_NAME) $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(UNAUTHORIZED_NAME) \ *************** *** 713,718 **** install -p $(externals_src)/unauthorized/*/*.pd \ $(helpdir)/$(UNAUTHORIZED_NAME) - install -p $(externals_src)/unauthorized/*/*.txt \ - $(helpdir)/$(UNAUTHORIZED_NAM) install -p $(externals_src)/unauthorized/*/*.pls \ $(helpdir)/$(UNAUTHORIZED_NAME) --- 795,798 ---- *************** *** 720,726 **** install -p $(externals_src)/unauthorized/blinkenlights/blm/*.* \ $(helpdir)/$(UNAUTHORIZED_NAME)/blm
unauthorized_clean: ! cd $(externals_src)/unauthorized && make clean
--- 800,815 ---- install -p $(externals_src)/unauthorized/blinkenlights/blm/*.* \ $(helpdir)/$(UNAUTHORIZED_NAME)/blm + install -d $(manualsdir)/$(UNAUTHORIZED_NAME) + install -p $(externals_src)/unauthorized/*/*.txt \ + $(manualsdir)/$(UNAUTHORIZED_NAME)
unauthorized_clean: ! -rm -f -- $(UNAUTHORIZED_OBJECTS:.c=.$(EXTENSION)) ! -rm -f -- $(UNAUTHORIZED_OBJECTS:.c=.o) ! -rm -f -- $(UNAUTHORIZED_VOCODER:.c=.$(EXTENSION)) ! -rm -f -- $(UNAUTHORIZED_VOCODER:.c=.o) ! -rm -f -- $(externals_src)/unauthorized/*/*.bak ! -rm -f -- $(externals_src)/*/*.*~ ! -rm -f -- $(externals_src)/*.*~
*************** *** 745,752 **** --- 834,848 ---- ZEXY_NAME = zexy ZEXY_OBJECTS = $(wildcard $(externals_src)/zexy/src/[a-y]*.c) + ZEXY_VERSION := $(shell grep VERSION $(externals_src)/zexy/src/zexy.h | \ + grep -v _VERSION | cut -d ' ' -f 3 | cut -d '"' -f 2) zexy: $(ZEXY_OBJECTS:.c=.$(EXTENSION))
zexy_install: zexy install -d $(objectsdir)/$(ZEXY_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(UNAUTHORIZED_NAME) \ + --author "iohannes m zmoelnig zmoelnig@iem.kug.ac.at" \ + --license "GNU GPL" \ + --description "GUI and streaming objects" \ + --version "$(ZEXY_VERSION)" install -p $(ZEXY_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(ZEXY_NAME) install -p $(shell ls -1 $(externals_src)/zexy/abs/*.pd | \ *************** *** 761,764 **** --- 857,866 ---- install -p $(externals_src)/zexy/examples/*.* $(helpdir)/$(ZEXY_NAME)
+ zexy_clean: + -rm -f -- $(ZEXY_OBJECTS:.c=.$(EXTENSION)) + -rm -f -- $(externals_src)/zexy/src/*.o + -rm -f -- $(externals_src)/zexy/src/*.bak + -rm -f -- $(externals_src)/*/*.*~ + -rm -f -- $(externals_src)/*.*~
*************** *** 775,784 **** install -p $(shell ls -1 $(externals_src)/hcs/*.pd | \ grep -v '-help.pd') $(objectsdir) - # hid - # these don't work on Windows yet - -cd $(externals_src)/hcs/hid && $(MAKE) - -install -p $(externals_src)/hcs/hid/hid.$(EXTENSION) $(objectsdir) - install -p $(shell ls -1 $(externals_src)/hcs/hid/*.pd | \ - grep -v '-help.pd'| grep -v '-list.pd') $(objectsdir) # general install -p $(externals_src)/hcs/general/*.pd $(objectsdir) --- 877,880 ---- *************** *** 786,797 **** install -p $(shell ls -1 $(externals_src)/hcs/pan/*.pd | \ grep -v '-help.pd') $(objectsdir) - #---------------------------------------------------------------------------- - # OSC - test -e $(externals_src)/OSCx/Makefile || \ - (cd $(externals_src)/OSCx && ./configure) - # these don't work on Windows yet - -cd $(externals_src)/OSCx && $(MAKE) CC=gcc - -install -p $(externals_src)/OSCx/src/*.$(EXTENSION) $(objectsdir) - install -p $(externals_src)/OSCx/doc/*.* $(helpdir)
--- 882,885 ---- *************** *** 813,820 ****
# the destination-specific clean targets are in Makefile.buildlayout ! clean: creb_clean cxc_clean cyclone_clean ext13_clean freeverb_clean pddp_clean smlib_clean toxy_clean unauthorized_clean zexy_clean install_clean ! cd $(externals_src)/build/$(OS_NAME) && make $(DEST_PATHS) clean ! cd $(externals_src)/hcs/hid && make $(DEST_PATHS) clean ! cd $(externals_src)/OSCx && make $(DEST_PATHS) clean
distclean: clean cruft_clean --- 901,907 ----
# the destination-specific clean targets are in Makefile.buildlayout ! clean: creb_clean cxc_clean cyclone_clean ext13_clean freeverb_clean hid_clean loaders_clean markex_clean mjlib_clean motex_clean oscx_clean pddp_clean smlib_clean toxy_clean unauthorized_clean zexy_clean install_clean ! -rm -f -- $(BUILDSRC_OBJECTS:.c=.o) ! -rm -f -- $(BUILDSRC_OBJECTS:.c=.$(EXTENSION))
distclean: clean cruft_clean *************** *** 824,829 ****
- - test_locations: @echo "PD_VERSION: $(PD_VERSION)" --- 911,914 ----