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

fix mess with LIBDIR and YAPLIBDIR

Browse Source 
use -Wl,-WR in a more consistent way in Linux
use --with-java instead of --with-jpl
This commit is contained in:
Vítor Santos Costa 2010-06-01 00:38:42 +01:00
parent e94104306c
commit 7e1692bdb0
17 changed files with 103 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -557,6 +557,7 @@ install_unix: startup.yss libYap.a
@INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install) @INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install)
@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE)) @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE))
@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) install) @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) install)
#@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/pyswip; $(MAKE) install)
mkdir -p $(DESTDIR)$(INCLUDEDIR) mkdir -p $(DESTDIR)$(INCLUDEDIR)
$(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDEDIR) $(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDEDIR)
for h in $(INTERFACE_HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done for h in $(INTERFACE_HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done

38
configure vendored
View File

@ -764,7 +764,7 @@ with_cudd
enable_myddas enable_myddas
enable_myddas_stats enable_myddas_stats
enable_myddas_top_level enable_myddas_top_level
with_jpl with_java
with_readline with_readline
with_matlab with_matlab
with_mpi with_mpi
@ -1435,7 +1435,7 @@ Optional Packages:
--with-gmp=DIR use GNU Multiple Precision in DIR --with-gmp=DIR use GNU Multiple Precision in DIR
--enable-minisat use minisat interface --enable-minisat use minisat interface
--with-cudd=DIR use CUDD package in DIR --with-cudd=DIR use CUDD package in DIR
--with-jpl=JAVA_HOME use Java instalation in JAVA_HOME --with-java=JAVA_HOME use Java instalation in JAVA_HOME
--with-readline=DIR use GNU Readline Library in DIR --with-readline=DIR use GNU Readline Library in DIR
--with-matlab=DIR use MATLAB package in DIR --with-matlab=DIR use MATLAB package in DIR
--with-mpi=DIR use MPI library in DIR --with-mpi=DIR use MPI library in DIR
@ -3808,21 +3808,21 @@ fi
# Check whether --with-jpl was given. # Check whether --with-java was given.
if test "${with_jpl+set}" = set; then : if test "${with_java+set}" = set; then :
withval=$with_jpl; if test "$withval" = yes; then withval=$with_java; if test "$withval" = yes; then
yap_cv_jpl="$JAVA_HOME" yap_cv_java="$JAVA_HOME"
dynamic_loading=yes dynamic_loading=yes
maxmemory=yes maxmemory=yes
elif test "$withval" = no; then elif test "$withval" = no; then
yap_cv_jpl=no yap_cv_java=no
else else
yap_cv_jpl=$with_jpl yap_cv_java=$with_java
dynamic_loading=yes dynamic_loading=yes
maxmemory=yes maxmemory=yes
fi fi
else else
yap_cv_jpl=no yap_cv_java=no
fi fi
@ -6050,12 +6050,12 @@ else
ENABLE_CLPQR="@# " ENABLE_CLPQR="@# "
fi fi
if test "$yap_cv_jpl" = no; then if test "$yap_cv_java" = no; then
ENABLE_JPL="@#" ENABLE_JPL="@#"
elif test -e "$srcdir"/packages/jpl/Makefile.in; then elif test -e "$srcdir"/packages/jpl/Makefile.in; then
ENABLE_JPL="" ENABLE_JPL=""
JAVA=java JAVA=java
JAVA_HOME="$yap_cv_jpl" JAVA_HOME="$yap_cv_java"
if test "x$JAVALIBS" = "x"; then if test "x$JAVALIBS" = "x"; then
case "$target_os" in case "$target_os" in
*cygwin*|*mingw*) *cygwin*|*mingw*)
@ -6072,16 +6072,16 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then
;; ;;
esac esac
fi fi
if test "$yap_cv_jpl" = ""; then if test "$yap_cv_java" = ""; then
JAVA=java JAVA=java
JAR=jar JAR=jar
JAVAC=javac JAVAC=javac
JAVADOC=javadoc JAVADOC=javadoc
else else
JAVA="$yap_cv_jpl"/bin/java JAVA="$yap_cv_java"/bin/java
JAR="$yap_cv_jpl"/bin/jar JAR="$yap_cv_java"/bin/jar
JAVAC="$yap_cv_jpl"/bin/javac JAVAC="$yap_cv_java"/bin/javac
JAVADOC="$yap_cv_jpl"/bin/javadoc JAVADOC="$yap_cv_java"/bin/javadoc
fi fi
else else
ENABLE_JPL="@#" ENABLE_JPL="@#"
@ -6950,9 +6950,10 @@ then
esac esac
EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
PRE_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(abs_top_builddir)" PRE_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(abs_top_builddir)"
LDFLAGS="$LDFLAGS -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET" LDFLAGS="$LDFLAGS -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET -L \$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
DYNYAPLIB=libYap"$SHLIB_SUFFIX" DYNYAPLIB=libYap"$SHLIB_SUFFIX"
YAPLIB="$DYNYAPLIB" YAPLIB="$DYNYAPLIB"
EXTRA_LIBS_FOR_DLLS="-Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET -L \$(abs_top_builddir) -lYap -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)"
;; ;;
esac esac
else else
@ -9112,7 +9113,7 @@ ac_config_files="$ac_config_files packages/clpqr/Makefile"
fi fi
if test "$ENABLE_JPL" = ""; then if test "$ENABLE_JPL" = ""; then
ac_config_files="$ac_config_files packages/jpl/Makefile packages/jpl/jpl_paths.yap packages/jpl/src/java/Makefile" ac_config_files="$ac_config_files packages/jpl/Makefile packages/jpl/jpl_paths.yap packages/jpl/src/java/Makefile packages/pyswip/Makefile"
fi fi
@ -9841,6 +9842,7 @@ do
"packages/jpl/Makefile") CONFIG_FILES="$CONFIG_FILES packages/jpl/Makefile" ;; "packages/jpl/Makefile") CONFIG_FILES="$CONFIG_FILES packages/jpl/Makefile" ;;
"packages/jpl/jpl_paths.yap") CONFIG_FILES="$CONFIG_FILES packages/jpl/jpl_paths.yap" ;; "packages/jpl/jpl_paths.yap") CONFIG_FILES="$CONFIG_FILES packages/jpl/jpl_paths.yap" ;;
"packages/jpl/src/java/Makefile") CONFIG_FILES="$CONFIG_FILES packages/jpl/src/java/Makefile" ;; "packages/jpl/src/java/Makefile") CONFIG_FILES="$CONFIG_FILES packages/jpl/src/java/Makefile" ;;
"packages/pyswip/Makefile") CONFIG_FILES="$CONFIG_FILES packages/pyswip/Makefile" ;;
"packages/ProbLog/simplecudd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd/Makefile" ;; "packages/ProbLog/simplecudd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd/Makefile" ;;
"packages/swi-minisat2/Makefile") CONFIG_FILES="$CONFIG_FILES packages/swi-minisat2/Makefile" ;; "packages/swi-minisat2/Makefile") CONFIG_FILES="$CONFIG_FILES packages/swi-minisat2/Makefile" ;;
"packages/swi-minisat2/C/Makefile") CONFIG_FILES="$CONFIG_FILES packages/swi-minisat2/C/Makefile" ;; "packages/swi-minisat2/C/Makefile") CONFIG_FILES="$CONFIG_FILES packages/swi-minisat2/C/Makefile" ;;

