--- db/prgsrc/Makefile	2008/03/17 01:57:13	1.92
+++ db/prgsrc/Makefile	2008/11/09 19:22:55	1.93
@@ -16,8 +16,11 @@ DESTSRCDIR=~chgk-db/public_html/dimrub/s
 SRCDIR=../baza
 DICTDIR=../dict
 IMAGEDIR=$(SRCDIR)/images
+SOUNDDIR=$(SRCDIR)/sounds
 DESTIMAGEDIR=~chgk-db/public_html/images/db
 INSTALLIMAGEDIR=$(ROOT)/public_html/images/db
+DESTSOUNDDIR=~chgk-db/public_html/sounds/db
+INSTALLSOUNDDIR=$(ROOT)/public_html/sounds/db
 DESTPRGSRC=~chgk-db/db/prgsrc
 DESTCGIBIN=~chgk-db/public_html/cgi-bin
 DUMPDIR=../dump
@@ -97,8 +100,10 @@ CGIBIN = $(ROOT)/public_html/cgi-bin
 HTMLDIR = $(ROOT)/public_html/dimrub/db
 
 TEXTS = $(wildcard $(SRCDIR)/*.txt) $(SRCDIR)/index
-IMAGES = $(wildcard $(IMAGEDIR)/*.jpg)
+IMAGES = $(wildcard $(IMAGEDIR)/*)
+SOUNDS = $(wildcard $(SOUNDDIR)/*)
 IMAGENAMES= $(notdir $(IMAGES))
+SOUNDNAMES= $(notdir $(SOUNDS))
 
 
 
@@ -107,9 +112,11 @@ CGIINSTALL =    ${CGISCRIPTS:%.cgi=$(CGI
 LIBINSTALL =    ${LIBS:%=$(LIBDIR)/%}
 HTMLINSTALL =   ${HTMLS:%.html=$(HTMLDIR)/%.html}
 IMAGEINSTALL =  ${IMAGENAMES:%=$(INSTALLIMAGEDIR)/%}
+SOUNDINSTALL =  ${SOUNDNAMES:%=$(INSTALLSOUNDDIR)/%}
 
 
-all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL) $(IMAGEINSTALL)
+all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL) \
+	$(IMAGEINSTALL) $(SOUNDINSTALL)
 
 
 
@@ -177,6 +184,12 @@ $(HTMLDIR)/%.html:       %.html
 $(INSTALLIMAGEDIR)/%: $(IMAGEDIR)/%
 	cp $< $@	
 
+
+$(INSTALLSOUNDDIR)/%: $(SOUNDDIR)/%
+	cp $< $@	
+
+
+
 srcdeliver:
 	$(RSYNC) $(SRCDIR) $(KULICHKI):$(DESTSRCDIR)
 
@@ -185,10 +198,14 @@ imagedeliver:
 	cvs update $(SRCDIR)
 	$(RSYNC) $(IMAGEDIR)/ $(KULICHKI):$(DESTIMAGEDIR)/
 
+sounddeliver:
+	cvs update $(SRCDIR)
+	$(RSYNC) $(SOUNDDIR)/ $(KULICHKI):$(DESTSOUNDDIR)/
+
 prgdeliver:
 	$(RSYNC) ./ $(KULICHKI):$(DESTPRGSRC)
 
-dbdeliver: imagedeliver
+dbdeliver: imagedeliver sounddeliver
 	echo "Starting delivering" | mail -s"Starting delivering" $(DELIVERER)
 	mysqldump   --default-character-set=koi8r --add-drop-table -u piataev chgk $(TABLES)  > $(DUMPDIR)/chgkdump
 	echo "delete from hash;" >> $(DUMPDIR)/chgkdump