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

use SO to make YAP makefiles closer to SWI's

Browse Source
This commit is contained in:
Vítor Santos Costa 2010-06-14 10:36:13 +01:00
parent b0096fc2f5
commit 6ddfecc861
18 changed files with 124 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@ -89,7 +89,7 @@ RANLIB=@RANLIB@
AR=@AR@
srcdir=@srcdir@
abs_top_builddir=@abs_top_builddir@
SHLIB_SUFFIX=@SHLIB_SUFFIX@
SO=@SO@
MAKEINFO=makeinfo
TEXI2DVI=texi2dvi
TEXI2HTML=texi2html
@ -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 \".\" \"$(SO)\"" >> $@%
@echo "#define YAP_TIMESTAMP \"`date +%s`\"" >> $@%
@echo "#define YAP_SVERSION \"YAP $(VERSION) ($(ARCH)): `date`\"" >> $@%
@if cmp -s $@% $@; then rm $@%; else mv $@% $@; fi

38
configure vendored
View File

@ -594,6 +594,8 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
CHR_TARGETS
PLTARGETS
TARGETS
IN_SWI
IN_YAP
PROLOG_SYSTEM
@ -637,7 +639,7 @@ SHLIB_CXX_LD
SHLIB_LD
DO_SECOND_LD
EXEC_SUFFIX
SHLIB_SUFFIX
SO
SHLIB_CFLAGS
MERGE_DLL_OBJS
INSTALL_DLLS
@ -6631,7 +6633,7 @@ fi
if test "$have_dl" = "yes"
then
SHLIB_SUFFIX="so"
SO="so"
SHLIB_LD="$CC -shared -export-dynamic"
SHLIB_CXX_LD="$CXX -shared -export-dynamic"
DO_SECOND_LD=""
@ -6666,7 +6668,7 @@ fi
then
LIBS="$LIBS -lnsl"
fi
SHLIB_SUFFIX="o"
SO="o"
INSTALL_DLLS=""
;;
*hpux*)
@ -6684,7 +6686,7 @@ fi
SHLIB_LD="$CC -shared -export-dynamic"
SHLIB_CXX_LD="$CXX -shared -export-dynamic"
DO_SECOND_LD=""
SHLIB_SUFFIX="sl"
SO="sl"
SHLIB_CFLAGS="+z"
INSTALL_DLLS=""
# If the xnet library was found, turn on X/Open networking
@ -6710,7 +6712,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"
# SO="a"
#SHLIB_LD="\$(srcdir)/../../ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
#INSTALL_DLLS=""
;;
@ -6760,14 +6762,14 @@ else
have_dl=no
fi
SHLIB_SUFFIX="so"
SO="so"
SHLIB_LD="ld -shared -expect_unresolved '*'"
DO_SECOND_LD=""
fi
;;
*irix6*)
SHLIB_CFLAGS=""
SHLIB_SUFFIX="so"
SO="so"
DO_SECOND_LD=""
SHLIB_LD="ld -n32 -shared -rdata_shared"
SHLIB_CXX_LD="$SHLIB_LD"
@ -6825,7 +6827,7 @@ fi
fi
fi
SHLIB_CFLAGS="-fno-common"
SHLIB_SUFFIX="dylib"
SO="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"
@ -6839,7 +6841,7 @@ fi
then
#an a.out system
SHLIB_CFLAGS=""
SHLIB_SUFFIX="o"
SO="o"
else
#an elf system
LDFLAGS="-Wl,--export-dynamic $LDFLAGS"
@ -6847,7 +6849,7 @@ fi
SHLIB_LD="ld -Bshareable -x"
SHLIB_CXX_LD="$SHLIB_LD"
DO_SECOND_LD=""
SHLIB_SUFFIX="so"
SO="so"
INSTALL_DLLS=""
fi
;;
@ -6858,7 +6860,7 @@ fi
SHLIB_LD="$CC -shared"
SHLIB_CXX_LD="$CXX -shared"
DO_SECOND_LD=""
SHLIB_SUFFIX="so"
SO="so"
INSTALL_DLLS=""
;;
*cyg*|*mingw*)
@ -6872,7 +6874,7 @@ fi
fi
SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols"
SHLIB_CXX_LD="\$(CXX) -shared -Wl,--export-all-symbols"
SHLIB_SUFFIX="dll"
SO="dll"
C_PARSER_FLAGS="$C_INTERF_FLAGS"
EXEC_SUFFIX=".exe"
INSTALL_DLLS=""
@ -6926,7 +6928,7 @@ fi
if test "$have_dl" = yes
then
SHLIB_SUFFIX="o"
SO="o"
LIBS="$LIBS -ldl"
INSTALL_DLLS=""
if test "$GCC" = "yes"
@ -6952,7 +6954,7 @@ then
INSTALL_ENV=""
;;
*darwin*)
DYNYAPLIB=libYap."$SHLIB_SUFFIX"
DYNYAPLIB=libYap."$SO"
YAPLIB="$DYNYAPLIB"
DYNLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib"
PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)"
@ -6961,7 +6963,7 @@ then
;;
*)
LDFLAGS="$LDFLAGS -L \$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
DYNYAPLIB=libYap."$SHLIB_SUFFIX"
DYNYAPLIB=libYap."$SO"
YAPLIB="$DYNYAPLIB"
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L \$(abs_top_builddir) -lYap -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)"
PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
@ -7357,7 +7359,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."$SO"
else
LAMOBJS=no
fi
@ -9028,7 +9030,9 @@ fi
PROLOG_SYSTEM=yap
IN_YAP=
IN_SWI="#"
CHR_TARGETS=chr_support."$SHLIB_SUFFIX"
CHR_TARGETS=chr_support."$SO"