31
configure.in
View File

@ -157,22 +157,22 @@ AC_ARG_ENABLE(myddas-top-level,
myddastoplevel="$enableval" myddastoplevel="$enableval"
fi, myddastoplevel=no) fi, myddastoplevel=no)
AC_ARG_WITH(jpl, AC_ARG_WITH(java,
[ --with-jpl=JAVA_HOME use Java instalation in JAVA_HOME], [ --with-java=JAVA_HOME use Java instalation in JAVA_HOME],
if test "$withval" = yes; then if test "$withval" = yes; then
yap_cv_jpl="$JAVA_HOME" yap_cv_java="$JAVA_HOME"
dynamic_loading=yes dynamic_loading=yes
maxmemory=yes maxmemory=yes
dnl threads=yes dnl threads=yes
elif test "$withval" = no; then elif test "$withval" = no; then
yap_cv_jpl=no yap_cv_java=no
else else
yap_cv_jpl=$with_jpl yap_cv_java=$with_java
dynamic_loading=yes dynamic_loading=yes
maxmemory=yes maxmemory=yes
dnl threads=yes dnl threads=yes
fi, fi,
[yap_cv_jpl=no]) [yap_cv_java=no])
AC_ARG_WITH(readline, AC_ARG_WITH(readline,
[ --with-readline[=DIR] use GNU Readline Library in DIR], [ --with-readline[=DIR] use GNU Readline Library in DIR],
@ -677,12 +677,12 @@ else
ENABLE_CLPQR="@# " ENABLE_CLPQR="@# "
fi fi
if test "$yap_cv_jpl" = no; then if test "$yap_cv_java" = no; then
ENABLE_JPL="@#" ENABLE_JPL="@#"
elif test -e "$srcdir"/packages/jpl/Makefile.in; then elif test -e "$srcdir"/packages/jpl/Makefile.in; then
ENABLE_JPL="" ENABLE_JPL=""
JAVA=java JAVA=java
JAVA_HOME="$yap_cv_jpl" JAVA_HOME="$yap_cv_java"
if test "x$JAVALIBS" = "x"; then if test "x$JAVALIBS" = "x"; then
case "$target_os" in case "$target_os" in
*cygwin*|*mingw*) *cygwin*|*mingw*)
@ -699,16 +699,16 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then
;; ;;
esac esac
fi fi
if test "$yap_cv_jpl" = ""; then if test "$yap_cv_java" = ""; then
JAVA=java JAVA=java
JAR=jar JAR=jar
JAVAC=javac JAVAC=javac
JAVADOC=javadoc JAVADOC=javadoc
else else
JAVA="$yap_cv_jpl"/bin/java JAVA="$yap_cv_java"/bin/java
JAR="$yap_cv_jpl"/bin/jar JAR="$yap_cv_java"/bin/jar
JAVAC="$yap_cv_jpl"/bin/javac JAVAC="$yap_cv_java"/bin/javac
JAVADOC="$yap_cv_jpl"/bin/javadoc JAVADOC="$yap_cv_java"/bin/javadoc
fi fi
else else
ENABLE_JPL="@#" ENABLE_JPL="@#"
@ -1050,9 +1050,10 @@ then
esac esac
EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
PRE_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(abs_top_builddir)" PRE_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(abs_top_builddir)"
LDFLAGS="$LDFLAGS -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET" LDFLAGS="$LDFLAGS -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET -L \$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
DYNYAPLIB=libYap"$SHLIB_SUFFIX" DYNYAPLIB=libYap"$SHLIB_SUFFIX"
YAPLIB="$DYNYAPLIB" YAPLIB="$DYNYAPLIB"
EXTRA_LIBS_FOR_DLLS="-Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET -L \$(abs_top_builddir) -lYap -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)"
;; ;;
esac esac
else else
@ -1701,7 +1702,7 @@ AC_CONFIG_FILES([packages/clpqr/Makefile])
fi fi
if test "$ENABLE_JPL" = ""; then if test "$ENABLE_JPL" = ""; then
AC_CONFIG_FILES([packages/jpl/Makefile packages/jpl/jpl_paths.yap packages/jpl/src/java/Makefile]) AC_CONFIG_FILES([packages/jpl/Makefile packages/jpl/jpl_paths.yap packages/jpl/src/java/Makefile packages/pyswip/Makefile ])
fi fi
if test "$USE_CUDD" = ""; then if test "$USE_CUDD" = ""; then

