X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=6a6668c12a59aa90d702b8673bec1b59534bc8a4;hb=580ed4005bf0a95e8d7e11b527b0b1ad259aecca;hp=1bb8966ecbe233af532d926c3336b63bc3962946;hpb=815a6b95f437b7fcc5d90a305f667b01d731feae;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 1bb8966e..6a6668c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -379,13 +379,17 @@ tests_check_main_LDADD = $(top_builddir)/libsigrok.la @check_LIBS@
 
 endif
 
+BUILD_EXTRA =
+INSTALL_EXTRA =
+CLEAN_EXTRA =
+
 if BINDINGS_CXX
 
 lib_LTLIBRARIES += bindings/cxx/libsigrokxx.la
 
 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)
 
@@ -395,31 +399,49 @@ library_include_HEADERS += \
 
 pkgconfig_DATA += bindings/cxx/libsigrokxx.pc
 
-bindings/cxx/classes.lo: bindings/cxx/enums.cpp
+bindings/cxx/libsigrok.xml: include/libsigrok/libsigrok.h
+	gccxml $(CFLAGS) -DGLIB_DISABLE_DEPRECATION_WARNINGS $< -fxml=$@
+
+bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp
 
-bindings/cxx/enums.cpp: bindings/cxx/enums.py bindings/cxx/libsigrok.xml \
+bindings/cxx/include/libsigrok/enums.hpp: bindings/cxx/enums.timestamp
+
+bindings/cxx/enums.timestamp: bindings/cxx/enums.py bindings/cxx/libsigrok.xml \
 		bindings/cxx/ConfigKey_methods.cpp bindings/cxx/QuantityFlag_methods.cpp
 	python $<
+	touch $@
 
-bindings/cxx/libsigrok.xml: include/libsigrok/libsigrok.h
-	gccxml $(CFLAGS) -DGLIB_DISABLE_DEPRECATION_WARNINGS $< -fxml=$@
+bindings/cxx/classes.lo: bindings/cxx/classes.cpp bindings/cxx/enums.cpp \
+		$(library_include_HEADERS)
 
-endif
+cxx-clean:
+	rm -f bindings/cxx/libsigrok.xml
+	rm -f bindings/cxx/enums.cpp
+	rm -f bindings/cxx/include/libsigrok/enums.hpp
+	rm -f bindings/cxx/enums.timestamp
 
-BUILD_EXTRA =
-INSTALL_EXTRA =
-CLEAN_EXTRA =
+CLEAN_EXTRA += cxx-clean
+
+endif
 
 if BINDINGS_PYTHON
 
-python-build: bindings/cxx/libsigrokxx.la
-	cd bindings/python && python setup.py build
+PDIR = bindings/python
+
+python-build: $(PDIR)/timestamp
+
+$(PDIR)/timestamp: bindings/cxx/libsigrokxx.la $(PDIR)/sigrok/core/classes.i \
+		$(library_include_HEADERS)
+	cd $(PDIR) && python setup.py clean --all
+	cd $(PDIR) && python setup.py build
+	touch $(PDIR)/timestamp
 
 python-install:
-	cd bindings/python && python setup.py install --prefix $(prefix)
+	cd $(PDIR) && python setup.py install --prefix $(prefix)
 
 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
 INSTALL_EXTRA += python-install
@@ -438,7 +460,7 @@ JJAR = $(JDIR)/sigrok-core.jar
 
 java-build: $(JJAR) $(JLIB)
 
-$(JSRC): $(JINT) bindings/swig/classes.i
+$(JSRC): $(JINT) bindings/swig/classes.i $(library_include_HEADERS)
 	swig -c++ -java -package org.sigrok.core.classes \
 		-Iinclude -Ibindings/cxx/include \
 		-outdir $(JDIR)/$(JPKG) $(JINT)
@@ -447,7 +469,7 @@ $(JJAR): $(JSRC) $(JDIR)/$(JPKG)/*.java
 	$(JAVAC) -sourcepath $(JDIR) $(JDIR)/$(JPKG)/*.java
 	jar cf $(JJAR) -C $(JDIR) $(JPKG)
 
-$(JLIB): $(JSRC) bindings/cxx/libsigrokxx.la
+$(JLIB): $(JSRC) bindings/cxx/libsigrokxx.la $(library_include_HEADERS)
 	$(CXX) $(CXXFLAGS) -L.libs -Lbindings/cxx/.libs \
 		-fno-strict-aliasing -fPIC -shared \
 		$(JDIR)/$(JPKG)/classes_wrap.cxx -lsigrokxx \
@@ -460,10 +482,10 @@ java-install:
 	$(INSTALL) $(JJAR) -t $(datadir)/java
 
 java-clean:
-	rm $(JSRC)
-	rm $(JDIR)/$(JPKG)/*.class
-	rm $(JJAR)
-	rm $(JLIB)
+	rm -f $(JSRC)
+	rm -f $(JDIR)/$(JPKG)/*.class
+	rm -f $(JJAR)
+	rm -f $(JLIB)
 
 BUILD_EXTRA += java-build
 INSTALL_EXTRA += java-install
@@ -473,7 +495,7 @@ endif
 
 all-local: $(BUILD_EXTRA)
 install-exec-local: $(INSTALL_EXTRA)
-clean-extra: $(CLEAN_EXTRA)
+clean-local: $(CLEAN_EXTRA)
 
 MAINTAINERCLEANFILES = ChangeLog