Revision d409e5a5 src/spin/Makefile.am

b/src/spin/Makefile.am
14 14

  
15 15
# use lib_LTLIBRARIES to build a shared lib:
16 16
lib_LTLIBRARIES = libspin_@SPIN_API_VERSION@.la
17
python_LTLIBRARIES = libSPINPyWrap.la
17
python_LTLIBRARIES = libpyspin.la
18 18

  
19
libspin_@SPIN_API_VERSION@_la_LIBADD = \
19
libpyspin_@SPIN_API_VERSION@_la_LIBADD = \
20 20
    $(top_builddir)/src/osgWrappers/introspection/libSPINwrappers.la \
21 21
    $(top_builddir)/src/tinyxml/libtinyxml.la
22 22

  
23
libspin_@SPIN_API_VERSION@_la_LDFLAGS = \
23
libpyspin_@SPIN_API_VERSION@_la_LDFLAGS = \
24 24
    -export-dynamic \
25 25
    -version-info $(SPIN_LT_VERSION) \
26 26
    $(BOOST_SYSTEM_LIBS) \
......
30 30
    $(BOOST_LDFLAGS) \
31 31
    $(CPPINTROSPECTION_LIBS) \
32 32
    $(PYTHON_LDFLAGS) \
33
 	$(BOOST_THREADS_LIBS) \
33 34
    $(LIBLO_LIBS) \
34 35
    $(OPENTHREADS_LIBS) \
35 36
    $(OSG_LIBS) \
36 37
    $(SHAREDVIDEO_LIBS) \
37 38
    $(SPATOSC_LIBS)
38 39

  
39
    
40
#	$(BOOST_THREAD_LIBS) 
41

  
42 40
# please keep those in alphabetical order:
43
libspin_@SPIN_API_VERSION@_la_SOURCES = \
41
libpyspin_@SPIN_API_VERSION@_la_SOURCES = \
44 42
    AttractorNode.cpp \
45 43
    ConstraintsNode.cpp \
46 44
    DSPNode.cpp \
......
84 82
    spinUtil.cpp \
85 83
    introspect_helpers.cpp
86 84

  
87
libspin_@SPIN_API_VERSION@_la_includedir = $(includedir)/spin-$(SPIN_API_VERSION)/spin
88
libspin_@SPIN_API_VERSION@_la_include_HEADERS = \
85
libpyspin_@SPIN_API_VERSION@_la_includedir = $(includedir)/spin-$(SPIN_API_VERSION)/spin
86
libpyspin_@SPIN_API_VERSION@_la_include_HEADERS = \
89 87
    $(top_srcdir)/include/AnimationNode.h \
90 88
    $(top_srcdir)/include/AttractorNode.h \
91 89
    $(top_srcdir)/include/config.h \
......
141 139

  
142 140
# $(top_srcdir)/include/videoSize.h
143 141

  
144
libSPINPyWrap_la_SOURCES = python_wrappers.cpp
145
#libSPINPyWrap_la_LDFLAGS = -shrext ".so" # python expects .so on OSX
146
libSPINPyWrap_la_LIBADD = libspin_@SPIN_API_VERSION@.la \
142
pyspin_la_SOURCES = python_wrappers.cpp
143
#pyspin_la_LDFLAGS = -shrext ".so" # python expects .so on OSX
144
pyspin_la_LIBADD = libspin_@SPIN_API_VERSION@.la \
147 145
	$(top_builddir)/src/osgWrappers/introspection/libSPINwrappers.la
148 146

  
149
libSPINPyWrapdir = `python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1,0)'`
147
spindir = `python -c 'from distutils import sysconfig; sysconfig.get_python_lib(plat_specific=True, standard_lib=False, prefix="@PYTHON_PREFIX@")'`
150 148
# `python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1,0,"${exec_prefix}")'`
151 149

  
152
# On OSX, we need the python module to have a .so extension, but the -shrext option
153
# doesn't work with glibtool, so we make a symbolic link in an install hook instead.
154
# On Linux, this will fail because the .dylip doesn't exist. Is there any way we can
155
# do this only for OSX?
150
# On OSX, we need the python module to have a .so extension, but the
151
# -shrext option doesn't work with glibtool, so we make a symbolic link
152
# in an install hook instead.
153
# On Linux, this will fail because the .dylip doesn't exist. Is there
154
# any way we can do this only for OSX?
155

  
156 156
install-exec-hook:
157
	cd $(libSPINPyWrapdir) && $(LN_S) -f libSPINPyWrap.dylib libSPINPyWrap.so
157
	cd $(spindir) && $(LN_S) -f spin.dylib spin.so
158 158

  
159 159
#$(LN_S) prog-$(VERSION)$(EXEEXT) prog$(EXEEXT)
160 160

  
161

  
162 161
bin_PROGRAMS = spinserver spinviewer spindocgenerator
163 162

  
164 163
spinserver_SOURCES = spinServer.cpp
165 164
spinserver_LDADD = libspin_@SPIN_API_VERSION@.la $(OPENTHREADS_LIBS) $(OSG_LIBS) $(CPPINTROSPECTION_LIBS) $(PYTHON_LDFLAGS) $(LIBLO_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_FILESYSTEM_LIBS)
166 165

  
167

  
168 166
spinviewer_SOURCES = spinViewer.cpp
169 167
spinviewer_LDADD = libspin_@SPIN_API_VERSION@.la $(OPENTHREADS_LIBS) $(OSG_LIBS) $(CPPINTROSPECTION_LIBS) $(PYTHON_LDFLAGS) $(LIBLO_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_FILESYSTEM_LIBS)
170 168

  
171

  
172 169
spindocgenerator_SOURCES = docGenerator.cpp
173 170
spindocgenerator_LDADD = libspin_@SPIN_API_VERSION@.la $(OPENTHREADS_LIBS) $(OSG_LIBS) $(CPPINTROSPECTION_LIBS) $(PYTHON_LDFLAGS) $(LIBLO_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_FILESYSTEM_LIBS)
174 171

  
......
234 231
doc:
235 232
	./spindocgenerator
236 233
	-cp *.html ../../doxygen/html
234

  

Also available in: Unified diff