[yoda-svn] yoda: Attempt to get pyext distcheck working with yoda1

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/7cf714b897d8
branches:  release-1-6
changeset: 1403:7cf714b897d8
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Sep 19 21:29:42 2017 +0100
description:
Attempt to get pyext distcheck working with yoda1

diffs (truncated from 60 to 50 lines):

--- a/pyext/Makefile.am	Mon Sep 18 21:54:25 2017 +0100
+++ b/pyext/Makefile.am	Tue Sep 19 21:29:42 2017 +0100
@@ -1,4 +1,5 @@
 SUBDIRS = yoda
+EXTRA_DIST = yoda1
 
 if ENABLE_PYEXT
 PYEXT_ENV = CC="$(CXX)" CXX="$(CXX)" CXXFLAGS="$(PYEXT_CXXFLAGS)" ARCHFLAGS=""
@@ -9,6 +10,7 @@
 
 ## Always force setup.py, it's not good at guessing what needs to rebuild
 all-local:
+#	test -d yoda1 || cp -r $(srcdir)/yoda1 .
 	$(PYEXT_ENV) $(PYTHON) setup.py install --install-lib=build/ --force
 
 install-exec-local:
@@ -16,6 +18,7 @@
 
 uninstall-local:
 	rm -rf $(DESTDIR)$(YODA_PYTHONPATH)/yoda
+	rm -rf $(DESTDIR)$(YODA_PYTHONPATH)/yoda1
 	rm -f $(DESTDIR)$(YODA_PYTHONPATH)/yoda-$(VERSION)-py$(PYTHON_VERSION).egg-info
 
 clean-local:
@@ -24,6 +27,8 @@
 	rm -rf dist
 
 distclean-local:
-	rm -f yoda.egg-info
+	rm -f $(builddir)/yoda.egg-info
+#	rm -rf $(builddir)/yoda
+#	rm -rf $(builddir)/yoda1
 
 endif
--- a/pyext/setup.py.in	Mon Sep 18 21:54:25 2017 +0100
+++ b/pyext/setup.py.in	Tue Sep 19 21:29:42 2017 +0100
@@ -14,11 +14,11 @@
 BASE_COMPILE_ARGS = "@PYEXT_CXXFLAGS@ -I at prefix@/include -I../include".split()
 BASE_LINK_ARGS = ["-L at prefix@/lib"]
 
-# Dependencies used to trigger rebuild
+## Dependencies used to trigger rebuild
 header_files = glob("../include/YODA/*.h") + glob("../include/YODA/Utils/*.h")
 core_depends = glob("yoda/include/*.pyx") + glob("yoda/*.py") + header_files
 
-## A helper function (since we have two modules now...)
+## Helper function
 def ext(name, depends=[], statics=[], extra_compile_args=[], extra_link_args=[]):
     return Extension(
         "yoda.%s" % name,