diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DLL cleanup (yet again)

Browse Source
This commit is contained in:
Vítor Santos Costa 2010-06-14 09:28:20 +01:00
parent de336d7ffe
commit b0096fc2f5
17 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -336,7 +336,7 @@ parms.h: Makefile
@echo "#define YAP_CC \"$(CC)\"" >> $@%
@echo "#define YAP_CFLAGS \"$(CFLAGS)\"" >> $@%
@echo "#define YAP_LDFLAGS \"$(LDFLAGS)\"" >> $@%
@echo "#define YAP_SHLIB_SUFFIX \"$(SHLIB_SUFFIX)\"" >> $@%
@echo "#define YAP_SHLIB_SUFFIX \".\" \"$(SHLIB_SUFFIX)\"" >> $@%
@echo "#define YAP_TIMESTAMP \"`date +%s`\"" >> $@%
@echo "#define YAP_SVERSION \"YAP $(VERSION) ($(ARCH)): `date`\"" >> $@%
@if cmp -s $@% $@; then rm $@%; else mv $@% $@; fi

36
configure vendored
View File

@ -5034,7 +5034,6 @@ fi
EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll"
fi
EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_DLLS \$(abs_top_builddir)/packages/PLStream/plstream.dll"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpsapi" >&5
$as_echo_n "checking for main in -lpsapi... " >&6; }
if test "${ac_cv_lib_psapi_main+set}" = set; then :
@ -6632,7 +6631,7 @@ fi
if test "$have_dl" = "yes"
then
SHLIB_SUFFIX=".so"
SHLIB_SUFFIX="so"
SHLIB_LD="$CC -shared -export-dynamic"
SHLIB_CXX_LD="$CXX -shared -export-dynamic"
DO_SECOND_LD=""
@ -6667,7 +6666,7 @@ fi
then
LIBS="$LIBS -lnsl"
fi
SHLIB_SUFFIX=".o"
SHLIB_SUFFIX="o"
INSTALL_DLLS=""
;;
*hpux*)
@ -6685,7 +6684,7 @@ fi
SHLIB_LD="$CC -shared -export-dynamic"
SHLIB_CXX_LD="$CXX -shared -export-dynamic"
DO_SECOND_LD=""
SHLIB_SUFFIX=".sl"
SHLIB_SUFFIX="sl"
SHLIB_CFLAGS="+z"
INSTALL_DLLS=""
# If the xnet library was found, turn on X/Open networking
@ -6711,7 +6710,7 @@ fi
# To actually use dlls in AIX I'd need to build YAP as a DLL first.
# I won't bother for now.
#
# SHLIB_SUFFIX=".a"
# SHLIB_SUFFIX="a"
#SHLIB_LD="\$(srcdir)/../../ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
#INSTALL_DLLS=""
;;
@ -6761,14 +6760,14 @@ else
have_dl=no
fi
SHLIB_SUFFIX=".so"
SHLIB_SUFFIX="so"
SHLIB_LD="ld -shared -expect_unresolved '*'"
DO_SECOND_LD=""
fi
;;
*irix6*)
SHLIB_CFLAGS=""
SHLIB_SUFFIX=".so"
SHLIB_SUFFIX="so"
DO_SECOND_LD=""
SHLIB_LD="ld -n32 -shared -rdata_shared"
SHLIB_CXX_LD="$SHLIB_LD"
@ -6826,7 +6825,7 @@ fi
fi
fi
SHLIB_CFLAGS="-fno-common"
SHLIB_SUFFIX=".dylib"
SHLIB_SUFFIX="dylib"
DO_SECOND_LD=""
# SHLIB_LD="$CC -bundle -bundle_loader \$(abs_top_builddir)/yap -L\$(abs_top_builddir) -lYap -undefined dynamic_lookup -Wl,-x -dead-strip -dead_strip_dylibs"
# LDFLAGS="-Wl,-x -dead_strip -dead_strip_dylibs $LDFLAGS"
@ -6840,7 +6839,7 @@ fi
then
#an a.out system
SHLIB_CFLAGS=""
SHLIB_SUFFIX=".o"
SHLIB_SUFFIX="o"
else
#an elf system
LDFLAGS="-Wl,--export-dynamic $LDFLAGS"
@ -6848,7 +6847,7 @@ fi
SHLIB_LD="ld -Bshareable -x"
SHLIB_CXX_LD="$SHLIB_LD"
DO_SECOND_LD=""
SHLIB_SUFFIX=".so"
SHLIB_SUFFIX="so"
INSTALL_DLLS=""
fi
;;
@ -6859,7 +6858,7 @@ fi
SHLIB_LD="$CC -shared"
SHLIB_CXX_LD="$CXX -shared"
DO_SECOND_LD=""
SHLIB_SUFFIX=".so"
SHLIB_SUFFIX="so"
INSTALL_DLLS=""
;;
*cyg*|*mingw*)
@ -6873,7 +6872,7 @@ fi
fi
SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols"
SHLIB_CXX_LD="\$(CXX) -shared -Wl,--export-all-symbols"
SHLIB_SUFFIX=".dll"
SHLIB_SUFFIX="dll"
C_PARSER_FLAGS="$C_INTERF_FLAGS"
EXEC_SUFFIX=".exe"
INSTALL_DLLS=""
@ -6927,7 +6926,7 @@ fi
if test "$have_dl" = yes
then
SHLIB_SUFFIX=".o"
SHLIB_SUFFIX="o"
LIBS="$LIBS -ldl"
INSTALL_DLLS=""
if test "$GCC" = "yes"
@ -6953,7 +6952,7 @@ then
INSTALL_ENV=""
;;
*darwin*)
DYNYAPLIB=libYap"$SHLIB_SUFFIX"
DYNYAPLIB=libYap."$SHLIB_SUFFIX"
YAPLIB="$DYNYAPLIB"
DYNLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib"
PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)"
@ -6962,10 +6961,9 @@ then
;;
*)
LDFLAGS="$LDFLAGS -L \$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
DYNYAPLIB=libYap"$SHLIB_SUFFIX"
DYNYAPLIB=libYap."$SHLIB_SUFFIX"
YAPLIB="$DYNYAPLIB"
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L \$(abs_top_builddir) -lYap -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)"
EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_DLLS -L \$(abs_top_builddir)/packages/PLStream/plstream.$SHLIB_SUFFIX"
PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
;;
@ -6975,6 +6973,8 @@ else
DYNYAPLIB=libYap.notused
fi
EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_DLLS -L \$(abs_top_builddir)/packages/PLStream -lplstream"
if test "$coroutining" = "yes"
then
YAP_EXTRAS="$YAP_EXTRAS -DCOROUTINING=1"
@ -7357,7 +7357,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lam_main" >&5
$as_echo "$ac_cv_lib_lam_main" >&6; }
if test "x$ac_cv_lib_lam_main" = x""yes; then :
LAMOBJS=yap_mpi"$SHLIB_SUFFIX"
LAMOBJS=yap_mpi."$SHLIB_SUFFIX"
else
LAMOBJS=no
fi
@ -9028,7 +9028,7 @@ fi
PROLOG_SYSTEM=yap
IN_YAP=
IN_SWI="#"
CHR_TARGETS=chr_support"$SHLIB_SUFFIX"
CHR_TARGETS=chr_support."$SHLIB_SUFFIX"

