poldek: poldek/python/Makefile.am - remove am condition -- python ...
glen
glen at pld-linux.org
Mon Jan 14 09:44:08 CET 2008
Author: glen Date: Mon Jan 14 08:44:08 2008 GMT
Module: poldek Tag: HEAD
---- Log message:
- remove am condition -- python subdir is not included when python is off
---- Files affected:
poldek/poldek/python:
Makefile.am (1.14 -> 1.15)
---- Diffs:
================================================================
Index: poldek/poldek/python/Makefile.am
diff -u poldek/poldek/python/Makefile.am:1.14 poldek/poldek/python/Makefile.am:1.15
--- poldek/poldek/python/Makefile.am:1.14 Fri Jul 6 00:28:53 2007
+++ poldek/poldek/python/Makefile.am Mon Jan 14 09:44:03 2008
@@ -1,9 +1,7 @@
-if ENABLE_PYTHON
- SWIG = swig -python -shadow
- py_ver = $(shell python -c "import sys; print sys.version[:3]")
- py_prefix = $(shell python -c "import sys; print sys.prefix")
- py_incdir = $(py_prefix)/include/python$(py_ver)
-endif
+SWIG = swig -python -shadow
+py_ver = $(shell python -c "import sys; print sys.version[:3]")
+py_prefix = $(shell python -c "import sys; print sys.prefix")
+py_incdir = $(py_prefix)/include/python$(py_ver)
EXTRA_DIST = poldekmod.i local_stdint.c pyldek.py run.sh
CLEANFILES = wrap_* poldekmod.py local_stdint.h
@@ -12,14 +10,12 @@
#pythondir = $(prefix)$(libdir)/python
python_PYTHON = poldek.py
-if ENABLE_PYTHON
- python_PYTHON += poldekmod.py
+python_PYTHON += poldekmod.py
lib_LTLIBRARIES = _poldekmod.la
_poldekmod_la_SOURCES = wrap_poldekmod.c
_poldekmod_la_LDFLAGS = -avoid-version -module
_poldekmod_la_LIBADD = ../libpoldek.la ../vfile/libvfile.la ../cli/libpoclidek.la @TRURL_LDFLAG@
-endif
AM_CFLAGS=
CFLAGS=
@@ -41,6 +37,5 @@
wrap_%.c: %.i
$(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) -o $@ $<
-
clean-local:
-rm -f core *.o *.bak *~ *.pyc *.pyo
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/python/Makefile.am?r1=1.14&r2=1.15&f=u
More information about the pld-cvs-commit
mailing list