Am Sonntag, 27. August 2006 02:00 schrieb Derek Atkins:
> Christian Stimming <[EMAIL PROTECTED]> writes:
> > Concerning LN_S, this one bites us hard everywhere throughout gnucash. 
>
> Yeah, this is definitely a problem.  In MOST cases it's only required
> to run gnucash from the build tree.  I'm pretty happy to not worry about
> that here.  

The "gnucash" directory is needed for "make check", though.

> HOWEVER, there's another problem, which is that we really 
> need the "g-wrapped" location....

Yes.

> I dont think this has to be done from install.sh.  I think the
> makefiles can (should?) just be changed to do this.  This way we can
> clean it up via "make clean".  I think the only things that need to be
> copied are the g-wrapped scheme files.

See attached patch for gnc-module/Makefile.am.

> That's fine.  I've fixed the gnucash configure script to handle this.
> *sighs* All this work to get gsf and goffice to build, and you've got
> binaries.  ;) I guess we should just add an "inst_foo_bin()" function
> to install the binary version of "foo" instead of the source version.
> That way we keep the code that builds it for future reference (or if
> we want to change the dependencies).

Yes.

> >> I think this is a change that should be made in g-wrap itself.  When
> >> g-wrap generates the file is should output the correct name.
> >
> > Yes, that would be even better -- but OTOH I'm not totally sure
> > whether g-wrap actually knows the SO_MAJOR version number, which is
> > the one in use here. For now, gnucash always uses a zero, but as a
> > general solution... anyway, we only need a solution for ourselves,
> > so that's probably not a problem here.
>
> Yeah, I think we can assume that we're the only user and that all the
> libraries are major version 0.  It's not like we've use libtool
> library version numbers at all..  (we probably should going forward).
>
> Hopefully all this will get MUCH easier once we move to swig.  But for
> now I think it's safe to just hard-code "-0" into g-wrap.  Want me to
> work on that, or do you want to work on it?

Could you do that? Thanks.

Christian
Index: src/gnc-module/Makefile.am
===================================================================
--- src/gnc-module/Makefile.am	(Revision 14739)
+++ src/gnc-module/Makefile.am	(Arbeitskopie)
@@ -51,18 +51,31 @@
 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
+if PLATFORM_WIN32
+	rm -rf gnucash g-wrapped
+	mkdir -p gnucash g-wrapped
+	make $(BUILT_SOURCES)
+	(cd g-wrapped; $(LN_S) ../gw-*.scm . )
+	(cd gnucash; $(LN_S) ../*.scm . )
+else
+	rm -f gnucash g-wrapped
+	$(LN_S) -f . gnucash
+	$(LN_S) -f . g-wrapped
+endif
 	touch .scm-links
 
+if PLATFORM_WIN32
+clean-local:
+	rm -rf g-wrapped gnucash
+endif
+
 gw-gnc-module.scm gw-gnc-module.c gw-gnc-module.h: \
-  .scm-links gw-gnc-module-spec.scm ${top_builddir}/config.status
+  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\") \
_______________________________________________
gnucash-devel mailing list
[email protected]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel

Reply via email to