bad makefile

This commit is contained in:
Vítor Santos Costa 2014-05-07 09:35:19 +01:00
parent 410efd577c
commit 06e29a4978
3 changed files with 7 additions and 7 deletions

2
configure vendored
View File

@ -15419,7 +15419,7 @@ if test "$yap_cv_swig" = "no"; then
PKG_SWIG=""
elif test -e "$srcdir"/packages/swig/Makefile.in ; then
SWIG_TARGET="all"
PKG_SWIG="swig"
PKG_SWIG="packages/swig"
fi
if test "$PKG_SWIG" != ""; then

View File

@ -28,16 +28,16 @@ python/yap_wrap.c: $(srcdir)/yap.i
python/yap_wrap.o: python/yap_wrap.c
$(CXX) -c $(CXXFLAGS) @PYTHON_INCLUDES@ $< -o $@
java: java/libyap.@SO@ java/yap.java
java: jni/libyap.@SO@ java/yap.java
cd java ; $(JAVAC) *.java; $(JAR) cvf yap.jar *.class
java/libyap.@SO@: jni/yap_wrap.o
$(CXX) -shared $(LDSOFLAGS) -L ../.. -lYap -o java/libyap.@SO@ ../../yapi.o java/yap_wrap.o $(LIBS) @JPLLDFLAGS@ -L ../.. -lYap -lpthread
jni/libyap.@SO@: jni/yap_wrap.o
$(CXX) -shared $(LDSOFLAGS) -L ../.. -lYap -o $@ ../../yapi.o $< $(LIBS) @JPLLDFLAGS@ -L ../.. -lYap -lpthread
jni/yap_wrap.c: $(srcdir)/yap.i
$(SWIG) -c++ -java -package pt.up.fc.dcc.yap -outdir src/pt/up/fc/dcc/yap -o $@ $(DEFS) $(CPPFLAGS) -Wall $<
$(SWIG) -c++ -java -package pt.up.fc.dcc.yap -outdir java -o $@ $(DEFS) $(CPPFLAGS) -Wall $<
java/yap_wrap.o: java/yap_wrap.c
jni/yap_wrap.o: jni/yap_wrap.c
$(CXX) -c $(CXXFLAGS) @JPLCFLAGS@ $< -o $@
R:

View File

@ -16,7 +16,7 @@ if test "$yap_cv_swig" = "no"; then
PKG_SWIG=""
elif test -e "$srcdir"/packages/swig/Makefile.in ; then
SWIG_TARGET="all"
PKG_SWIG="swig"
PKG_SWIG="packages/swig"
fi
if test "$PKG_SWIG" != ""; then