diff options
| author | Tavian Barnes <tavianator@gmail.com> | 2011-10-31 17:59:56 -0400 |
|---|---|---|
| committer | Tavian Barnes <tavianator@gmail.com> | 2011-10-31 23:22:26 -0400 |
| commit | cff94b97ca2e3a4b7396845a7a2fd1c9ab812d55 (patch) | |
| tree | 814b963d690ef08057b461e9103d3fa31a4c2e72 /libdimension-python | |
| parent | 2e77183461e11521a37f34e0c01581df762413fc (diff) | |
| download | dimension-cff94b97ca2e3a4b7396845a7a2fd1c9ab812d55.tar.xz | |
Ship dimension client inside the Python package.
Diffstat (limited to 'libdimension-python')
| -rw-r--r-- | libdimension-python/Makefile.am | 22 | ||||
| -rw-r--r-- | libdimension-python/tests/Makefile.am | 5 | ||||
| -rw-r--r-- | libdimension-python/wrapper.pxd (renamed from libdimension-python/dimension.pxd) | 0 | ||||
| -rw-r--r-- | libdimension-python/wrapper.pyx (renamed from libdimension-python/dimension.pyx) | 0 |
4 files changed, 12 insertions, 15 deletions
diff --git a/libdimension-python/Makefile.am b/libdimension-python/Makefile.am index 5a8b528..33e93a5 100644 --- a/libdimension-python/Makefile.am +++ b/libdimension-python/Makefile.am @@ -25,22 +25,22 @@ INCLUDES = -I$(top_srcdir)/libdimension AM_CFLAGS = $(Python_CFLAGS) AM_LDFLAGS = $(Python_LDFLAGS) -dimension.c: dimension.pyx dimension.pxd - cython --line-directives dimension.pyx +wrapper.c: wrapper.pyx wrapper.pxd + cython --line-directives wrapper.pyx -pyexec_LTLIBRARIES = dimension.la -dimension_la_SOURCES = dimension.c \ - platform.c \ - platform.h -dimension_la_LDFLAGS = -avoid-version -module -dimension_la_LIBADD = $(top_builddir)/libdimension/libdimension.la +pkgpyexec_LTLIBRARIES = wrapper.la +wrapper_la_SOURCES = wrapper.c \ + platform.c \ + platform.h +wrapper_la_LDFLAGS = -avoid-version -module +wrapper_la_LIBADD = $(top_builddir)/libdimension/libdimension.la -EXTRA_DIST = dimension.pyx \ - dimension.pxd +EXTRA_DIST = wrapper.pyx \ + wrapper.pxd doc: mkdir -p doc - PYTHONPATH=$(top_builddir)/libdimension-python/.libs pydoc -w dimension + PYTHONPATH=$(top_builddir) pydoc -w dimension mv dimension.html doc/ clean-doc: rm -rf doc diff --git a/libdimension-python/tests/Makefile.am b/libdimension-python/tests/Makefile.am index ce12ed7..420d03b 100644 --- a/libdimension-python/tests/Makefile.am +++ b/libdimension-python/tests/Makefile.am @@ -22,12 +22,9 @@ TESTS = geometry.py \ canvas.py \ demo.py TEST_EXTENSIONS = .py -TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir)/libdimension-python/.libs \ +TESTS_ENVIRONMENT = PYTHONPATH=$(abs_top_builddir) \ top_srcdir=$(top_srcdir) -.py: - cp $(srcdir)/$@ . - EXTRA_DIST = $(TESTS) clean-local: diff --git a/libdimension-python/dimension.pxd b/libdimension-python/wrapper.pxd index 7ba17e9..7ba17e9 100644 --- a/libdimension-python/dimension.pxd +++ b/libdimension-python/wrapper.pxd diff --git a/libdimension-python/dimension.pyx b/libdimension-python/wrapper.pyx index 738a63f..738a63f 100644 --- a/libdimension-python/dimension.pyx +++ b/libdimension-python/wrapper.pyx |