44
configure.in
View File

@ -27,7 +27,7 @@ dnl
dnl EXEC_SUFFIX=suffix for executable (.exe)
dnl
dnl INSTALL_DLLS= we can do dynamic linking
dnl SHLIB_SUFFIX= suffix for loadable binary (.so,.dll,.o)
dnl SO= suffix for loadable binary (.so,.dll,.o)
dnl MERGE_DLL_OBJS= we need to merge several .o files into a single dll.
dnl
dnl CXXFLAGS= C++-flags
@ -854,7 +854,7 @@ case "$target_os" in
have_dl=no)
if test "$have_dl" = "yes"
then
SHLIB_SUFFIX="so"
SO="so"
SHLIB_LD="$CC -shared -export-dynamic"
SHLIB_CXX_LD="$CXX -shared -export-dynamic"
DO_SECOND_LD=""
@ -889,7 +889,7 @@ case "$target_os" in
then
LIBS="$LIBS -lnsl"
fi
SHLIB_SUFFIX="o"
SO="o"
INSTALL_DLLS=""
;;
*hpux*)
@ -906,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"
SO="sl"
SHLIB_CFLAGS="+z"
INSTALL_DLLS=""
# If the xnet library was found, turn on X/Open networking
@ -929,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"
# SO="a"
#SHLIB_LD="\$(srcdir)/../../ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
#INSTALL_DLLS=""
;;
@ -941,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"
SO="so"
SHLIB_LD="ld -shared -expect_unresolved '*'"
DO_SECOND_LD=""
fi
;;
*irix6*)
SHLIB_CFLAGS=""
SHLIB_SUFFIX="so"
SO="so"
DO_SECOND_LD=""
SHLIB_LD="ld -n32 -shared -rdata_shared"
SHLIB_CXX_LD="$SHLIB_LD"
@ -967,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"
SO="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"
@ -981,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"
SO="o"
else
#an elf system
LDFLAGS="-Wl,--export-dynamic $LDFLAGS"
@ -989,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"
SO="so"
INSTALL_DLLS=""
fi
;;
@ -1000,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"
SO="so"
INSTALL_DLLS=""
;;
*cyg*|*mingw*)
@ -1014,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"
SO="dll"
C_PARSER_FLAGS="$C_INTERF_FLAGS"
EXEC_SUFFIX=".exe"
INSTALL_DLLS=""
@ -1029,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"
SO="o"
LIBS="$LIBS -ldl"
INSTALL_DLLS=""
if test "$GCC" = "yes"
@ -1055,7 +1055,7 @@ then
INSTALL_ENV=""
;;
*darwin*)
DYNYAPLIB=libYap."$SHLIB_SUFFIX"
DYNYAPLIB=libYap."$SO"
YAPLIB="$DYNYAPLIB"
DYNLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib"
PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)"
@ -1064,7 +1064,7 @@ then
;;
*)
LDFLAGS="$LDFLAGS -L \$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
DYNYAPLIB=libYap."$SHLIB_SUFFIX"
DYNYAPLIB=libYap."$SO"
YAPLIB="$DYNYAPLIB"
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L \$(abs_top_builddir) -lYap -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)"
PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
@ -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."$SO",
LAMOBJS=no)
CC=${OLD_CC}
@ -1319,7 +1319,7 @@ dnl C-flags used to compile a file that will be loaded dynamically
AC_SUBST(CXXFLAGS)
AC_SUBST(SHLIB_CFLAGS)
dnl suffix for loadable binary (.so,.dll,.o)
AC_SUBST(SHLIB_SUFFIX)
AC_SUBST(SO)
dnl suffix for executable (.exe)
EXEC_SUFFIX=""
AC_SUBST(EXEC_SUFFIX)
@ -1645,11 +1645,13 @@ dnl SWI compatibility support!
PROLOG_SYSTEM=yap
IN_YAP=
IN_SWI="#"
CHR_TARGETS=chr_support."$SHLIB_SUFFIX"
CHR_TARGETS=chr_support."$SO"
AC_SUBST(PROLOG_SYSTEM)
AC_SUBST(IN_YAP)
AC_SUBST(IN_SWI)
AC_SUBST(TARGETS)
AC_SUBST(PLTARGETS)
AC_SUBST(CHR_TARGETS)
mkdir -p library/matrix
@ -1666,6 +1668,9 @@ mkdir -p LGPL/clp
mkdir -p LGPL/swi_console
mkdir -p GPL
mkdir -p packages/chr
dnl mkdir -p packages/clib
dnl mkdir -p packages/clib/maildrop/rfc822
dnl mkdir -p packages/clib/maildrop/rfc2045
mkdir -p packages/CLPBN
mkdir -p packages/clpqr
mkdir -p packages/cplint
@ -1700,6 +1705,9 @@ AC_CONFIG_FILES([library/yap2swi/Makefile])
AC_CONFIG_FILES([LGPL/Makefile])
AC_CONFIG_FILES([LGPL/clp/Makefile])
AC_CONFIG_FILES([LGPL/swi_console/Makefile])
dnl AC_CONFIG_FILES([packages/clib/Makefile])
dnl AC_CONFIG_FILES([packages/clib/maildrop/rfc822/Makefile])
dnl AC_CONFIG_FILES([packages/clib/maildrop/rfc2045/Makefile])
AC_CONFIG_FILES([packages/CLPBN/Makefile])
AC_CONFIG_FILES([packages/cplint/Makefile])
AC_CONFIG_FILES([packages/cplint/approx/simplecuddLPADs/Makefile])

