Remove unnecessary level of indirection for source manipulation.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1bb8966ecbe233af532d926c3336b63bc3962946..246717796016b97ef2c3eaf94b4ca18aceba22d1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -361,7 +361,7 @@ TESTS = tests/check_main
 check_PROGRAMS = ${TESTS}
 
 tests_check_main_SOURCES = \
-       libsigrok.h \
+       include/libsigrok/libsigrok.h \
        tests/lib.c \
        tests/lib.h \
        tests/check_main.c \
@@ -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,50 @@ 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
+       $(AM_V_GEN)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 $<
+       $(AM_V_GEN)python $<
+       $(AM_V_at)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
+
+python-cleanclean:
+       $(AM_V_at)cd $(PDIR) && python setup.py --quiet clean --all 2> >(grep -v "can't clean it")
+
+$(PDIR)/timestamp: bindings/cxx/libsigrokxx.la $(PDIR)/sigrok/core/classes.i \
+               $(library_include_HEADERS) python-cleanclean
+       $(AM_V_GEN)cd $(PDIR) && python setup.py --quiet build 2> >(grep -v "command line option.*Wstrict-prototypes")
+       $(AM_V_at)touch $(PDIR)/timestamp
 
 python-install:
-       cd bindings/python && python setup.py install --prefix $(prefix)
+       cd $(PDIR) && python setup.py --quiet install --prefix $(prefix)
 
-python-clean:
-       cd bindings/python && python setup.py clean --all
+python-clean: python-cleanclean
+       $(AM_V_at)rm -f $(PDIR)/timestamp
 
 BUILD_EXTRA += python-build
 INSTALL_EXTRA += python-install
@@ -438,17 +461,17 @@ JJAR = $(JDIR)/sigrok-core.jar
 
 java-build: $(JJAR) $(JLIB)
 
-$(JSRC): $(JINT) bindings/swig/classes.i
-       swig -c++ -java -package org.sigrok.core.classes \
+$(JSRC): $(JINT) bindings/swig/classes.i $(library_include_HEADERS)
+       $(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \
                -Iinclude -Ibindings/cxx/include \
                -outdir $(JDIR)/$(JPKG) $(JINT)
 
 $(JJAR): $(JSRC) $(JDIR)/$(JPKG)/*.java
-       $(JAVAC) -sourcepath $(JDIR) $(JDIR)/$(JPKG)/*.java
-       jar cf $(JJAR) -C $(JDIR) $(JPKG)
+       $(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) $(JDIR)/$(JPKG)/*.java
+       $(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG)
 
-$(JLIB): $(JSRC) bindings/cxx/libsigrokxx.la
-       $(CXX) $(CXXFLAGS) -L.libs -Lbindings/cxx/.libs \
+$(JLIB): $(JSRC) bindings/cxx/libsigrokxx.la $(library_include_HEADERS)
+       $(AM_V_GEN)$(CXX) $(CXXFLAGS) -L.libs -Lbindings/cxx/.libs \
                -fno-strict-aliasing -fPIC -shared \
                $(JDIR)/$(JPKG)/classes_wrap.cxx -lsigrokxx \
                -o $(JLIB)
@@ -460,10 +483,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 +496,7 @@ endif
 
 all-local: $(BUILD_EXTRA)
 install-exec-local: $(INSTALL_EXTRA)
-clean-extra: $(CLEAN_EXTRA)
+clean-local: $(CLEAN_EXTRA)
 
 MAINTAINERCLEANFILES = ChangeLog