diff --git a/packages/swig/Android.mk.in b/packages/swig/Android.mk.in
index a0fb7b1e6..d62f6d4eb 100644
--- a/packages/swig/Android.mk.in
+++ b/packages/swig/Android.mk.in
@@ -6,7 +6,7 @@ include $(CLEAR_VARS)
 
 LOCAL_LDLIBS := -landroid -llog
 LOCAL_MODULE    := yap0
-LOCAL_SRC_FILES += @abs_top_builddir@/../../gmp-android/lib/libgmp.so
+LOCAL_SRC_FILES += @abs_top_builddir@/../gmp-android/lib/libgmp.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -24,7 +24,7 @@ LOCAL_MODULE    := example
 LOCAL_SHARED_LIBRARIES := yap0  yap1
 LOCAL_STATIC_LIBRARIES := @abs_top_builddir@/libYap.ar
 LOCAL_SRC_FILES +=  @abs_top_builddir@/packages/swig/android/jni/yap_wrap.cpp
-LOCAL_C_INCLUDES :=  @abs_top_builddir@ @abs_top_builddir@/../../gmp-android/include @srcdir@/../../H @srcdir@/../../include  @srcdir@/../../os @srcdir@/../../OPTYap @srcdir@/../../BEAM @srcdir@/../../CXX
+LOCAL_C_INCLUDES :=  @abs_top_builddir@ @abs_top_builddir@/../gmp-android/include @srcdir@/../../H @srcdir@/../../include  @srcdir@/../../os @srcdir@/../../OPTYap @srcdir@/../../BEAM @srcdir@/../../CXX
 LOCAL_CFLAGS := @YAP_EXTRAS@ @DEFS@ -D_YAP_NOT_INSTALLED_=1 -DDESTDIR=\"\"
 LOCAL_CPP_FEATURES := rtti
 # LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
diff --git a/packages/swig/Makefile.in b/packages/swig/Makefile.in
index d342605fb..f93dc684f 100644
--- a/packages/swig/Makefile.in
+++ b/packages/swig/Makefile.in
@@ -9,7 +9,7 @@ DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1 -DDESTDIR=\"$(DESTDIR)\"
 YAP_EXTRAS=@YAP_EXTRAS@
 srcdir=@srcdir@
 CPPFLAGS= -I../.. -I$(srcdir)/../../H -I$(srcdir)/../../include  -I$(srcdir)/../../os -I$(srcdir)/../../OPTYap -I$(srcdir)/../../BEAM -I$(srcdir)/../../CXX
-CXXFLAGS=   $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
+CXXFLAGS=  $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
 
 PROGRAMS= $(srcdir)/python/demo.py \
 
@@ -22,14 +22,14 @@ python: $(SWIG_FILES) python/_yap.so python/yap.py
 	cp $(srcdir)/python/demo.py python
 
 python/_yap.so: python/yap_wrap.o
-	$(CXX) -shared $(LDSOFLAGS) -o python/_yap.so python/yap_wrap.o ../../yapi.o $(LIBS) @PYTHON_LIBS@ -L ../.. -lYap -lpthrea
+	$(CXX) -shared $(LDSOFLAGS) -o python/_yap.so python/yap_wrap.o ../../yapi.o $(LIBS) @PYTHON_LIBS@ -L ../.. -lYap -lpthread
 
 python/yap_wrap.cpp python/yap.py: $(srcdir)/yap.i
 	mkdir -p python
 	$(SWIG) -c++ -python  -outdir python -o $@ $(CXXFLAGS) -Wall $<
 
 python/yap_wrap.o:  python/yap_wrap.cpp
-	$(CXX) -c $(CXXFLAGS) @PYTHON_INCLUDES@ $< -o $@
+	$(CXX) -c  @SHLIB_CXXFLAGS@ $(CXXFLAGS) @PYTHON_INCLUDES@ $< -o $@
 
 java: jni/libyap.@SO@ java/yap.java
 	cd java ; $(JAVAC) *.java; $(JAR) cvf yap.jar *.class			
@@ -41,7 +41,7 @@ jni/yap_wrap.cpp java/yap.java: $(srcdir)/yap.i
 	$(SWIG) -c++ -java  -package pt.up.fc.dcc.yap -outdir java -o jni/yap_wrap.cpp  $(CXXFLAGS) -Wall $<
 
 jni/yap_wrap.o:  jni/yap_wrap.cpp
-	$(CXX) -c $(CXXFLAGS) @JPLCFLAGS@  $< -o $@
+	$(CXX) -c  @SHLIB_CXXFLAGS@ $(CXXFLAGS) @JPLCFLAGS@  $< -o $@
 
 # depends on make install on top-level
 # also, should have an android device running, say