11
library/lammpi/Makefile.in
View File

@ -8,7 +8,7 @@
# #
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
OOTDIR = $(prefix) ROOTDIR = $(prefix)
EROOTDIR = @exec_prefix@ EROOTDIR = @exec_prefix@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
# #
@ -18,7 +18,8 @@ BINDIR = $(EROOTDIR)/bin
# #
# where YAP should look for libraries # where YAP should look for libraries
# #
LIBDIR=@libdir@/Yap LIBDIR=@libdir@
YAPLIBDIR=@libdir@/Yap
# #
# #
CC=@CC@ CC=@CC@
@ -60,13 +61,13 @@ hash.o: $(srcdir)/hash.c $(srcdir)/hash.h
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/hash.c -o hash.o $(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 $@ $< @DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@yap_mpi@SHLIB_SUFFIX@: $(OBJS) @DO_SECOND_LD@yap_mpi@SHLIB_SUFFIX@: $(OBJS)
@DO_SECOND_LD@ @SHLIB_LD@ $(MPILDF) -o yap_mpi@SHLIB_SUFFIX@ $(OBJS) @DO_SECOND_LD@ @SHLIB_LD@ $(MPILDF) -o yap_mpi@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
install: all install: all
@if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR); fi @if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR); fi
clean: clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK

