[SCM] caps/master: Merge resolve

[mira-guest at users.alioth.debian.org]

Imported Upstream version 0.9.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b3d42373407457979c148ba6a2d0d0a4a1db581f
X-Git-Newrev: 65f9a218386be79c3f7825b85baedb55609a6d51

The following commit has been merged in the master branch:
commit 65f9a218386be79c3f7825b85baedb55609a6d51
Merge: b3d42373407457979c148ba6a2d0d0a4a1db581f 73b6db3a7dfe1f3b26bb4b1bc1390c756e79a701
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Aug 15 18:36:46 2013 +0200

    Merge resolve

diff --combined Makefile
index 69b6d06,d2d7947..462bd84
--- a/Makefile
+++ b/Makefile
@@@ -1,17 -1,22 +1,22 @@@
  PREFIX = /usr/local
  
  CC = g++
- OPTS = -O2 -ffast-math -funroll-loops -Wall -fPIC -DPIC
+ 
+ OPTS = -O6 -ffast-math -funroll-loops -Wall -fPIC -DPIC
  #OPTS = -g -DDEBUG 
  
+ _LDFLAGS = -shared 
+ STRIP = strip
+ 
  -include defines.make
  
  CFLAGS = $(OPTS) $(_CFLAGS)
+ LDFLAGS = $(_LDFLAGS) $(CFLAGS)
  
+ VERSION = 0.9.10
  PLUG = caps
- VERSION = 0.4.2
  
- SOURCES = $(wildcard *.cc)
+ SOURCES = $(wildcard *.cc) $(wildcard dsp/*.cc)
  OBJECTS	= $(SOURCES:.cc=.o) 
  HEADERS = $(wildcard *.h) $(wildcard dsp/*.h) $(wildcard util/*.h) $(wildcard dsp/tonestack/*.h)
  
@@@ -20,41 -25,36 +25,39 @@@ PDF = releases/caps-$(VERSION).pd
  DEST = $(PREFIX)/lib/ladspa
  RDFDEST = $(PREFIX)/share/ladspa/rdf
  
- # all systems go ##############################################################
+ # targets following -------------------------------------------------------------
  
  all: depend $(PLUG).so tags
  
  run: all
- 	#sudo python -i test.py
- 	#python -i offline.py
- 	#python tools/test-denormals.py
- 	#sudo python tools/caps-test.py scape.rack
- 	sudo python tools/caps-test.py ts.rack
- 	#gdb python -x gdb-batch
- 	#python tools/make-pdf.py
- 
- pdf: all tools/make-ps.py
- 	VERSION=$(VERSION) python tools/make-ps.py | ps2pdf - $(PDF)
- 	xpdf $(PDF) 
+ 	#python bin/enhance_dp_wsop.py
+ 	#python -i bin/rack.py White AutoFilter cream.Audio.Meter Pan
+ 	#python -i bin/rack.py White AutoFilter Pan
+ 	#@~/cream/gdb-python html/graph.py Compress,spectrum.png
+ 	@~/cream/gdb-python ~/reve/bin/sailormoon.py
  
  rdf: $(PLUG).rdf
- caps.rdf: all tools/make-rdf.py
+ $(PLUG).rdf: all tools/make-rdf.py
  	python tools/make-rdf.py > $(PLUG).rdf
  
  $(PLUG).so: $(OBJECTS)
- 	$(CC) -nostartfiles $(CFLAGS) -shared -o $@ $(OBJECTS)
+ 	$(CC) $(ARCH) $(LDFLAGS) -o $@ $(OBJECTS)
  
  .cc.s: 
- 	$(CC) $(CFLAGS) -S $<
+ 	$(CC) $(ARCH) $(CFLAGS) -S $<
  
- .cc.o: depend
- 	$(CC) $(CFLAGS) -I/usr/local/include -c $<
+ .cc.o: depend 
+ 	$(CC) $(ARCH) $(CFLAGS) -o $@ -c $<
  
  tags: $(SOURCES) $(HEADERS)
  	@echo making tags
- 	@-if [ -x /usr/bin/ctags ]; then ctags $(SOURCES) $(HEADERS) ; fi
+ 	@-if [ -x /usr/bin/ctags ]; then ctags $(SOURCES) $(HEADERS) >/dev/null 2>&1 ; fi
  
  install: all
++<<<<<<< HEAD
++=======
+ 	@$(STRIP) $(PLUG).so > /dev/null
++>>>>>>> upstream/0.9.10
  	install -d $(DEST)
  	install -m 644 $(PLUG).so $(DEST)
  	install -d $(RDFDEST)
@@@ -63,6 -63,8 +66,8 @@@
  fake-install: all
  	-rm $(DEST)/$(PLUG).so
  	ln -s `pwd`/$(PLUG).so $(DEST)/$(PLUG).so
+ 	-rm $(RDFDEST)/$(PLUG).rdf
+ 	ln -s `pwd`/$(PLUG).rdf $(RDFDEST)/$(PLUG).rdf
  
  rdf-install:
  	install -d $(RDFDEST)
@@@ -73,14 -75,14 +78,14 @@@ uninstall
  	-rm $(DEST)/$(PLUG)-ng.so
  
  clean:
- 	rm -f *.o *.so *.s depend
+ 	rm -f $(OBJECTS) $(PLUG).so *.s depend
+ 
+ version.h:
+ 	@VERSION=$(VERSION) python tools/make-version.h.py
  
- dist: all pdf
- 	cp $(PDF) /www/quitte/dsp/
- 	touch /www/quitte/dsp/caps_$(VERSION).tar.gz
+ dist: all $(PLUG).rdf version.h
+ 	-rm doc/*.html 
  	tools/make-dist.py caps $(VERSION) $(CFLAGS)
- 	@rm /www/quitte/dsp/caps*.tar.gz
- 	@cp releases/caps_$(VERSION).tar.gz /www/quitte/dsp
  
  depend: $(SOURCES) $(HEADERS)
  	$(CC) -MM $(CFLAGS) $(DEFINES) $(SOURCES) > depend

-- 
caps packaging