[yoda-svn] r393 - in trunk: . pyext

[blackhole at projects.hepforge.org]

Author: davemallows
Date: Mon Sep  5 13:15:08 2011
New Revision: 393

Log:
Update build scripts to reflect structural changes

Deleted:
   trunk/pyext/cyoda.pxd
   trunk/pyext/yoda.pyx
Modified:
   trunk/configure.ac
   trunk/pyext/Makefile.am
   trunk/pyext/setup.py.in

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Mon Sep  5 13:09:11 2011	(r392)
+++ trunk/configure.ac	Mon Sep  5 13:15:08 2011	(r393)
@@ -140,7 +140,7 @@
 AC_CONFIG_FILES([include/Makefile include/YODA/Makefile])
 AC_CONFIG_FILES([src/Makefile src/tinyxml/Makefile])
 AC_CONFIG_FILES([tests/Makefile])
-AC_CONFIG_FILES([pyext/Makefile pyext/setup.py])
+AC_CONFIG_FILES([pyext/Makefile pyext/yoda/Makefile pyext/setup.py])
 #AC_CONFIG_FILES([bin/Makefile bin/yoda-config])
 
 AC_OUTPUT

Modified: trunk/pyext/Makefile.am
==============================================================================
--- trunk/pyext/Makefile.am	Mon Sep  5 13:09:11 2011	(r392)
+++ trunk/pyext/Makefile.am	Mon Sep  5 13:15:08 2011	(r393)
@@ -1,13 +1,11 @@
 if ENABLE_PYEXT
 
-SUBDIRS = .
+SUBDIRS = yoda .
 CYTHONFLAGS = @CYTHONFLAGS@
 
-all-local: yoda.cc
+all-local: yoda
 	$(PYTHON) setup.py build
 	$(PYTHON) setup.py install --install-lib=build/
-yoda.cc:
-	$(PYTHON) -m cython --cplus yoda.pyx
 
 install-exec-local:
 	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)

Modified: trunk/pyext/setup.py.in
==============================================================================
--- trunk/pyext/setup.py.in	Mon Sep  5 13:09:11 2011	(r392)
+++ trunk/pyext/setup.py.in	Mon Sep  5 13:15:08 2011	(r393)
@@ -15,7 +15,7 @@
 
 ext = Extension(
     "yoda",
-    ["yoda.cpp"],
+    ["@srcdir@/yoda/yoda.cpp"],
     language='c++',
     include_dirs=[incdir],
     library_dirs=[srcdir, os.path.join(srcdir,'.libs')],