9
library/matlab/Makefile.in
View File

@ -14,7 +14,8 @@ BINDIR = $(EROOTDIR)/bin
# #
# where YAP should look for libraries # where YAP should look for libraries
# #
LIBDIR=@libdir@/Yap LIBDIR=@libdir@
YAPLIBDIR=@libdir@/Yap
# #
# #
CC=@CC@ CC=@CC@
@ -47,13 +48,13 @@ matlab.o: $(srcdir)/matlab.c
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/matlab.c -o matlab.o $(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 $@ $< @DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@matlab@SHLIB_SUFFIX@: matlab.o @DO_SECOND_LD@matlab@SHLIB_SUFFIX@: matlab.o
@DO_SECOND_LD@ @SHLIB_LD@ -o matlab@SHLIB_SUFFIX@ matlab.o @DO_SECOND_LD@ @SHLIB_LD@ -o matlab@SHLIB_SUFFIX@ matlab.o @EXTRA_LIBS_FOR_DLLS@
install: all install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
clean: clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK

9
library/matrix/Makefile.in
View File

@ -14,7 +14,8 @@ BINDIR = $(EROOTDIR)/bin
# #
# where YAP should look for libraries # where YAP should look for libraries
# #
LIBDIR=@libdir@/Yap LIBDIR=@libdir@
YAPLIBDIR=@libdir@/Yap
# #
# #
CC=@CC@ CC=@CC@
@ -47,13 +48,13 @@ matrix.o: $(srcdir)/matrix.c
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/matrix.c -o matrix.o $(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@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@matrix@SHLIB_SUFFIX@: matrix.o @DO_SECOND_LD@matrix@SHLIB_SUFFIX@: matrix.o
@DO_SECOND_LD@ @SHLIB_LD@ -o matrix@SHLIB_SUFFIX@ matrix.o @DO_SECOND_LD@ @SHLIB_LD@ -o matrix@SHLIB_SUFFIX@ matrix.o @EXTRA_LIBS_FOR_DLLS@
install: all install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
clean: clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK

9
library/random/Makefile.in
View File

@ -14,7 +14,8 @@ BINDIR = $(EROOTDIR)/bin
# #
# where YAP should look for libraries # where YAP should look for libraries
# #
LIBDIR=@libdir@/Yap LIBDIR=@libdir@
YAPLIBDIR=@libdir@/Yap
# #
# #
CC=@CC@ CC=@CC@
@ -47,13 +48,13 @@ random.o: $(srcdir)/random.c
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/random.c -o random.o $(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 $@ $< @DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@random@SHLIB_SUFFIX@: random.o @DO_SECOND_LD@random@SHLIB_SUFFIX@: random.o
@DO_SECOND_LD@ @SHLIB_LD@ -o random@SHLIB_SUFFIX@ random.o @DO_SECOND_LD@ @SHLIB_LD@ -o random@SHLIB_SUFFIX@ random.o @EXTRA_LIBS_FOR_DLLS@
install: all install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
clean: clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK

17
library/regex/Makefile.in
View File

@ -14,7 +14,8 @@ BINDIR = $(EROOTDIR)/bin
# #
# where YAP should look for libraries # where YAP should look for libraries
# #
LIBDIR=@libdir@/Yap LIBDIR=@libdir@
YAPLIBDIR=@libdir@/Yap
# #
# #
CC=@CC@ CC=@CC@
@ -59,25 +60,25 @@ regexec.o: $(srcdir)/regexec.c
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/regexec.c -o regexec.o $(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 $@ $< @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@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 @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@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 @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@regerror@SHLIB_SUFFIX@: regerror.o
@DO_SECOND_LD@ @SHLIB_LD@ -o 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@regfree@SHLIB_SUFFIX@: regfree.o
@DO_SECOND_LD@ @SHLIB_LD@ -o 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@regexec@SHLIB_SUFFIX@: regexec.o
@DO_SECOND_LD@ @SHLIB_LD@ -o regexec@SHLIB_SUFFIX@ regexec.o @DO_SECOND_LD@ @SHLIB_LD@ -o regexec@SHLIB_SUFFIX@ regexec.o @EXTRA_LIBS_FOR_DLLS@
install: all install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
clean: clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK

9
library/rltree/Makefile.in
View File

@ -18,7 +18,8 @@ BINDIR = $(EROOTDIR)/bin
# #
# where YAP should look for libraries # where YAP should look for libraries
# #
LIBDIR=@libdir@/Yap LIBDIR=@libdir@
YAPLIBDIR=@libdir@/Yap
# #
# #
CC=@CC@ CC=@CC@
@ -52,13 +53,13 @@ yaprl.o: $(srcdir)/yap_rl.c
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/yap_rl.c -o yaprl.o $(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 $@ $< @DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@yap_rl@SHLIB_SUFFIX@: $(OBJS) @DO_SECOND_LD@yap_rl@SHLIB_SUFFIX@: $(OBJS)
@DO_SECOND_LD@ @SHLIB_LD@ -o yap_rl@SHLIB_SUFFIX@ $(OBJS) @DO_SECOND_LD@ @SHLIB_LD@ -o yap_rl@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
install: all install: all
@if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR); fi @if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR); fi
clean: clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK

9
library/system/Makefile.in
View File

@ -14,7 +14,8 @@ BINDIR = $(EROOTDIR)/bin
# #
# where YAP should look for libraries # where YAP should look for libraries
# #
LIBDIR=@libdir@/Yap LIBDIR=@libdir@
YAPLIBDIR=@libdir@/Yap
# #
# #
CC=@CC@ CC=@CC@
@ -47,13 +48,13 @@ sys.o: $(srcdir)/sys.c
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/sys.c -o sys.o $(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 $@ $< @DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@sys@SHLIB_SUFFIX@: sys.o @DO_SECOND_LD@sys@SHLIB_SUFFIX@: sys.o
@DO_SECOND_LD@ @SHLIB_LD@ -o sys@SHLIB_SUFFIX@ sys.o @DO_SECOND_LD@ @SHLIB_LD@ -o sys@SHLIB_SUFFIX@ sys.o @EXTRA_LIBS_FOR_DLLS@
install: all install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
clean: clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK

11
library/tries/Makefile.in
View File

@ -14,7 +14,8 @@ BINDIR = $(EROOTDIR)/bin
# #
# where YAP should look for libraries # where YAP should look for libraries
# #
LIBDIR=@libdir@/Yap LIBDIR=@libdir@
YAPLIBDIR=@libdir@/Yap
# #
# #
CC=@CC@ CC=@CC@
@ -59,16 +60,16 @@ itries.o: $(srcdir)/core_tries.h $(srcdir)/base_itries.h $(srcdir)/itries.c
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/itries.c -o itries.o $(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 $@ $< @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@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 @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@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 @DO_SECOND_LD@ @SHLIB_LD@ -o itries@SHLIB_SUFFIX@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@
install: all install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
clean: clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK

3
packages/CLPBN/Makefile.in
View File

@ -9,7 +9,8 @@ BINDIR = $(ROOTDIR)/bin
# #
# where YAP should look for libraries # where YAP should look for libraries
# #
LIBDIR=@libdir@/Yap LIBDIR=@libdir@
YAPLIBDIR=@libdir@/Yap
# #
# where YAP should look for architecture-independent Prolog libraries # where YAP should look for architecture-independent Prolog libraries
# #

7
packages/PLStream/Makefile.in
View File

@ -15,7 +15,8 @@ BINDIR = $(EROOTDIR)/bin
# #
# where YAP should look for libraries # where YAP should look for libraries
# #
LIBDIR=@libdir@/Yap LIBDIR=@libdir@
YAPLIBDIR=@libdir@/Yap
# #
# #
CC=@CC@ CC=@CC@
@ -77,13 +78,13 @@ uxnt.o: $(srcdir)/uxnt/uxnt.c
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $< -o $@ $(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $< -o $@
@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@plstream@SHLIB_SUFFIX@: $(OBJS) @DO_SECOND_LD@plstream@SHLIB_SUFFIX@: $(OBJS)
@DO_SECOND_LD@ @SHLIB_LD@ -o plstream@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ @DO_SECOND_LD@ @SHLIB_LD@ -o plstream@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
install: all install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
clean: clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK

3
packages/cplint/Makefile.in
View File

@ -13,6 +13,7 @@ BINDIR = $(EROOTDIR)/bin
# #
# where YAP should look for libraries # where YAP should look for libraries
# #
LIBDIR=${exec_prefix}/lib
YAPLIBDIR=${exec_prefix}/lib/Yap YAPLIBDIR=${exec_prefix}/lib/Yap
# #
# where YAP should look for architecture-independent Prolog libraries # where YAP should look for architecture-independent Prolog libraries
@ -154,7 +155,7 @@ 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_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) @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: clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK

2
packages/sgml/Makefile.in
View File

@ -114,7 +114,7 @@ ifeq (@PROLOG_SYSTEM@,yap)
$(CC) $(CFLAGS) $(SHLIB_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(SHLIB_CFLAGS) -o $@ -c $<
@DO_SECOND_LD@sgml2pl@SHLIB_SUFFIX@: $(PLOBJ) @DO_SECOND_LD@sgml2pl@SHLIB_SUFFIX@: $(PLOBJ)
@DO_SECOND_LD@ @SHLIB_SWI_LD@ -o sgml2pl@SHLIB_SUFFIX@ $(PLOBJ) @DO_SECOND_LD@ @SHLIB_SWI_LD@ -o sgml2pl@SHLIB_SUFFIX@ $(PLOBJ) @EXTRA_LIBS_FOR_DLLS@
all: $(TARGETS) $(PROGRAMS) all: $(TARGETS) $(PROGRAMS)

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

@ -15,7 +15,8 @@ BINDIR = $(EROOTDIR)/bin
# #
# where YAP should look for libraries # where YAP should look for libraries
# #
LIBDIR=@libdir@/Yap LIBDIR=@libdir@
YAPLIBDIR=@libdir@/Yap
# #
# #
CC=@CC@ CC=@CC@
@ -69,10 +70,10 @@ pl-minisat.o : $(srcdir)/pl-minisat.C
$(CXX) -c $(CXXFLAGS) $(SHLIB_CFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o $(CXX) -c $(CXXFLAGS) $(SHLIB_CFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o
@DO_SECOND_LD@pl-minisat@SHLIB_SUFFIX@: $(OBJS) @DO_SECOND_LD@pl-minisat@SHLIB_SUFFIX@: $(OBJS)
@DO_SECOND_LD@ @SHLIB_LOWER_CXX_LD@ -o pl-minisat@SHLIB_SUFFIX@ $(OBJS) @DO_SECOND_LD@ @SHLIB_LOWER_CXX_LD@ -o pl-minisat@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
install: all install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
clean: clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK

3
packages/swi-minisat2/Makefile.in
View File

@ -10,7 +10,8 @@ BINDIR = $(ROOTDIR)/bin
# #
# where YAP should look for binary libraries # where YAP should look for binary libraries
# #
LIBDIR=@libdir@/Yap LIBDIR=@libdir@
YAPLIBDIR=@libdir@/Yap
# #
# where YAP should look for architecture-independent Prolog libraries # where YAP should look for architecture-independent Prolog libraries
# #