Updated the PyDAS build scripts to reflect the recent code reorganiza…

…tion.

PyDAS once again builds successfully!

Makefile

@@ -36,7 +36,7 @@ clean-DASKR:
 
 clean-cython:
 	python setup.py clean $(CLEAN_FLAGS)
-	rm -f PyDAS/*.so PyDAS/*.pyc
+	rm -f *.so *.pyc
 
 help:
 	@echo ""

pydas.pyx

@@ -54,7 +54,7 @@ cimport cython
 ################################################################################
 
 # Expose the (double-precision) DASSL function
-cdef extern from "ddassl.h":
+cdef extern from "das.h":
     int ddassl_(
         void* res,      # The residual function that defines the ODE/DAE system
         int* neq,       # The number of equations to be solved

setup.py

@@ -42,9 +42,9 @@
     # The Cython extension modules to compile
     ext_modules = [
         Extension(
-            'PyDAS.dassl', 
-            ['PyDAS/dassl.pyx'], 
-            include_dirs=['PyDAS', numpy.get_include()], 
+            'pydas', 
+            ['pydas.pyx'], 
+            include_dirs=['.', numpy.get_include()], 
             libraries=['gfortran'], 
             extra_objects=['dassl/daux.o','dassl/ddassl.o','dassl/dlinpk.o'],
         ),
@@ -57,7 +57,7 @@
         author='Joshua W. Allen',
         author_email='[email protected]',
         url='http://github.com/jwallen/PyDAS',
-        packages=['PyDAS'],
+        py_modules=['pydas'],
         cmdclass = {'build_ext': build_ext},
         ext_modules = ext_modules
     )