C++ for a nicer progrmming style.
This commit is contained in:
parent
592ad902a0
commit
4b3e9691ef
@ -5,45 +5,40 @@ SWIG=@SWIG@
|
|||||||
JAVAC=@JAVAC@
|
JAVAC=@JAVAC@
|
||||||
JAR=@JAR@
|
JAR=@JAR@
|
||||||
include ../Makefile.defs
|
include ../Makefile.defs
|
||||||
|
DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1 -DDESTDIR=\"$(DESTDIR)\"
|
||||||
|
YAP_EXTRAS=@YAP_EXTRAS@
|
||||||
|
CPPFLAGS=@CPPFLAGS@ -I../.. -I$(srcdir)/../../H -I$(srcdir)/../../include -I$(srcdir)/../../os -I$(srcdir)/../../OPTYap -I$(srcdir)/../../BEAM -I$(srcdir)/../../CXX
|
||||||
|
CXXFLAGS= @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
|
||||||
|
|
||||||
PROGRAMS= \
|
PROGRAMS= \
|
||||||
|
|
||||||
SWIG_FILES= \
|
SWIG_FILES= \
|
||||||
$(srcdir)/yap.i \
|
$(srcdir)/yap.i
|
||||||
$(srcdir)/yap.c \
|
|
||||||
$(srcdir)/yap.cpp \
|
|
||||||
$(srcdir)/yap.hh
|
|
||||||
|
|
||||||
all: python java R
|
all: python java R
|
||||||
|
|
||||||
python: $(SWIG_FILES) python/_yap.so python/yap.py
|
python: $(SWIG_FILES) python/_yap.so python/yap.py
|
||||||
|
|
||||||
python/_yap.so: python/yap.o python/yap_wrap.o
|
python/_yap.so: python/yap_wrap.o
|
||||||
$(LD) $(LDSOFLAGS) -o python/_yap.so python/yap.o python/yap_wrap.o $(LIBS) @PYTHON_LIBS@ -L ../.. -lYap
|
$(CXX) -shared $(LDSOFLAGS) -o python/_yap.so python/yap_wrap.o ../../yapi.o $(LIBS) @PYTHON_LIBS@ -L ../.. -lYap -lpthread
|
||||||
|
|
||||||
python/yap_wrap.c: $(srcdir)/yap.i
|
python/yap_wrap.c: $(srcdir)/yap.i
|
||||||
$(SWIG) -python -outdir python -o python/yap_wrap.c -I$(srcdir)/../../include -I$(srcdir) -Wall $(srcdir)/yap.i
|
$(SWIG) -c++ -python -outdir python -o $@ $(DEFS) $(CPPFLAGS) -Wall $<
|
||||||
|
|
||||||
python/yap_wrap.o: python/yap_wrap.c
|
python/yap_wrap.o: python/yap_wrap.c
|
||||||
$(CC) $(CFLAGS) -c python/yap_wrap.c @PYTHON_INCLUDES@ -o python/yap_wrap.o
|
$(CXX) -c $(CXXFLAGS) @PYTHON_INCLUDES@ $< -o $@
|
||||||
|
|
||||||
python/yap.o: $(srcdir)/yap.c
|
|
||||||
$(CC) $(CFLAGS) -c $< -o python/yap.o
|
|
||||||
|
|
||||||
java: java/libyap.@SO@ java/yap.java
|
java: java/libyap.@SO@ java/yap.java
|
||||||
cd java ; $(JAVAC) *.java; $(JAR) cvf yap.jar *.class
|
cd java ; $(JAVAC) *.java; $(JAR) cvf yap.jar *.class
|
||||||
|
|
||||||
java/libyap.@SO@: java/yap.o java/yap_wrap.o
|
java/libyap.@SO@: java/yap_wrap.o
|
||||||
$(LD) $(LDSOFLAGS) -L ../.. -lYap -o java/libyap.@SO@ java/yap.o java/yap_wrap.o $(LIBS) @JPLLDFLAGS@ -L ../.. -lYap
|
$(CXX) -shared $(LDSOFLAGS) -L ../.. -lYap -o java/libyap.@SO@ ../../yapi.o java/yap_wrap.o $(LIBS) @JPLLDFLAGS@ -L ../.. -lYap -lpthread
|
||||||
|
|
||||||
java/yap_wrap.c: $(srcdir)/yap.i
|
java/yap_wrap.c: $(srcdir)/yap.i
|
||||||
$(SWIG) -java -outdir java -o java/yap_wrap.c -I$(srcdir)/../../include -I$(srcdir)/../../include -I$(srcdir) -Wall $(srcdir)/yap.i
|
$(SWIG) -c++ -java -outdir java -o $@ $(DEFS) $(CPPFLAGS) -Wall $<
|
||||||
|
|
||||||
java/yap_wrap.o: java/yap_wrap.c
|
java/yap_wrap.o: java/yap_wrap.c
|
||||||
$(CC) $(CFLAGS) -c java/yap_wrap.c @JPLCFLAGS@ -o java/yap_wrap.o
|
$(CXX) -c $(CXXFLAGS) @JPLCFLAGS@ $< -o $@
|
||||||
|
|
||||||
java/yap.o: $(srcdir)/yap.c
|
|
||||||
$(CC) $(CFLAGS) -c $< -o java/yap.o
|
|
||||||
|
|
||||||
R:
|
R:
|
||||||
|
|
||||||
|
@ -4,11 +4,9 @@
|
|||||||
%{
|
%{
|
||||||
/* Put header files here or function declarations like below */
|
/* Put header files here or function declarations like below */
|
||||||
|
|
||||||
#include "YapInterface.h"
|
#include "yapi.hh"
|
||||||
|
|
||||||
%}
|
%}
|
||||||
|
|
||||||
extern int prove_string(char *s);
|
%include "yapi.hh"
|
||||||
|
|
||||||
%include "YapInterface.h"
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user