DLL cleanup (yet again)
This commit is contained in:
@@ -93,7 +93,7 @@
|
||||
|
||||
:- set_prolog_flag(user_flags,silent).
|
||||
|
||||
:- load_foreign_files([plstream], [], initIO).
|
||||
:- load_foreign_files([libplstream], [], initIO).
|
||||
|
||||
% Time is given as a float in SWI-Prolog.
|
||||
swi_get_time(FSecs) :- datime(Datime), mktime(Datime, Secs), FSecs is Secs*1.0.
|
||||
|
||||
@@ -44,7 +44,7 @@ MPICF=`$(MPI_CC) -showme| cut -d " " -f 2`
|
||||
|
||||
OBJS=yap_mpi.o hash.o prologterms2c.o
|
||||
SOBJS=@LAMOBJS@
|
||||
#yap_mpi@SHLIB_SUFFIX@
|
||||
#yap_mpi.@SHLIB_SUFFIX@
|
||||
|
||||
#in some systems we just create a single object, in others we need to
|
||||
# create a libray
|
||||
@@ -60,11 +60,11 @@ prologterms2c.o: $(srcdir)/prologterms2c.c $(srcdir)/prologterms2c.h
|
||||
hash.o: $(srcdir)/hash.c $(srcdir)/hash.h
|
||||
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/hash.c -o hash.o
|
||||
|
||||
@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@%.@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
@DO_SECOND_LD@yap_mpi@SHLIB_SUFFIX@: $(OBJS)
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ $(MPILDF) -o yap_mpi@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
|
||||
@DO_SECOND_LD@yap_mpi.@SHLIB_SUFFIX@: $(OBJS)
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ $(MPILDF) -o yap_mpi.@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
install: all
|
||||
@if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR); fi
|
||||
|
||||
@@ -37,7 +37,7 @@ CWD=$(PWD)
|
||||
#
|
||||
|
||||
OBJS=matlab.o
|
||||
SOBJS=matlab@SHLIB_SUFFIX@
|
||||
SOBJS=matlab.@SHLIB_SUFFIX@
|
||||
|
||||
#in some systems we just create a single object, in others we need to
|
||||
# create a libray
|
||||
@@ -47,11 +47,11 @@ all: $(SOBJS)
|
||||
matlab.o: $(srcdir)/matlab.c
|
||||
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/matlab.c -o matlab.o
|
||||
|
||||
@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@%.@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
@DO_SECOND_LD@matlab@SHLIB_SUFFIX@: matlab.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o matlab@SHLIB_SUFFIX@ matlab.o @EXTRA_LIBS_FOR_DLLS@
|
||||
@DO_SECOND_LD@matlab.@SHLIB_SUFFIX@: matlab.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o matlab.@SHLIB_SUFFIX@ matlab.o @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
install: all
|
||||
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
|
||||
|
||||
@@ -36,7 +36,7 @@ CWD=$(PWD)
|
||||
#
|
||||
|
||||
OBJS=matrix.o
|
||||
SOBJS=matrix@SHLIB_SUFFIX@
|
||||
SOBJS=matrix.@SHLIB_SUFFIX@
|
||||
|
||||
#in some systems we just create a single object, in others we need to
|
||||
# create a libray
|
||||
@@ -46,11 +46,11 @@ all: $(SOBJS)
|
||||
matrix.o: $(srcdir)/matrix.c
|
||||
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/matrix.c -o matrix.o
|
||||
|
||||
@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@%.@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $<
|
||||
|
||||
@DO_SECOND_LD@matrix@SHLIB_SUFFIX@: matrix.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o matrix@SHLIB_SUFFIX@ matrix.o
|
||||
@DO_SECOND_LD@matrix.@SHLIB_SUFFIX@: matrix.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o matrix.@SHLIB_SUFFIX@ matrix.o
|
||||
|
||||
install: all
|
||||
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
|
||||
|
||||
@@ -37,7 +37,7 @@ CWD=$(PWD)
|
||||
#
|
||||
|
||||
OBJS=matrix.o
|
||||
SOBJS=matrix@SHLIB_SUFFIX@
|
||||
SOBJS=matrix.@SHLIB_SUFFIX@
|
||||
|
||||
#in some systems we just create a single object, in others we need to
|
||||
# create a libray
|
||||
@@ -47,11 +47,11 @@ all: $(SOBJS)
|
||||
matrix.o: $(srcdir)/matrix.c
|
||||
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/matrix.c -o matrix.o
|
||||
|
||||
@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@%.@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
@DO_SECOND_LD@matrix@SHLIB_SUFFIX@: matrix.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o matrix@SHLIB_SUFFIX@ matrix.o @EXTRA_LIBS_FOR_DLLS@
|
||||
@DO_SECOND_LD@matrix.@SHLIB_SUFFIX@: matrix.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o matrix.@SHLIB_SUFFIX@ matrix.o @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
install: all
|
||||
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
|
||||
|
||||
@@ -37,7 +37,7 @@ CWD=$(PWD)
|
||||
#
|
||||
|
||||
OBJS=random.o
|
||||
SOBJS=random@SHLIB_SUFFIX@
|
||||
SOBJS=random.@SHLIB_SUFFIX@
|
||||
|
||||
#in some systems we just create a single object, in others we need to
|
||||
# create a libray
|
||||
@@ -47,11 +47,11 @@ all: $(SOBJS)
|
||||
random.o: $(srcdir)/random.c
|
||||
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/random.c -o random.o
|
||||
|
||||
@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@%.@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
@DO_SECOND_LD@random@SHLIB_SUFFIX@: random.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o random@SHLIB_SUFFIX@ random.o @EXTRA_LIBS_FOR_DLLS@
|
||||
@DO_SECOND_LD@random.@SHLIB_SUFFIX@: random.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o random.@SHLIB_SUFFIX@ random.o @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
install: all
|
||||
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
|
||||
|
||||
@@ -37,7 +37,7 @@ CWD=$(PWD)
|
||||
#
|
||||
|
||||
OBJS=regexp.o @NO_BUILTIN_REGEXP@ regcomp.o regexec.o regerror.o regfree.o
|
||||
SOBJS=regexp@SHLIB_SUFFIX@ @NO_BUILTIN_REGEXP@ regcomp@SHLIB_SUFFIX@ regexec@SHLIB_SUFFIX@ regerror@SHLIB_SUFFIX@ regfree@SHLIB_SUFFIX@
|
||||
SOBJS=regexp.@SHLIB_SUFFIX@ @NO_BUILTIN_REGEXP@ regcomp@SHLIB_SUFFIX@ regexec@SHLIB_SUFFIX@ regerror@SHLIB_SUFFIX@ regfree@SHLIB_SUFFIX@
|
||||
|
||||
#in some systems we just create a single object, in others we need to
|
||||
# create a libray
|
||||
@@ -59,23 +59,23 @@ regfree.o: $(srcdir)/regfree.c $(srcdir)/regex2.h
|
||||
regexec.o: $(srcdir)/regexec.c
|
||||
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/regexec.c -o regexec.o
|
||||
|
||||
@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@%.@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
@DO_SECOND_LD@regexp@SHLIB_SUFFIX@: regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o regexp@SHLIB_SUFFIX@ regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o @EXTRA_LIBS_FOR_DLLS@
|
||||
@DO_SECOND_LD@regexp.@SHLIB_SUFFIX@: regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o regexp.@SHLIB_SUFFIX@ regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
@DO_SECOND_LD@regcomp@SHLIB_SUFFIX@: regcomp.o @MERGE_DLL_OBJS@ regfree.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o regcomp@SHLIB_SUFFIX@ regcomp.o @MERGE_DLL_OBJS@ regfree.o @EXTRA_LIBS_FOR_DLLS@
|
||||
@DO_SECOND_LD@regcomp.@SHLIB_SUFFIX@: regcomp.o @MERGE_DLL_OBJS@ regfree.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o regcomp.@SHLIB_SUFFIX@ regcomp.o @MERGE_DLL_OBJS@ regfree.o @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
@DO_SECOND_LD@regerror@SHLIB_SUFFIX@: regerror.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o regerror@SHLIB_SUFFIX@ regerror.o @EXTRA_LIBS_FOR_DLLS@
|
||||
@DO_SECOND_LD@regerror.@SHLIB_SUFFIX@: regerror.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o regerror.@SHLIB_SUFFIX@ regerror.o @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
@DO_SECOND_LD@regfree@SHLIB_SUFFIX@: regfree.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o regfree@SHLIB_SUFFIX@ regfree.o @EXTRA_LIBS_FOR_DLLS@
|
||||
@DO_SECOND_LD@regfree.@SHLIB_SUFFIX@: regfree.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o regfree.@SHLIB_SUFFIX@ regfree.o @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
@DO_SECOND_LD@regexec@SHLIB_SUFFIX@: regexec.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o regexec@SHLIB_SUFFIX@ regexec.o @EXTRA_LIBS_FOR_DLLS@
|
||||
@DO_SECOND_LD@regexec.@SHLIB_SUFFIX@: regexec.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o regexec.@SHLIB_SUFFIX@ regexec.o @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
install: all
|
||||
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
|
||||
|
||||
@@ -40,7 +40,7 @@ SHLIB_SUFFIX=@SHLIB_SUFFIX@
|
||||
#
|
||||
|
||||
OBJS=yaprl.o range_list.o
|
||||
SOBJS=yap_rl@SHLIB_SUFFIX@
|
||||
SOBJS=yap_rl.@SHLIB_SUFFIX@
|
||||
|
||||
#in some systems we just create a single object, in others we need to
|
||||
# create a libray
|
||||
@@ -52,11 +52,11 @@ range_list.o: $(srcdir)/range_list.c $(srcdir)/range_list.h
|
||||
yaprl.o: $(srcdir)/yap_rl.c
|
||||
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/yap_rl.c -o yaprl.o
|
||||
|
||||
@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@%.@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
@DO_SECOND_LD@yap_rl@SHLIB_SUFFIX@: $(OBJS)
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o yap_rl@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
|
||||
@DO_SECOND_LD@yap_rl.@SHLIB_SUFFIX@: $(OBJS)
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o yap_rl.@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
install: all
|
||||
@if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR); fi
|
||||
|
||||
@@ -37,7 +37,7 @@ CWD=$(PWD)
|
||||
#
|
||||
|
||||
OBJS=sys.o
|
||||
SOBJS=sys@SHLIB_SUFFIX@
|
||||
SOBJS=sys.@SHLIB_SUFFIX@
|
||||
|
||||
#in some systems we just create a single object, in others we need to
|
||||
# create a libray
|
||||
@@ -47,11 +47,11 @@ all: $(SOBJS)
|
||||
sys.o: $(srcdir)/sys.c
|
||||
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/sys.c -o sys.o
|
||||
|
||||
@DO_SECOND_LD@@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@@DO_SECOND_LD@%.@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
@DO_SECOND_LD@sys@SHLIB_SUFFIX@: sys.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o sys@SHLIB_SUFFIX@ sys.o @EXTRA_LIBS_FOR_DLLS@
|
||||
@DO_SECOND_LD@sys.@SHLIB_SUFFIX@: sys.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o sys.@SHLIB_SUFFIX@ sys.o @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
install: all
|
||||
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
|
||||
|
||||
@@ -37,7 +37,7 @@ CWD=$(PWD)
|
||||
#
|
||||
|
||||
OBJS=core_tries.o base_tries.o tries.o base_itries.o itries.o
|
||||
SOBJS=tries@SHLIB_SUFFIX@ itries@SHLIB_SUFFIX@
|
||||
SOBJS=tries.@SHLIB_SUFFIX@ itries.@SHLIB_SUFFIX@
|
||||
|
||||
#in some systems we just create a single object, in others we need to
|
||||
# create a libray
|
||||
@@ -59,14 +59,14 @@ base_itries.o: $(srcdir)/core_tries.h $(srcdir)/base_itries.h $(srcdir)/base_itr
|
||||
itries.o: $(srcdir)/core_tries.h $(srcdir)/base_itries.h $(srcdir)/itries.c
|
||||
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/itries.c -o itries.o
|
||||
|
||||
@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@%.@SHLIB_SUFFIX@: %.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
@DO_SECOND_LD@tries@SHLIB_SUFFIX@: core_tries.o base_tries.o tries.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o tries@SHLIB_SUFFIX@ core_tries.o base_tries.o tries.o @EXTRA_LIBS_FOR_DLLS@
|
||||
@DO_SECOND_LD@tries.@SHLIB_SUFFIX@: core_tries.o base_tries.o tries.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o tries.@SHLIB_SUFFIX@ core_tries.o base_tries.o tries.o @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
@DO_SECOND_LD@itries@SHLIB_SUFFIX@: core_tries.o base_itries.o itries.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o itries@SHLIB_SUFFIX@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@
|
||||
@DO_SECOND_LD@itries.@SHLIB_SUFFIX@: core_tries.o base_itries.o itries.o
|
||||
@DO_SECOND_LD@ @SHLIB_LD@ -o itries.@SHLIB_SUFFIX@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@
|
||||
|
||||
install: all
|
||||
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
|
||||
|
||||
Reference in New Issue
Block a user