36
configure.in
View File

@ -566,7 +566,6 @@ then
AC_CHECK_LIB(wsock32,main)
EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll"
fi
EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_DLLS \$(abs_top_builddir)/packages/PLStream/plstream.dll"
AC_CHECK_LIB(psapi,main)
yap_cv_readline=no
if test "$prefix" = "NONE"
@ -855,7 +854,7 @@ case "$target_os" in
have_dl=no)
if test "$have_dl" = "yes"
then
SHLIB_SUFFIX=".so"
SHLIB_SUFFIX="so"
SHLIB_LD="$CC -shared -export-dynamic"
SHLIB_CXX_LD="$CXX -shared -export-dynamic"
DO_SECOND_LD=""
@ -890,7 +889,7 @@ case "$target_os" in
then
LIBS="$LIBS -lnsl"
fi
SHLIB_SUFFIX=".o"
SHLIB_SUFFIX="o"
INSTALL_DLLS=""
;;
*hpux*)
@ -907,7 +906,7 @@ case "$target_os" in
SHLIB_LD="$CC -shared -export-dynamic"
SHLIB_CXX_LD="$CXX -shared -export-dynamic"
DO_SECOND_LD=""
SHLIB_SUFFIX=".sl"
SHLIB_SUFFIX="sl"
SHLIB_CFLAGS="+z"
INSTALL_DLLS=""
# If the xnet library was found, turn on X/Open networking
@ -930,7 +929,7 @@ case "$target_os" in
# To actually use dlls in AIX I'd need to build YAP as a DLL first.
# I won't bother for now.
#
# SHLIB_SUFFIX=".a"
# SHLIB_SUFFIX="a"
#SHLIB_LD="\$(srcdir)/../../ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
#INSTALL_DLLS=""
;;
@ -942,14 +941,14 @@ dnl Linux has both elf and a.out, in this case we found elf
have_dl=yes
,
have_dl=no)
SHLIB_SUFFIX=".so"
SHLIB_SUFFIX="so"
SHLIB_LD="ld -shared -expect_unresolved '*'"
DO_SECOND_LD=""
fi
;;
*irix6*)
SHLIB_CFLAGS=""
SHLIB_SUFFIX=".so"
SHLIB_SUFFIX="so"
DO_SECOND_LD=""
SHLIB_LD="ld -n32 -shared -rdata_shared"
SHLIB_CXX_LD="$SHLIB_LD"
@ -968,7 +967,7 @@ dnl Linux has both elf and a.out, in this case we found elf
fi
fi
SHLIB_CFLAGS="-fno-common"
SHLIB_SUFFIX=".dylib"
SHLIB_SUFFIX="dylib"
DO_SECOND_LD=""
# SHLIB_LD="$CC -bundle -bundle_loader \$(abs_top_builddir)/yap -L\$(abs_top_builddir) -lYap -undefined dynamic_lookup -Wl,-x -dead-strip -dead_strip_dylibs"
# LDFLAGS="-Wl,-x -dead_strip -dead_strip_dylibs $LDFLAGS"
@ -982,7 +981,7 @@ dnl Linux has both elf and a.out, in this case we found elf
then
#an a.out system
SHLIB_CFLAGS=""
SHLIB_SUFFIX=".o"
SHLIB_SUFFIX="o"
else
#an elf system
LDFLAGS="-Wl,--export-dynamic $LDFLAGS"
@ -990,7 +989,7 @@ dnl Linux has both elf and a.out, in this case we found elf
SHLIB_LD="ld -Bshareable -x"
SHLIB_CXX_LD="$SHLIB_LD"
DO_SECOND_LD=""
SHLIB_SUFFIX=".so"
SHLIB_SUFFIX="so"
INSTALL_DLLS=""
fi
;;
@ -1001,7 +1000,7 @@ dnl Linux has both elf and a.out, in this case we found elf
SHLIB_LD="$CC -shared"
SHLIB_CXX_LD="$CXX -shared"
DO_SECOND_LD=""
SHLIB_SUFFIX=".so"
SHLIB_SUFFIX="so"
INSTALL_DLLS=""
;;
*cyg*|*mingw*)
@ -1015,7 +1014,7 @@ dnl Linux has both elf and a.out, in this case we found elf
fi
SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols"
SHLIB_CXX_LD="\$(CXX) -shared -Wl,--export-all-symbols"
SHLIB_SUFFIX=".dll"
SHLIB_SUFFIX="dll"
C_PARSER_FLAGS="$C_INTERF_FLAGS"
EXEC_SUFFIX=".exe"
INSTALL_DLLS=""
@ -1030,7 +1029,7 @@ dnl Linux has both elf and a.out, in this case we found elf
have_dl=no)
if test "$have_dl" = yes
then
SHLIB_SUFFIX=".o"
SHLIB_SUFFIX="o"
LIBS="$LIBS -ldl"
INSTALL_DLLS=""
if test "$GCC" = "yes"
@ -1056,7 +1055,7 @@ then
INSTALL_ENV=""
;;
*darwin*)
DYNYAPLIB=libYap"$SHLIB_SUFFIX"
DYNYAPLIB=libYap."$SHLIB_SUFFIX"
YAPLIB="$DYNYAPLIB"
DYNLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib"
PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)"
@ -1065,10 +1064,9 @@ then
;;
*)
LDFLAGS="$LDFLAGS -L \$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
DYNYAPLIB=libYap"$SHLIB_SUFFIX"
DYNYAPLIB=libYap."$SHLIB_SUFFIX"
YAPLIB="$DYNYAPLIB"
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L \$(abs_top_builddir) -lYap -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)"
EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_DLLS -L \$(abs_top_builddir)/packages/PLStream/plstream.$SHLIB_SUFFIX"
PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
;;
@ -1078,6 +1076,8 @@ else
DYNYAPLIB=libYap.notused
fi
EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_DLLS -L \$(abs_top_builddir)/packages/PLStream -lplstream"
if test "$coroutining" = "yes"
then
YAP_EXTRAS="$YAP_EXTRAS -DCOROUTINING=1"
@ -1198,7 +1198,7 @@ AC_SUBST(PRE_INSTALL_ENV)
OLD_CC=${CC}
CC=${LAM_MPI_CC}
AC_CHECK_LIB([lam], [main],
LAMOBJS=yap_mpi"$SHLIB_SUFFIX",
LAMOBJS=yap_mpi."$SHLIB_SUFFIX",
LAMOBJS=no)
CC=${OLD_CC}
@ -1645,7 +1645,7 @@ dnl SWI compatibility support!
PROLOG_SYSTEM=yap
IN_YAP=
IN_SWI="#"
CHR_TARGETS=chr_support"$SHLIB_SUFFIX"
CHR_TARGETS=chr_support."$SHLIB_SUFFIX"
AC_SUBST(PROLOG_SYSTEM)
AC_SUBST(IN_YAP)

