BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Assorted build system fixes for C++/Python/Java bindings.

This commit is contained in:
Martin Ling 2014-07-19 16:23:45 +01:00 committed by Bert Vermeulen
parent 815a6b95f4
commit d1785122c7
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -60,6 +60,7 @@ bindings/python/sigrok/core/lowlevel.py
bindings/python/sigrok/core/lowlevel_wrap.c bindings/python/sigrok/core/lowlevel_wrap.c
bindings/python/sigrok/core/classes.py bindings/python/sigrok/core/classes.py
bindings/python/sigrok/core/classes_wrap.cpp bindings/python/sigrok/core/classes_wrap.cpp
bindings/python/timestamp
# Files generated by building Java bindings # Files generated by building Java bindings
*.class *.class

27
Makefile.am
View File

@ -385,7 +385,7 @@ lib_LTLIBRARIES += bindings/cxx/libsigrokxx.la
bindings_cxx_libsigrokxx_la_SOURCES = bindings/cxx/classes.cpp bindings_cxx_libsigrokxx_la_SOURCES = bindings/cxx/classes.cpp
bindings_cxx_libsigrokxx_la_LIBADD = -lsigrok $(glibmm_LIBS) bindings_cxx_libsigrokxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
bindings_cxx_libsigrokxx_la_LDFLAGS = $(SR_LIB_LDFLAGS) bindings_cxx_libsigrokxx_la_LDFLAGS = $(SR_LIB_LDFLAGS)
@ -412,14 +412,21 @@ CLEAN_EXTRA =
if BINDINGS_PYTHON if BINDINGS_PYTHON
python-build: bindings/cxx/libsigrokxx.la PDIR = bindings/python
cd bindings/python && python setup.py build
python-build: $(PDIR)/timestamp
$(PDIR)/timestamp: bindings/cxx/libsigrokxx.la $(PDIR)/sigrok/core/classes.i
cd $(PDIR) && python setup.py clean --all
cd $(PDIR) && python setup.py build
touch $(PDIR)/timestamp
python-install: python-install:
cd bindings/python && python setup.py install --prefix $(prefix) cd $(PDIR) && python setup.py install --prefix $(prefix)
python-clean: python-clean:
cd bindings/python && python setup.py clean --all cd $(PDIR) && python setup.py clean --all
rm -f $(PDIR)/timestamp
BUILD_EXTRA += python-build BUILD_EXTRA += python-build
INSTALL_EXTRA += python-install INSTALL_EXTRA += python-install
@ -460,10 +467,10 @@ java-install:
$(INSTALL) $(JJAR) -t $(datadir)/java $(INSTALL) $(JJAR) -t $(datadir)/java
java-clean: java-clean:
rm $(JSRC) rm -f $(JSRC)
rm $(JDIR)/$(JPKG)/*.class rm -f $(JDIR)/$(JPKG)/*.class
rm $(JJAR) rm -f $(JJAR)
rm $(JLIB) rm -f $(JLIB)
BUILD_EXTRA += java-build BUILD_EXTRA += java-build
INSTALL_EXTRA += java-install INSTALL_EXTRA += java-install
@ -473,7 +480,7 @@ endif
all-local: $(BUILD_EXTRA) all-local: $(BUILD_EXTRA)
install-exec-local: $(INSTALL_EXTRA) install-exec-local: $(INSTALL_EXTRA)
clean-extra: $(CLEAN_EXTRA) clean-local: $(CLEAN_EXTRA)
MAINTAINERCLEANFILES = ChangeLog MAINTAINERCLEANFILES = ChangeLog