10
library/lammpi/Makefile.in
View File

@ -36,7 +36,7 @@ SHELL=/bin/sh
RANLIB=@RANLIB@
srcdir=@srcdir@
SHLIB_CFLAGS=@SHLIB_CFLAGS@
SHLIB_SUFFIX=@SHLIB_SUFFIX@
SO=@SO@
CWD=$(PWD)
MPILDF=`$(MPI_CC) -showme|sed "s/[^ ]*//"|sed "s/-pt/-lpt/"`
MPICF=`$(MPI_CC) -showme| cut -d " " -f 2`
@ -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.@SO@
#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@%.@SO@: %.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.@SO@: $(OBJS)
@DO_SECOND_LD@ @SHLIB_LD@ $(MPILDF) -o yap_mpi.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
install: all
@if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR); fi

10
library/matlab/Makefile.in
View File

@ -31,13 +31,13 @@ SHELL=/bin/sh
RANLIB=@RANLIB@
srcdir=@srcdir@
SHLIB_CFLAGS=@SHLIB_CFLAGS@
SHLIB_SUFFIX=@SHLIB_SUFFIX@
SO=@SO@
#4.1VPATH=@srcdir@:@srcdir@/OPTYap
CWD=$(PWD)
#
OBJS=matlab.o
SOBJS=matlab.@SHLIB_SUFFIX@
SOBJS=matlab.@SO@
#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@%.@SO@: %.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.@SO@: matlab.o
@DO_SECOND_LD@ @SHLIB_LD@ -o matlab.@SO@ matlab.o @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)

