[gentoo-commits] gentoo-x86 commit in sci-chemistry/ccpn/files: 2.1.3-parallel.patch 2.1.3-dynamics.patch

[gentoo-commits] gentoo-x86 commit in sci-chemistry/ccpn/files: 2.1.3-parallel.patch 2.1.3-dynamics.patch

[Justin Lecher (jlec)]

jlec        10/02/17 20:59:20

  Added:                2.1.3-parallel.patch 2.1.3-dynamics.patch
  Log:
  Version bump, keyworded for amd64-linux and x86-linux
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-chemistry/ccpn/files/2.1.3-parallel.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/files/2.1.3-parallel.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/files/2.1.3-parallel.patch?rev=1.1&content-type=text/plain

Index: 2.1.3-parallel.patch
===================================================================
diff --git a/ccpnmr2.1/c/Makefile b/ccpnmr2.1/c/Makefile
index 9fa8500..a99a677 100644
--- a/ccpnmr2.1/c/Makefile
+++ b/ccpnmr2.1/c/Makefile
@@ -2,23 +2,20 @@ include environment.txt
 
 all: compile
 
-compile: global structure analysis clouds dynamics
+compile: global structure analysis clouds
 
 global:
 	cd memops/global && $(MAKE)
 
-structure:
+structure: global
 	cd ccp/structure && $(MAKE)
 
-analysis:
+analysis: global
 	cd ccpnmr/analysis && $(MAKE)
 
-clouds:
+clouds: global
 	cd ccpnmr/clouds && $(MAKE)
 
-dynamics:
-	cd ccpnmr/dynamics && $(MAKE)
-
 clean: global_clean structure_clean analysis_clean clouds_clean dynamics_clean
 
 global_clean:
@@ -33,9 +30,6 @@ analysis_clean:
 clouds_clean:
 	cd ccpnmr/clouds && $(MAKE) clean
 
-dynamics_clean:
-	cd ccpnmr/dynamics && $(MAKE) clean
-
 realclean: global_realclean structure_realclean analysis_realclean clouds_realclean dynamics_realclean
 
 global_realclean:
@@ -50,9 +44,6 @@ analysis_realclean:
 clouds_realclean:
 	cd ccpnmr/clouds && $(MAKE) realclean
 
-dynamics_realclean:
-	cd ccpnmr/dynamics && $(MAKE) realclean
-
 links: memops_links ccp_links ccpnmr_links
 
 memops_links:



1.1                  sci-chemistry/ccpn/files/2.1.3-dynamics.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/files/2.1.3-dynamics.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/files/2.1.3-dynamics.patch?rev=1.1&content-type=text/plain

Index: 2.1.3-dynamics.patch
===================================================================
diff --git a/ccpnmr2.1/python/ccpnmr/c/linkSharedObjs b/ccpnmr2.1/python/ccpnmr/c/linkSharedObjs
index 8f56168..093bbe8 100755
--- a/ccpnmr2.1/python/ccpnmr/c/linkSharedObjs
+++ b/ccpnmr2.1/python/ccpnmr/c/linkSharedObjs
@@ -5,7 +5,6 @@ ln -s ../../../c/ccpnmr/analysis/ContourFile.so ContourFile.so
 ln -s ../../../c/ccpnmr/analysis/ContourLevels.so ContourLevels.so
 ln -s ../../../c/ccpnmr/analysis/ContourStyle.so ContourStyle.so
 ln -s ../../../c/ccpnmr/analysis/PeakCluster.so PeakCluster.so
-ln -s ../../../c/ccpnmr/analysis/PeakClusterList.so PeakClusterList.so
 ln -s ../../../c/ccpnmr/analysis/PeakList.so PeakList.so
 ln -s ../../../c/ccpnmr/analysis/SliceFile.so SliceFile.so
 ln -s ../../../c/ccpnmr/analysis/WinPeakList.so WinPeakList.so
@@ -18,9 +17,3 @@ ln -s ../../../c/ccpnmr/clouds/DistForce.so .
 ln -s ../../../c/ccpnmr/clouds/Dynamics.so .
 ln -s ../../../c/ccpnmr/clouds/Midge.so .
 ln -s ../../../c/ccpnmr/clouds/Bacus.so .
-ln -s ../../../c/ccpnmr/dynamics/DyAtomCoord.so .
-ln -s ../../../c/ccpnmr/dynamics/DyAtomCoordList.so .
-ln -s ../../../c/ccpnmr/dynamics/DyDistConstraint.so .
-ln -s ../../../c/ccpnmr/dynamics/DyDistConstraintList.so .
-ln -s ../../../c/ccpnmr/dynamics/DyDistForce.so .
-ln -s ../../../c/ccpnmr/dynamics/DyDynamics.so .