Browse Source

Makefile changes

Konstantin Ladutenko 10 years ago
parent
commit
9f9c1d38f9
3 changed files with 6 additions and 6 deletions
  1. 4 4
      Makefile
  2. 1 1
      setup.py
  3. 1 1
      setup_cython.py

+ 4 - 4
Makefile

@@ -22,10 +22,10 @@ source:
 cython: scattnlay.pyx
 	cython --cplus scattnlay.pyx
 
-python_ext: nmie.cc bessel.cc py_nmie.cc scattnlay.cpp
+python_ext: nmie.cc  py_nmie.cc scattnlay.cpp
 	export CFLAGS='-std=c++11' && python setup.py build_ext --inplace
 
-cython_ext: nmie.cc bessel.cc py_nmie.cc scattnlay.pyx
+cython_ext: nmie.cc  py_nmie.cc scattnlay.pyx
 	export CFLAGS='-std=c++11' && python setup_cython.py build_ext --inplace
 
 install:
@@ -43,8 +43,8 @@ builddeb:
 	# build the package
 	export CFLAGS='-std=c++11' && dpkg-buildpackage -i -I -rfakeroot
 
-standalone: standalone.cc nmie.cc bessel.cc
-	export CFLAGS='-std=c++11' && c++ -DNDEBUG -O2 -Wall -std=c++11 standalone.cc nmie.cc bessel.cc -lm -o scattnlay
+standalone: standalone.cc nmie.cc
+	export CFLAGS='-std=c++11' && c++ -DNDEBUG -O2 -Wall -std=c++11 standalone.cc nmie.cc  -lm -o scattnlay
 	mv scattnlay ../
 
 clean:

+ 1 - 1
setup.py

@@ -53,7 +53,7 @@ O. Pena, U. Pal, Comput. Phys. Commun. 180 (2009) 2348-2354.""",
       license = 'GPL',
       platforms = 'any',
       ext_modules = [Extension("scattnlay",
-                               ["nmie.cc", "bessel.cc", "py_nmie.cc", "scattnlay.cpp"],
+                               ["nmie.cc", "py_nmie.cc", "scattnlay.cpp"],
                                language = "c++",
                                include_dirs = [np.get_include()])], 
       extra_compile_args=['-std=c++11']

+ 1 - 1
setup_cython.py

@@ -54,7 +54,7 @@ O. Pena, U. Pal, Comput. Phys. Commun. 180 (2009) 2348-2354.""",
       license = 'GPL',
       platforms = 'any',
       ext_modules = cythonize("scattnlay.pyx",                                        # our Cython source
-                              sources = ["nmie.cc", "bessel.cc", "py_nmie.cc", "scattnlay.cpp"],   # additional source file(s)
+                              sources = ["nmie.cc", "py_nmie.cc", "scattnlay.cpp"],   # additional source file(s)
                               language = "c++",                                       # generate C++ code
                               extra_compile_args = ['-std=c++11'],
       )