android debugging plus clean-ups

packages/myddas/Makefile.in

@@ -62,7 +62,7 @@ MYDDAS_PROLOG= \
 	myddas_assert_predicates.ypp \
 	myddas_mysql.ypp \
 	myddas_sqlite3.ypp \
-        myddas_top_level.ypp \
+    myddas_top_level.ypp \
 	myddas_errors.ypp \
 	myddas_postgres.ypp \
 	myddas_prolog2sql.ypp \
@@ -85,7 +85,7 @@ all: $(SOBJS) $(MYDDAS_YAP)
 	$(CC) -c $(CFLAGS) $< -o $@
 
 %.yap: $(srcdir)/pl/%.ypp
-	$(ECPP) $(YAP_EXTRAS) -P -w $< -o $@
+	$(ECPP) $(YAP_EXTRAS) -P -w $< > $@
 
 @DO_SECOND_LD@%.@SO@: $(OBJS)
 	@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ @MYDDAS_LIBS@

packages/myddas/configure.in

@@ -195,14 +195,14 @@ else
 	ENABLE_MYDDAS=""
 fi
 
-INCLUDE_MYDDAS="#"
+OBJECTS_MYDDAS="#"
 if test x"$ENABLE_MYDDAS" = x -a x"$STARTUP_ANDROID" = x
 then
 #in Android we have to actually include myddas in the binary
-	INCLUDE_MYDDAS=""
+	OBJECTS_MYDDAS="$(ALL_MYDDAS_OBJECTS)"
 fi
 
 AC_SUBST(PKG_MYDDAS)
-AC_SUBST(INCLUDE_MYDDAS)
+AC_SUBST(OBJECTS_MYDDAS)
 AC_SUBST(MYDDAS_CPPFLAGS)
 AC_SUBST(MYDDAS_LIBS)

packages/myddas/myddas_shared.c

@@ -127,7 +127,7 @@ c_db_connection_type ( USES_REGS1 ){
 
   switch (type) {
   case API_MYSQL:
-    /* MYSQL Connection */    
+    /* MYSQL Connection */
     return Yap_unify(arg_type, MkAtomTerm(Yap_LookupAtom("mysql")));
   case API_ODBC:
     /* ODBC Connection */