2
library/dialect/swi.yap
View File

@ -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.

8
library/lammpi/Makefile.in
View File

@ -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

8
library/matlab/Makefile.in
View File

@ -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)

8
library/matrices/Makefile.in
View File

@ -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)

8
library/matrix/Makefile.in
View File

@ -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)

8
library/random/Makefile.in
View File

@ -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)

24
library/regex/Makefile.in
View File

@ -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)

8
library/rltree/Makefile.in
View File

@ -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

8
library/system/Makefile.in
View File

@ -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)

12
library/tries/Makefile.in
View File

@ -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)

8
packages/PLStream/Makefile.in
View File

@ -63,7 +63,7 @@ OBJS=pl-buffer.o pl-ctype.o pl-error.o \
pl-stream.o pl-string.o pl-table.o \
pl-text.o pl-util.o pl-utf8.o \
pl-yap.o @ENABLE_WINCONSOLE@ uxnt.o
SOBJS=plstream@SHLIB_SUFFIX@
SOBJS=libplstream.@SHLIB_SUFFIX@
#in some systems we just create a single object, in others we need to
# create a libray
@ -77,11 +77,11 @@ uxnt.o: $(srcdir)/uxnt/uxnt.c
%.o : $(srcdir)/%.c
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $< -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@plstream@SHLIB_SUFFIX@: $(OBJS)
@DO_SECOND_LD@ @SHLIB_LD@ -o plstream@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@libplstream.@SHLIB_SUFFIX@: $(OBJS)
@DO_SECOND_LD@ @SHLIB_LD@ -o libplstream.@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)

