-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Derek Atkins schrieb:
>> Actually I think it's just a matter of changing g-wrap.scm line 981 from
>> " (dynamic-link \"lib" wrapset-name "\"))))\n"))))))
>> into
>> " (dynamic-link \"lib" wrapset-name "-0\"))))\n"))))))
>
> Ahh, so think you could modify install.sh to apply this change?
I don't know an easy shell command to do this... so, no, I don't know
how to add this to install.sh.
> This part looks good.
>
>> +clean-local:
>> + $(RM) -rf gnucash g-wrapped
>
> I think you want to add ".scm-links" to this part...
The clean-local rule is in addition to the simply hard-coded file lists.
Since the file lists (the CLEANFILES variable) is much more restrictive
than the general clean-local rule, I'd rather leave the files in there
and only add the directories to clean-local.
> Also, we might want to use the .INTERMEDIATE rule as suggested by
> Mike. But yeah, this looks like a good approach!
Next proposal attached. For my part it's the same as before, but now
with Mike's proposal added.
Christian
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iQCVAwUBRPL64GXAi+BfhivFAQLJzwP/UjwoN3ZpMzuHIOtuw+heJt60oEly1Ro7
U99BdsFZ/q4xC9329XuxFykm7dhE6W/TbvEMxvSKoM6w2J2MeT7mrmUwylWFPe6W
QupZp/64LC7+n6wghCndlyLFmiJUb35yZo43ciK5WE1SCzpn9g08/CjeqWlWG2wo
4myzTIDZSFw=
=d0/o
-----END PGP SIGNATURE-----
Index: src/gnc-module/Makefile.am
===================================================================
--- src/gnc-module/Makefile.am (revision 14741)
+++ src/gnc-module/Makefile.am (working copy)
@@ -50,24 +50,27 @@
SCM_FILE_LINKS += ${gncmod_DATA}
endif
-.scm-links:
- rm -f gnucash g-wrapped
- $(LN_S) -f . gnucash
- $(LN_S) -f . g-wrapped
-if GNUCASH_SEPARATE_BUILDDIR
- for X in ${SCM_FILE_LINKS} ; do \
- $(LN_S) -f ${srcdir}/$$X . ; \
- done
-endif
+.scm-links:
+ $(RM) -rf gnucash g-wrapped
+ mkdir -p gnucash g-wrapped
+ ( cd gnucash; for A in $(gncmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
touch .scm-links
-gw-gnc-module.scm gw-gnc-module.c gw-gnc-module.h: \
- .scm-links gw-gnc-module-spec.scm ${top_builddir}/config.status
+clean-local:
+ $(RM) -rf gnucash g-wrapped
+
+.INTERMEDIATE: gwrap-files
+
+gw-gnc-module.scm gw-gnc-module.c gw-gnc-module.h: gwrap-files
+
+gwrap-files: .scm-links gw-gnc-module-spec.scm ${top_builddir}/config.status
FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
(primitive-load \"./gw-gnc-module-spec.scm\") \
(gw:generate-wrapset \"gw-gnc-module\")"
+ touch $@
+ ( cd g-wrapped; $(LN_S) ../gw-*.scm . )
BUILT_SOURCES = gw-gnc-module.scm gw-gnc-module.h gw-gnc-module.c
-CLEANFILES = $(BUILT_SOURCES) .scm-links g-wrapped gnucash \
+CLEANFILES = $(BUILT_SOURCES) .scm-links \
${SCM_FILE_LINKS} gw-gnc-module.html
_______________________________________________
gnucash-devel mailing list
[email protected]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
