move yap2swi.o to main.

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1923 b08c6af1-5177-4d33-ba66-4b1c6b8b522a

Makefile.in

@@ -218,7 +218,9 @@ ENGINE_OBJECTS = \
 	modules.o other.o   \
 	parser.o readutil.o save.o scanner.o sort.o stdpreds.o \
 	sysbits.o threads.o tracer.o \
-	unify.o userpreds.o utilpreds.o write.o ypsocks.o ypstdio.o @MPI_OBJS@
+	unify.o userpreds.o utilpreds.o \
+	write.o \
+	yap2swi.o ypsocks.o ypstdio.o @MPI_OBJS@
 
 C_INTERFACE_OBJECTS = \
 	load_foreign.o load_dl.o load_dld.o load_dyld.o \
@@ -234,7 +236,7 @@ BEAM_OBJECTS = \
 	eamamasm.o eam_showcode.o eamindex.o eam_am.o 
 
 STATIC_OBJECTS = \
-	@STATIC_MODE@sys.o random.o yap2swi.o regexp.o  @NO_BUILTIN_REGEXP@ regcomp.o regerror.o regfree.o regexec.o
+	@STATIC_MODE@sys.o random.o regexp.o  @NO_BUILTIN_REGEXP@ regcomp.o regerror.o regfree.o regexec.o
 
 LIB_OBJECTS = $(ENGINE_OBJECTS) $(C_INTERFACE_OBJECTS) $(OR_OBJECTS) $(BEAM_OBJECTS) $(STATIC_OBJECTS)
 

changes-5.1.html

@@ -16,6 +16,7 @@
 
 <h2>Yap-5.1.3:</h2>
 <ul>
+<li> FIXED: simplify Makefile of yap2swi by moving yap2swi.o to main.</li>
 <li> FIXED: tabling broken (obs from Will Benton).</li>
 <li> FIXED: updates to SWI C-interface and corresponding extensions to
 C-interface .</li>

library/yap2swi/Makefile.in

@@ -39,7 +39,9 @@ SOBJS=yap2swi@SHLIB_SUFFIX@
 #in some systems we just create a single object, in others we need to
 # create a libray
 
-all: $(SOBJS) 
+# compile yap2swi as part of the main YAP
+
+all:
 
 yap2swi.o: $(srcdir)/yap2swi.c $(srcdir)/yap2swi.h
 	$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/yap2swi.c -o yap2swi.o
@@ -48,9 +50,9 @@ yap2swi.o: $(srcdir)/yap2swi.c $(srcdir)/yap2swi.h
 @DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<
 
 @DO_SECOND_LD@yap2swi@SHLIB_SUFFIX@: yap2swi.o
-@DO_SECOND_LD@	@SHLIB_LD@ -o yap2swi@SHLIB_SUFFIX@ yap2swi.o
+@DO_SECOND_LD@	@SHLIB_LD@ -o yap2swi@SHLIB_SUFFIX@ yap2swi.o @
 
-install: all
+install: 
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
 
 clean: