Improve GOB rebuild rules for VPATH builds.

[upkg.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bf4759d26a3aa47d8bbed7f42541a9ecb35a362b..e5140a4679fddcccc4d4b2b9ddaa7e46a6aa2768 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,8 +109,12 @@ GOB_V_0 = @printf '  %$(DX_ALIGN_V)s %s\n' 'GOB     ' $<;
 # this rule has to make some assumptions about the source tree layout.
 .gob.gobstamp:
 if HAVE_GOB2_DYN
-       $(GOB_V) $(GOB2) -o src --file-sep=/ --no-private-header $<
-       $(AM_V_at) touch $@
+       $(AM_V_at) touch $@.tmp
+       $(GOB_V) od='$(@D)'; case $$od in \
+         src/*) od=src ;; \
+         */src/*) od=$${od%/src/*}/src ;; \
+         esac; $(GOB2) -o "$$od" --file-sep=/ --no-private-header $<
+       $(AM_V_at) mv -f $@.tmp $@
 else
 if HAVE_GOB2
        @echo "ERROR: *** $(GOB2) does not support dynamic types." 1>&2