diff --git a/Examples/guile/Makefile.in b/Examples/guile/Makefile.in index 69c7bb696..f84d54a38 100644 --- a/Examples/guile/Makefile.in +++ b/Examples/guile/Makefile.in @@ -7,7 +7,8 @@ SWIG = ../$(top_srcdir)/preinst-swig CC = @CC@ CXX = @CXX@ CFLAGS = @PLATFLAGS@ -LIBS = +LIBS = +GUILE = @GUILE@ GUILE_CFLAGS = @GUILE_CFLAGS@ GUILE_LIBS = @GUILE_LIBS@ SWIGOPT = @@ -38,4 +39,9 @@ sub-all-cxx: $(SWIG) -c++ -guile $(SWIGOPT) $(IFILE) $(CXX) $(CFLAGS) -o $(TARGET) $(SRCS) $(CXXWRAP) $(GUILE_CFLAGS) $(GUILE_LIBS) $(LIBS) +run_example: + if [ -f $(RUNSCRIPT) ]; then \ + env GUILE_AUTO_COMPILE=0 LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(GUILE) -l $(RUNSCRIPT); \ + fi + # Makefile ends here diff --git a/Examples/guile/multimap/Makefile b/Examples/guile/multimap/Makefile index 00fa5df28..7b2f264ba 100644 --- a/Examples/guile/multimap/Makefile +++ b/Examples/guile/multimap/Makefile @@ -5,6 +5,7 @@ TARGET = example INTERFACE = example.i check: build + $(MAKE) -f ../Makefile RUNSCRIPT=runme.scm run_example build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ diff --git a/Examples/guile/multimap/runme.scm b/Examples/guile/multimap/runme.scm index edc197259..1654fd3a8 100644 --- a/Examples/guile/multimap/runme.scm +++ b/Examples/guile/multimap/runme.scm @@ -1,6 +1,6 @@ ;;; Test out some multi-argument typemaps -(use-modules (example)) +(dynamic-call "scm_init_example_module" (dynamic-link "./libexample.so")) ; Call the GCD function @@ -27,4 +27,4 @@ (display (capitalize "hello world")) (newline) - +(exit 0)