[Yap-commits] CVS: LGPL/chr Makefile.in,1.6,1.7

[Vitor S. C. <vs...@us...>]

Update of /cvsroot/yap/LGPL/chr
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1380/LGPL/chr

Modified Files:
	Makefile.in 
Log Message:
fix bad syntax in config.h and first step to fix chr compilation.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/yap/LGPL/chr/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in	3 Apr 2008 13:26:38 -0000	1.6
+++ Makefile.in	27 Jul 2008 22:31:36 -0000	1.7
@@ -11,7 +11,7 @@
 SHELL=@SHELL@
 PLBASE=@PLBASE@
 PLARCH=@PLARCH@
-PL=../../yap ../../startup
+PL=LD_LIBRARY_PATH=system YAPSHAREDIR=`pwd`/../../library ../../yap ../../startup
 XPCEBASE=$(PLBASE)/xpce
 PKGDOC=$(PLBASE)/doc/packages
 PCEHOME=../../xpce
@@ -48,9 +48,16 @@
 		$(srcdir)/Benchmarks/bool.chr $(srcdir)/Benchmarks/family.chr $(srcdir)/Benchmarks/fibonacci.chr $(srcdir)/Benchmarks/leq.chr $(srcdir)/Benchmarks/listdom.chr \
 		$(srcdir)/Benchmarks/chrdif.chr
 
+GPLDIR=		$(srcdir)/../../GPL
+LGPLDIR=	$(srcdir)/../../LGPL
+EXTRALIBDIR=	$(srcdir)/../../library
+GPLLIBPL=	$(EXTRALIBDIR)/aggregate.pl $(EXTRALIBDIR)/error.pl $(EXTRALIBDIR)/occurs.yap $(EXTRALIBDIR)/pairs.pl 
+LGPLLIBPL=	$(EXTRALIBDIR)/maplist.pl
+EXTRALIBPL=	$(GPLLIBPL) $(LGPLLIBPL)
+
 all:		chr_translate.pl
 
-chr_translate_bootstrap1.pl: $(srcdir)/chr_translate_bootstrap1.chr
+chr_translate_bootstrap1.pl: $(srcdir)/chr_translate_bootstrap1.chr $(EXTRALIBPL)
 		$(PL) -f -l chr_swi_bootstrap.yap \
 		      -g "chr_compile_step1('$<','$@'),halt." \
 		      -z 'halt(1).'
@@ -85,6 +92,11 @@
 chr.pl:		chr_swi.pl
 		cp $< $@
 
+$(GPLLIBPL): $(EXTRALIBDIR)/%: $(GPLDIR)/%
+		cp $< $@
+$(LGPLLIBPL): $(EXTRALIBDIR)/%: $(LGPLDIR)/%
+		cp $< $@
+
 install:	chr_translate.pl guard_entailment.pl
 		mkdir -p $(DESTDIR)$(CHRDIR)
 		$(INSTALL) -m 644 $(LIBPL) $(DESTDIR)$(CHRDIR)