6
packages/cplint/Makefile.in
View File

@ -42,7 +42,7 @@ CPLINT_LIBS=@CPLINT_LIBS@
CWD=$(PWD)
#
OBJS=cplint_yap.o cplint_Prob.o
SOBJS=cplint@SHLIB_SUFFIX@
SOBJS=cplint.@SHLIB_SUFFIX@
@ -154,8 +154,8 @@ cplint_Prob.o: $(srcdir)/cplint_Prob.c $(srcdir)/cplint.h
@DO_SECOND_LD@cplint@SHLIB_SUFFIX@: cplint_yap.o cplint_Prob.o
@DO_SECOND_LD@ @CPLINT_SHLIB_LD@ -o cplint@SHLIB_SUFFIX@ $(CPLINT_LDFLAGS) cplint_yap.o cplint_Prob.o $(CPLINT_LIBS) @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@cplint.@SHLIB_SUFFIX@: cplint_yap.o cplint_Prob.o
@DO_SECOND_LD@ @CPLINT_SHLIB_LD@ -o cplint.@SHLIB_SUFFIX@ $(CPLINT_LDFLAGS) cplint_yap.o cplint_Prob.o $(CPLINT_LIBS) @EXTRA_LIBS_FOR_DLLS@
clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK

2
packages/jpl

@ -1 +1 @@
Subproject commit 89bfacef558f12074fa362a5148f9de24730f4b0
Subproject commit daefe60580876b2ab520e19d53bf085d2bb58552

6
packages/sgml/Makefile.in
View File

@ -41,7 +41,7 @@ SHLIB_SUFFIX=@SHLIB_SUFFIX@
CWD=$(PWD)
#
TARGETS= sgml2pl@SHLIB_SUFFIX@
TARGETS= sgml2pl.@SHLIB_SUFFIX@
else # SWI
@ -113,8 +113,8 @@ ifeq (@PROLOG_SYSTEM@,yap)
%.o : $(srcdir)/%.c
$(CC) $(CFLAGS) $(SHLIB_CFLAGS) -o $@ -c $<
@DO_SECOND_LD@sgml2pl@SHLIB_SUFFIX@: $(PLOBJ)
@DO_SECOND_LD@ @SHLIB_LD@ -o sgml2pl@SHLIB_SUFFIX@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@
@DO_SECOND_LD@sgml2pl.@SHLIB_SUFFIX@: $(PLOBJ)
@DO_SECOND_LD@ @SHLIB_LD@ -o sgml2pl.@SHLIB_SUFFIX@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@
all: $(TARGETS) $(PROGRAMS)