From: Uwe Hermann <redacted>
Date: Wed, 9 Sep 2015 06:21:01 +0000 (+0200)
Subject: Makefile.am: Use @ORDER@ instead of |.
X-Git-Tag: libsigrok-0.4.0~321
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=ba3070ff3412bd547d2f1554430818de9f003733;hp=fd31865ef42ad6b48f47a616c1aebd9e5b4c1ec1;p=libsigrok.git

Makefile.am: Use @ORDER@ instead of |.

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.
---

diff --git a/Makefile.am b/Makefile.am
index b32515a7..7aaaadab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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)