10
library/matrices/Makefile.in
View File

@ -30,13 +30,13 @@ SHELL=/bin/sh
RANLIB=@RANLIB@
srcdir=@srcdir@
SHLIB_CFLAGS=@SHLIB_CFLAGS@
SHLIB_SUFFIX=@SHLIB_SUFFIX@
SO=@SO@
#4.1VPATH=@srcdir@:@srcdir@/OPTYap
CWD=$(PWD)
#
OBJS=matrix.o
SOBJS=matrix.@SHLIB_SUFFIX@
SOBJS=matrix.@SO@
#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@%.@SO@: %.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.@SO@: matrix.o
@DO_SECOND_LD@ @SHLIB_LD@ -o matrix.@SO@ matrix.o
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)

10
library/matrix/Makefile.in
View File

@ -31,13 +31,13 @@ SHELL=/bin/sh
RANLIB=@RANLIB@
srcdir=@srcdir@
SHLIB_CFLAGS=@SHLIB_CFLAGS@
SHLIB_SUFFIX=@SHLIB_SUFFIX@
SO=@SO@
#4.1VPATH=@srcdir@:@srcdir@/OPTYap
CWD=$(PWD)
#
OBJS=matrix.o
SOBJS=matrix.@SHLIB_SUFFIX@
SOBJS=matrix.@SO@
#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@%.@SO@: %.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.@SO@: matrix.o
@DO_SECOND_LD@ @SHLIB_LD@ -o matrix.@SO@ matrix.o @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)

2
library/mpi/Makefile.in
View File

@ -63,7 +63,7 @@ SHELL=/bin/sh
RANLIB=@RANLIB@
AR=@AR@
srcdir=@srcdir@
SHLIB_SUFFIX=@SHLIB_SUFFIX@
SO=@SO@
SHLIB_INTERFACE=@SHLIB_INTERFACE@
RM=rm -f

10
library/random/Makefile.in
View File

@ -31,13 +31,13 @@ SHELL=/bin/sh
RANLIB=@RANLIB@
srcdir=@srcdir@
SHLIB_CFLAGS=@SHLIB_CFLAGS@
SHLIB_SUFFIX=@SHLIB_SUFFIX@
SO=@SO@
#4.1VPATH=@srcdir@:@srcdir@/OPTYap
CWD=$(PWD)
#
OBJS=random.o
SOBJS=random.@SHLIB_SUFFIX@
SOBJS=random.@SO@
#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@%.@SO@: %.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.@SO@: random.o
@DO_SECOND_LD@ @SHLIB_LD@ -o random.@SO@ random.o @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)

26
library/regex/Makefile.in
View File

