From 53571c5ca8c4354f9df5880f445aa63de4979a5d Mon Sep 17 00:00:00 2001 From: Claudio Sacerdoti Coen Date: Tue, 12 Mar 2002 17:41:44 +0000 Subject: [PATCH] * Linking was still static for native compilation. * Automatic compilation of the test in native mode can no more be performed because the dynamic library is always searched in the position where it will be installed ;-( --- helm/DEVEL/lablgtkmathview/META.in | 4 ++-- helm/DEVEL/lablgtkmathview/Makefile.in | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/helm/DEVEL/lablgtkmathview/META.in b/helm/DEVEL/lablgtkmathview/META.in index f312805fd..84d671aee 100644 --- a/helm/DEVEL/lablgtkmathview/META.in +++ b/helm/DEVEL/lablgtkmathview/META.in @@ -1,5 +1,5 @@ requires="gdome2 lablgtk" version="@VERSION@" -archive(byte)="lablgtkmathview.cma ml_gtk_mathview.o" -archive(native)="lablgtkmathview.cmxa ml_gtk_mathview.o" +archive(byte)="lablgtkmathview.cma" +archive(native)="lablgtkmathview.cmxa" linkopts="" diff --git a/helm/DEVEL/lablgtkmathview/Makefile.in b/helm/DEVEL/lablgtkmathview/Makefile.in index 782acb049..7883c0525 100644 --- a/helm/DEVEL/lablgtkmathview/Makefile.in +++ b/helm/DEVEL/lablgtkmathview/Makefile.in @@ -30,7 +30,7 @@ TMPPKGDIR = $(TMPDIR)/$(PACKAGE) all: $(ARCHIVE) $(ARCHIVE_SO) $(TESTDIR)/test -opt: $(OBJECTS_C) $(ARCHIVE_OPT) $(ARCHIVE_A) $(ARCHIVE_SO) $(TESTDIR)/test.opt +opt: $(OBJECTS_C) $(ARCHIVE_OPT) $(ARCHIVE_A) $(ARCHIVE_SO) #$(TESTDIR)/test.opt dist: rm -rf $(PACKAGE)-$(VERSION) @@ -63,9 +63,11 @@ $(ARCHIVE): $(OBJECTS) $(ARCHIVE_SO) -predicates "$(PREDICATES)" -o $@ $^ \ -cclib "`glib-config --libs` `gdome-config --libs` `gtkmathview-config --libs`" -dllib -l$(PACKAGE) $(ARCHIVE_OPT) $(ARCHIVE_A): $(OBJECTS_OPT) + INSTPATH=`ocamlfind query gdome2` ; \ $(OCAMLOPT) -a -package "$(REQUIRES)" \ -predicates "$(PREDICATES)" -o $@ $^ \ - -cclib "`glib-config --libs` `gdome-config --libs` `gtkmathview-config --libs`" + -cclib "`glib-config --libs` `gdome-config --libs` `gtkmathview-config --libs`" \ + -cclib "`echo $$INSTPATH | sed "s/\\(.*\\)\\/gdome2/\\1/"`/$(PACKAGE)/$(ARCHIVE_SO)" $(ARCHIVE_SO): $(OBJECTS_C) gcc -shared -o $@ $< `gtkmathview-config --libs` -lmlgdome -L `ocamlfind query gdome2` -Xlinker -rpath -Xlinker `ocamlfind query gdome2` -- 2.39.2