alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

python: fix installation

Browse source 
* python/Makefile.am: Use nobase_ for installing python files.  This
required removing the $(srcdir) prefix used almost everywhere in this
file, which in turn enabled the use of subdir-objects to remove
an Automake warning.  The downside is that the Makefile probably won't
support VPATH builds with some inferior implementations of Make.
This commit is contained in:
Alexandre Duret-Lutz 2016-01-28 10:46:55 +01:00
parent c968e7b856
commit 6230f320bf
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
python/Makefile.am
View file

@ -22,6 +22,8 @@
SUBDIRS = . ajax SUBDIRS = . ajax
AUTOMAKE_OPTIONS = subdir-objects
AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_builddir) -I$(top_srcdir) \ AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_builddir) -I$(top_srcdir) \
$(BUDDY_CPPFLAGS) -DSWIG_TYPE_TABLE=spot $(BUDDY_CPPFLAGS) -DSWIG_TYPE_TABLE=spot
@ -33,12 +35,12 @@ AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_builddir) -I$(top_srcdir) \
SWIGFLAGS = -c++ -python -py3 -O -nofastproxy SWIGFLAGS = -c++ -python -py3 -O -nofastproxy
EXTRA_DIST = buddy.i spot/impl.i spot/ltsmin.i EXTRA_DIST = buddy.i spot/impl.i spot/ltsmin.i
python_PYTHON = \ nobase_python_PYTHON = \
$(srcdir)/spot/__init__.py \ spot/__init__.py \
$(srcdir)/spot/impl.py \ spot/impl.py \
$(srcdir)/spot/ltsmin.py \ spot/ltsmin.py \
$(srcdir)/buddy.py buddy.py
pyexec_LTLIBRARIES = _buddy.la spot/_impl.la spot/_ltsmin.la nobase_pyexec_LTLIBRARIES = _buddy.la spot/_impl.la spot/_ltsmin.la
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \
$(srcdir)/spot/impl_wrap.cxx $(srcdir)/spot/impl.py \ $(srcdir)/spot/impl_wrap.cxx $(srcdir)/spot/impl.py \
@ -47,38 +49,38 @@ MAINTAINERCLEANFILES = \
## spot ## spot
spot__impl_la_SOURCES = $(srcdir)/spot/impl_wrap.cxx spot__impl_la_SOURCES = spot/impl_wrap.cxx
spot__impl_la_LDFLAGS = -avoid-version -module $(SYMBOLIC_LDFLAGS) spot__impl_la_LDFLAGS = -avoid-version -module $(SYMBOLIC_LDFLAGS)
spot__impl_la_LIBADD = $(top_builddir)/spot/libspot.la spot__impl_la_LIBADD = $(top_builddir)/spot/libspot.la
$(srcdir)/spot/impl_wrap.cxx: $(srcdir)/spot/impl.i spot/impl_wrap.cxx: spot/impl.i
$(SWIG) $(SWIGFLAGS) -I$(srcdir) -I$(top_srcdir) $(srcdir)/spot/impl.i $(SWIG) $(SWIGFLAGS) -I$(srcdir) -I$(top_srcdir) $(srcdir)/spot/impl.i
$(srcdir)/spot/impl.py: $(srcdir)/spot/impl.i spot/impl.py: spot/impl.i
$(MAKE) $(AM_MAKEFLAGS) spot/impl_wrap.cxx $(MAKE) $(AM_MAKEFLAGS) spot/impl_wrap.cxx
## spot-ltsmin ## spot-ltsmin
spot__ltsmin_la_SOURCES = $(srcdir)/spot/ltsmin_wrap.cxx spot__ltsmin_la_SOURCES = spot/ltsmin_wrap.cxx
spot__ltsmin_la_LDFLAGS = -avoid-version -module $(SYMBOLIC_LDFLAGS) spot__ltsmin_la_LDFLAGS = -avoid-version -module $(SYMBOLIC_LDFLAGS)
spot__ltsmin_la_LIBADD = $(top_builddir)/spot/libspot.la \ spot__ltsmin_la_LIBADD = $(top_builddir)/spot/libspot.la \
$(top_builddir)/spot/ltsmin/libspotltsmin.la $(top_builddir)/spot/ltsmin/libspotltsmin.la
$(srcdir)/spot/ltsmin_wrap.cxx: $(srcdir)/spot/ltsmin.i spot/ltsmin_wrap.cxx: spot/ltsmin.i
$(SWIG) $(SWIGFLAGS) -I$(srcdir) -I$(top_srcdir) $(srcdir)/spot/ltsmin.i $(SWIG) $(SWIGFLAGS) -I$(srcdir) -I$(top_srcdir) $(srcdir)/spot/ltsmin.i
$(srcdir)/spot/ltsmin.py: $(srcdir)/spot/ltsmin.i spot/ltsmin.py: spot/ltsmin.i
$(MAKE) $(AM_MAKEFLAGS) spot/ltsmin_wrap.cxx $(MAKE) $(AM_MAKEFLAGS) spot/ltsmin_wrap.cxx
## buddy ## buddy
_buddy_la_SOURCES = $(srcdir)/buddy_wrap.cxx _buddy_la_SOURCES = buddy_wrap.cxx
_buddy_la_LDFLAGS = -avoid-version -module $(BUDDY_LDFLAGS) $(SYMBOLIC_LDFLAGS) _buddy_la_LDFLAGS = -avoid-version -module $(BUDDY_LDFLAGS) $(SYMBOLIC_LDFLAGS)
$(srcdir)/buddy_wrap.cxx: $(srcdir)/buddy.i buddy_wrap.cxx: buddy.i
$(SWIG) $(SWIGFLAGS) $(BUDDY_CPPFLAGS) $(srcdir)/buddy.i $(SWIG) $(SWIGFLAGS) $(BUDDY_CPPFLAGS) $(srcdir)/buddy.i
$(srcdir)/buddy.py: $(srcdir)/buddy.i buddy.py: buddy.i
$(MAKE) $(AM_MAKEFLAGS) buddy_wrap.cxx $(MAKE) $(AM_MAKEFLAGS) buddy_wrap.cxx