@ -31,13 +31,13 @@ SHELL=/bin/sh
RANLIB=@RANLIB@
srcdir=@srcdir@
SHLIB_CFLAGS=@SHLIB_CFLAGS@
SHLIB_SUFFIX=@SHLIB_SUFFIX@
SO=@SO@
#4.1VPATH=@srcdir@:@srcdir@/OPTYap
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.@SO@ @NO_BUILTIN_REGEXP@ regcomp@SO@ regexec@SO@ regerror@SO@ regfree@SO@
#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@%.@SO@: %.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.@SO@: regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
@DO_SECOND_LD@ @SHLIB_LD@ -o regexp.@SO@ 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.@SO@: regcomp.o @MERGE_DLL_OBJS@ regfree.o
@DO_SECOND_LD@ @SHLIB_LD@ -o regcomp.@SO@ 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.@SO@: regerror.o
@DO_SECOND_LD@ @SHLIB_LD@ -o regerror.@SO@ 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.@SO@: regfree.o
@DO_SECOND_LD@ @SHLIB_LD@ -o regfree.@SO@ 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.@SO@: regexec.o
@DO_SECOND_LD@ @SHLIB_LD@ -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)

10
library/rltree/Makefile.in
View File

@ -36,11 +36,11 @@ SHELL=/bin/sh
RANLIB=@RANLIB@
srcdir=@srcdir@
SHLIB_CFLAGS=@SHLIB_CFLAGS@
SHLIB_SUFFIX=@SHLIB_SUFFIX@
SO=@SO@
#
OBJS=yaprl.o range_list.o
SOBJS=yap_rl.@SHLIB_SUFFIX@
SOBJS=yap_rl.@SO@
#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@%.@SO@: %.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.@SO@: $(OBJS)
@DO_SECOND_LD@ @SHLIB_LD@ -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
install: all
@if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR); fi

10
library/system/Makefile.in
View File

@ -31,13 +31,13 @@ SHELL=/bin/sh
RANLIB=@RANLIB@
srcdir=@srcdir@
SHLIB_CFLAGS=@SHLIB_CFLAGS@
SHLIB_SUFFIX=@SHLIB_SUFFIX@
SO=@SO@
#4.1VPATH=@srcdir@:@srcdir@/OPTYap
CWD=$(PWD)
#
OBJS=sys.o
SOBJS=sys.@SHLIB_SUFFIX@
SOBJS=sys.@SO@
#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@%.@SO@: %.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.@SO@: sys.o
@DO_SECOND_LD@ @SHLIB_LD@ -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)

14
library/tries/Makefile.in
View File

@ -31,13 +31,13 @@ SHELL=/bin/sh
RANLIB=@RANLIB@
srcdir=@srcdir@
SHLIB_CFLAGS=@SHLIB_CFLAGS@
SHLIB_SUFFIX=@SHLIB_SUFFIX@
SO=@SO@
#4.1VPATH=@srcdir@:@srcdir@/OPTYap
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.@SO@ itries.@SO@
#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@%.@SO@: %.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.@SO@: core_tries.o base_tries.o tries.o
@DO_SECOND_LD@ @SHLIB_LD@ -o tries.@SO@ 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.@SO@: core_tries.o base_itries.o itries.o
@DO_SECOND_LD@ @SHLIB_LD@ -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)

10
library/yap2swi/Makefile.in
View File

