[Debian-astro-commits] [gyoto] 107/221: yorick: don't use a wrpper called "yorick", this confuses the build system (use yorick1 instead)

[Thibaut Jean-Claude Paumard]

This is an automated email from the git hooks/post-receive script.

thibaut pushed a commit to branch master
in repository gyoto.

commit 8b7cb7e5c7b290e999abf67cbb3299ad7dd976ec
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Wed Nov 26 09:21:40 2014 +0100

    yorick: don't use a wrpper called "yorick", this confuses the build system (use yorick1 instead)
---
 yorick/Makefile.in | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/yorick/Makefile.in b/yorick/Makefile.in
index 688ce0c..ed8d419 100644
--- a/yorick/Makefile.in
+++ b/yorick/Makefile.in
@@ -114,7 +114,6 @@ LD_EXE=$(CXX) $(LDFLAGS) $(PLUG_EXPORT)
 DEST_PKG_INSTALLED_DIR=$(DEST_Y_SITE)/packages/installed
 
 all: gyoto.so gyoto_std.so
-	cp yorick1 yorick
 
 gyoto_std.so: stdplug/gyoto_std.so
 	cp stdplug/gyoto_std.so ./
@@ -124,20 +123,18 @@ stdplug/gyoto_std.so: @srcdir@/stdplug/*.C
 
 gyoto.so: gyoto.i $(OBJS)
 
-yorick: yorick1
-	cp yorick1 yorick
 custom.i: @srcdir@/custom1.i
 	cp $< $@
 
-check-dll: $(PKG_DLL) check.i yorick custom.i
+check-dll: $(PKG_DLL) check.i custom.i
 	unset GYOTO_PLUGINS && \
 	GYOTO_CHECK_NODISPLAY=true \
-	./yorick -i check.i
+	./yorick1 -i check.i
 
-check-mpi: $(PKG_DLL) check-mpi.i yorick custom.i
+check-mpi: $(PKG_DLL) check-mpi.i custom.i
 	unset GYOTO_PLUGINS && \
 	GYOTO_CHECK_NODISPLAY=true \
-	./yorick -i check-mpi.i
+	./yorick1 -i check-mpi.i
 
 install::
 	cd stdplug; make install
@@ -162,11 +159,10 @@ uninstall::
 clean:: 
 	cd stdplug; $(Y_EXE) -batch make.i; make clean
 	rm -f gyoto_std.so example-patterndisk.fits.gz example-patterndisk.xml
-	cp yorick1 yorick
 
 distclean:: $(Y_EXE)
 	cd stdplug; $(Y_EXE) -batch make.i; make distclean
-	-rm yorick custom.i
+	-rm custom.i
 
 %: ;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git