Author: bugman Date: Tue Dec 2 12:21:37 2014 New Revision: 26891 URL: http://svn.gna.org/viewcvs/relax?rev=26891&view=rev Log: Updated manual_c_module.py development script for the C module changes. The numpy and numarray include paths have been added. Modified: branches/relax_fit_c_class/devel_scripts/manual_c_module.py Modified: branches/relax_fit_c_class/devel_scripts/manual_c_module.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_fit_c_class/devel_scripts/manual_c_module.py?rev=26891&r1=26890&r2=26891&view=diff ============================================================================== --- branches/relax_fit_c_class/devel_scripts/manual_c_module.py (original) +++ branches/relax_fit_c_class/devel_scripts/manual_c_module.py Tue Dec 2 12:21:37 2014 @@ -13,8 +13,10 @@ # The list of build commands to run. cmd = [] -# Python.h. +# Python.h, numpy/arrayobject.h, and numpy/libnumarray.h. include = '%s/include/python%s/' % (path, target) +include_numpy = "%s/lib/python%s/site-packages/numpy/core/include" % (path, target) +include_numarray = "%s/lib/python%s/site-packages/numpy/numarray/include" % (path, target) if target == '3.2': include = '%s/include/python3.2m/' % path elif target == '3.3': @@ -23,11 +25,11 @@ include = '%s/include/python3.4m/' % path # Python 3.2 installed in the home directory. -cmd.append("gcc -o target_functions/c_chi2.os -c -I%s -fPIC target_functions/c_chi2.c" % include) -cmd.append("gcc -o target_functions/exponential.os -c -I%s -fPIC target_functions/exponential.c" % include) -cmd.append("gcc -o target_functions/exponential_inv.os -c -I%s -fPIC target_functions/exponential_inv.c" % include) -cmd.append("gcc -o target_functions/exponential_sat.os -c -I%s -fPIC target_functions/exponential_sat.c" % include) -cmd.append("gcc -o target_functions/relax_fit.os -c -I%s -fPIC target_functions/relax_fit.c" % include) +cmd.append("gcc -o target_functions/c_chi2.os -c -I%s -I%s -I%s -fPIC target_functions/c_chi2.c" % (include, include_numpy, include_numarray)) +cmd.append("gcc -o target_functions/exponential.os -c -I%s -I%s -I%s -fPIC target_functions/exponential.c" % (include, include_numpy, include_numarray)) +cmd.append("gcc -o target_functions/exponential_inv.os -c -I%s -I%s -I%s -fPIC target_functions/exponential_inv.c" % (include, include_numpy, include_numarray)) +cmd.append("gcc -o target_functions/exponential_sat.os -c -I%s -I%s -I%s -fPIC target_functions/exponential_sat.c" % (include, include_numpy, include_numarray)) +cmd.append("gcc -o target_functions/relax_fit.os -c -I%s -I%s -I%s -fPIC target_functions/relax_fit.c" % (include, include_numpy, include_numarray)) cmd.append("gcc -o target_functions/relax_fit.so -shared target_functions/c_chi2.os target_functions/exponential.os target_functions/exponential_inv.os target_functions/exponential_sat.os target_functions/relax_fit.os")