]> sigrok.org Git - libsigrok.git/commitdiff
Makefile.am: Use @ORDER@ instead of |.
authorUwe Hermann <redacted>
Wed, 9 Sep 2015 06:21:01 +0000 (08:21 +0200)
committerUwe Hermann <redacted>
Wed, 9 Sep 2015 13:20:10 +0000 (15:20 +0200)
This is set to | (or left empty) by SR_PROG_MAKE_ORDER_ONLY for
portability reasons, since not all Make implementations support
order-only prerequisites.

Makefile.am

index b32515a74fd4223f938f5c4a58bbcffded953619..7aaaadab0eda43d6035f9b6eb59c759720b177b0 100644 (file)
@@ -575,7 +575,7 @@ $(PDIR)/timestamp: $(PDIR)/sigrok/core/classes.i \
                $(library_include_HEADERS) $(nodist_library_include_HEADERS) \
                $(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
                $(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS) \
-               | bindings/cxx/libsigrokcxx.la
+               @ORDER@ bindings/cxx/libsigrokcxx.la
        $(AM_V_at)$(setup_py) clean --all 2>/dev/null
        $(AM_V_GEN)$(setup_py) build_ext --swig "$(SWIG)" build_py
        $(AM_V_at): >$@
@@ -636,7 +636,7 @@ $(JLIB): $(JCXX) \
                $(library_include_HEADERS) $(nodist_library_include_HEADERS) \
                $(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
                $(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS) \
-               | bindings/cxx/libsigrokcxx.la
+               @ORDER@ bindings/cxx/libsigrokcxx.la
        $(AM_V_GEN)$(CXXCOMPILE) $(JNI_CPPFLAGS) -L.libs -Lbindings/cxx/.libs \
                -fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \
                -lsigrokcxx $(LIBSIGROKCXX_LIBS) -o $(JLIB)