make SWI-Prolog get YAP stuff from include/Yap at run-time.

This commit is contained in:
Vítor Manuel de Morais Santos Costa 2010-01-15 14:39:03 +00:00
parent 44a418bd04
commit ffdf270a3d
7 changed files with 12 additions and 7 deletions

View File

@ -70,7 +70,7 @@ C_PARSER_FLAGS= @C_PARSER_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
ARCH=@ARCH@ ARCH=@ARCH@
AWK=@AWK@ AWK=@AWK@
CPP=@CPP@ CPP=@CPP@
DEFS=@DEFS@ DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1
LIBS=@LIBS@ LIBS=@LIBS@
LDFLAGS=@LDFLAGS@ LDFLAGS=@LDFLAGS@
LN_S=@LN_S@ LN_S=@LN_S@

View File

@ -18,8 +18,13 @@ extern "C" {
#endif #endif
//=== includes =============================================================== //=== includes ===============================================================
#include "config.h" #ifdef _YAP_NOT_INSTALLED_
#include <config.h>
#include <YapInterface.h> #include <YapInterface.h>
#else
#include <Yap/config.h>
#include <Yap/YapInterface.h>
#endif
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h> #include <stddef.h>

View File

@ -18,7 +18,7 @@ LIBDIR=$(EROOTDIR)/lib/Yap
# #
# #
CC=@CC@ CC=@CC@
CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -I$(srcdir)/uxnt CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include -I$(srcdir)/uxnt
# #
# #
# You shouldn't need to change what follows. # You shouldn't need to change what follows.

@ -1 +1 @@
Subproject commit 804d5a27f66bb0b4697a28ab72e325b481570d22 Subproject commit 5f7abe62fc770d680b78c3f3e8b65951c7004850

@ -1 +1 @@
Subproject commit 8192d5f9ba0bba55fdd96b4473d68d8cf57f51aa Subproject commit 25bfaa3370ca6f6a2b23d8dcc6dda84a2773d40a

View File

@ -28,7 +28,7 @@ LN_S=@LN_S@
# #
# #
CC=@CC@ CC=@CC@
CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include
MKINDEX=true MKINDEX=true
LD=$(CC) LD=$(CC)

View File

@ -19,7 +19,7 @@ LIBDIR=$(EROOTDIR)/lib/Yap
# #
CC=@CC@ CC=@CC@
CXX=@CXX@ CXX=@CXX@
CXXFLAGS= @CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../../.. -I$(srcdir)/../../../include CXXFLAGS= @CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include
# #
# #
# You shouldn't need to change what follows. # You shouldn't need to change what follows.