@ -29,13 +29,13 @@ SHELL=/bin/sh
RANLIB=@RANLIB@
srcdir=@srcdir@
SHLIB_CFLAGS=@SHLIB_CFLAGS@
SHLIB_SUFFIX=@SHLIB_SUFFIX@
SO=@SO@
#4.1VPATH=@srcdir@:@srcdir@/OPTYap
CWD=$(PWD)
#
OBJS=yap2swi.o
SOBJS=yap2swi.@SHLIB_SUFFIX@
SOBJS=yap2swi.@SO@
#in some systems we just create a single object, in others we need to
# create a libray
@ -47,11 +47,11 @@ all:
yap2swi.o: $(srcdir)/yap2swi.c $(srcdir)/yap2swi.h
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/yap2swi.c -o yap2swi.o
@DO_SECOND_LD@@DO_SECOND_LD@%.@SHLIB_SUFFIX@: %.o
@DO_SECOND_LD@@DO_SECOND_LD@%.@SO@: %.o
@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@yap2swi.@SO@: yap2swi.o
@DO_SECOND_LD@ @SHLIB_LD@ -o yap2swi.@SO@ yap2swi.o @
install:
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)

10
packages/PLStream/Makefile.in
View File

@ -32,7 +32,7 @@ SHELL=/bin/sh
RANLIB=@RANLIB@
srcdir=@srcdir@
SHLIB_CFLAGS=@SHLIB_CFLAGS@
SHLIB_SUFFIX=@SHLIB_SUFFIX@
SO=@SO@
#4.1VPATH=@srcdir@:@srcdir@/OPTYap
CWD=$(PWD)
#
@ -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=libplstream.@SHLIB_SUFFIX@
SOBJS=libplstream.@SO@
#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@%.@SO@: %.o
@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @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@
@DO_SECOND_LD@libplstream.@SO@: $(OBJS)
@DO_SECOND_LD@ @SHLIB_LD@ -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)

2
packages/ProbLog/simplecudd/Makefile.in
View File

@ -30,7 +30,7 @@ SHELL=/bin/sh
RANLIB=@RANLIB@
srcdir=@srcdir@
SHLIB_CFLAGS=@SHLIB_CFLAGS@
SHLIB_SUFFIX=@SHLIB_SUFFIX@
SO=@SO@
#4.1VPATH=@srcdir@:@srcdir@/OPTYap
CWD=$(PWD)
#

8
packages/sgml/Makefile.in
View File

@ -36,12 +36,12 @@ LD=$(CC)
PLLD=$(CC)
SHLIB_CFLAGS=@SHLIB_CFLAGS@
SHLIB_SUFFIX=@SHLIB_SUFFIX@
SO=@SO@
#4.1VPATH=@srcdir@:@srcdir@/OPTYap
CWD=$(PWD)
#
TARGETS= sgml2pl.@SHLIB_SUFFIX@
TARGETS= sgml2pl.@SO@
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.@SO@: $(PLOBJ)
@DO_SECOND_LD@ @SHLIB_LD@ -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@
all: $(TARGETS) $(PROGRAMS)

8
packages/swi-minisat2/C/Makefile.in
View File

@ -33,7 +33,7 @@ SHELL=/bin/sh
RANLIB=@RANLIB@
srcdir=@srcdir@
SHLIB_CFLAGS=@SHLIB_CFLAGS@
SHLIB_SUFFIX=@SHLIB_SUFFIX@
SO=@SO@
#4.1VPATH=@srcdir@:@srcdir@/OPTYap
CWD=$(PWD)
#
@ -55,7 +55,7 @@ OBJS = \
Solver.o \
pl-minisat.o
SOBJS=pl-minisat@SHLIB_SUFFIX@
SOBJS=pl-minisat@SO@
#in some systems we just create a single object, in others we need to
# create a libray
@ -69,8 +69,8 @@ Solver.o : $(srcdir)/Solver.C
pl-minisat.o : $(srcdir)/pl-minisat.C
$(CXX) -c $(CXXFLAGS) $(SHLIB_CFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o
@DO_SECOND_LD@pl-minisat@SHLIB_SUFFIX@: $(OBJS)
@DO_SECOND_LD@ @SHLIB_CXX_LD@ -o pl-minisat@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@
@DO_SECOND_LD@pl-minisat@SO@: $(OBJS)
@DO_SECOND_LD@ @SHLIB_CXX_LD@ -o pl-minisat@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)