summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Peters <fpeters@entrouvert.com>2008-04-29 12:06:00 +0000
committerFrederic Peters <fpeters@entrouvert.com>2008-04-29 12:06:00 +0000
commit21f30edd6477e9d9ec0b4f5bba5010204d6c99e6 (patch)
tree0b1422f6a5c597b18f04fa636f0220b3a975da6f
parent5511b8b29d461e53008fd4f1b1ae548ff8d425cb (diff)
downloadlasso-21f30edd6477e9d9ec0b4f5bba5010204d6c99e6.tar.gz
lasso-21f30edd6477e9d9ec0b4f5bba5010204d6c99e6.tar.xz
lasso-21f30edd6477e9d9ec0b4f5bba5010204d6c99e6.zip
[project @ fpeters@0d.be-20071120151830-wdnobbexiv300ibb]
fixed some make distcheck issues (still remaining is access to test data when srcdir != builddir) Original author: Frederic Peters <fpeters@0d.be> Date: 2007-11-20 16:18:30.814000+01:00
-rw-r--r--bindings/Makefile.am12
-rw-r--r--bindings/php5/Makefile.am12
-rw-r--r--bindings/python/Makefile.am6
-rw-r--r--bindings/python/tests/Makefile.am2
4 files changed, 27 insertions, 5 deletions
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 19219aff..698d43fe 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -1,2 +1,14 @@
SUBDIRS = python php5
+EXTRA_DIST = bindings.py \
+ lang_python.py \
+ lang_python_wrapper_bottom.c \
+ lang_python_wrapper_top.c \
+ lang_php5.py \
+ overrides.xml \
+ utils.py \
+ lang_php5_helpers/wrapper_source_top.c \
+ lang_php5_helpers/__init__.py \
+ lang_php5_helpers/php_code.py \
+ lang_php5_helpers/wrapper_header.py \
+ lang_php5_helpers/wrapper_source.py
diff --git a/bindings/php5/Makefile.am b/bindings/php5/Makefile.am
index 0313a5d5..f82b0825 100644
--- a/bindings/php5/Makefile.am
+++ b/bindings/php5/Makefile.am
@@ -6,10 +6,14 @@ INCLUDES = -I$(top_srcdir) \
php_extension_LTLIBRARIES = lasso.la
php_extensiondir = ${prefix}@PHP5_UNPREFIXED_EXTENSION_DIR@
-lasso_la_CFLAGS = $(LASSO_CORE_CFLAGS) -I$(top_srcdir) -I$(top_builddir) $(PHP4_INCLUDES)
+nodist_php_extension_DATA = lasso.php
+
+lasso_la_CFLAGS = $(LASSO_CORE_CFLAGS) -I$(top_srcdir) -I$(top_builddir) $(PHP5_INCLUDES)
lasso_la_LDFLAGS = -export-dynamic -prefer-pic -module -avoid-version
-lasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) $(PHP4_LDFLAGS)
-lasso_la_SOURCES = _lasso.c
+lasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) $(PHP5_LDFLAGS)
+nodist_lasso_la_SOURCES = _lasso.c
+
+BUILT_SOURCES = _lasso.c
_lasso.c:
$(PYTHON) $(top_srcdir)/bindings/bindings.py -l php5 --src-dir=$(top_srcdir)/lasso/
@@ -17,4 +21,6 @@ _lasso.c:
doc:
phpdoc -o HTML:frames:earthli -f lasso.php -t docs
+.PHONY: doc
+
endif
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index b2a1e99d..3b643b4a 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -6,10 +6,10 @@ INCLUDES = -I$(top_srcdir) \
$(SASL_CFLAGS)
pythondir= $(PY_SITE_PACKAGES)
-python_DATA = lasso.py
+nodist_python_DATA = lasso.py
python_LTLIBRARIES = _lasso.la
-_lasso_la_SOURCES = _lasso.c
+nodist__lasso_la_SOURCES = _lasso.c
_lasso_la_CFLAGS = $(LASSO_CORE_CFLAGS) -DSWIG_COBJECT_TYPES $(PY_CFLAGS)
_lasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
if DARWIN
@@ -22,6 +22,8 @@ _lasso_la_LDFLAGS = -no-undefined -module -avoid-version
endif
endif
+BUILT_SOURCES = _lasso.c
+
_lasso.c:
$(PYTHON) $(top_srcdir)/bindings/bindings.py -l python --src-dir=$(top_srcdir)/lasso/
diff --git a/bindings/python/tests/Makefile.am b/bindings/python/tests/Makefile.am
index 332ef1b2..852f3f73 100644
--- a/bindings/python/tests/Makefile.am
+++ b/bindings/python/tests/Makefile.am
@@ -2,3 +2,5 @@ if PYTHON_ENABLED
TESTS = profiles_tests.py binding_tests.py
endif
+EXTRA_DIST = profiles_tests.py binding_tests.py
+