From 7c86b244b9878fa7781e47d464bc76a8c855d875 Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Thu, 30 Dec 2010 22:14:45 -0600 Subject: [PATCH] patches from Keri Harris --- H/Yap.h | 2 ++ Makefile.in | 9 +++++---- configure | 15 ++++++++++++++- configure.in | 14 +++++++++++++- library/matrix/Makefile.in | 5 +++-- library/random/Makefile.in | 5 +++-- library/regex/Makefile.in | 13 +++++++------ library/rltree/Makefile.in | 5 +++-- library/system/Makefile.in | 5 +++-- library/tries/Makefile.in | 7 ++++--- packages/PLStream/Makefile.in | 5 +++-- packages/clib/Makefile.in | 2 +- packages/http/Makefile.in | 2 +- packages/semweb/Makefile.in | 2 +- packages/sgml/Makefile.in | 3 ++- packages/swi-minisat2/C/Makefile.in | 3 ++- packages/tai/Makefile.in | 2 +- packages/zlib/Makefile.in | 2 +- 18 files changed, 69 insertions(+), 32 deletions(-) diff --git a/H/Yap.h b/H/Yap.h index eda704e84..a5c917c84 100755 --- a/H/Yap.h +++ b/H/Yap.h @@ -268,6 +268,8 @@ extern char Yap_Option[20]; #define MMAP_ADDR 0x200000000 #elif defined(__APPLE__) && !__LP64__ #define MMAP_ADDR 0x20000000 +#elif defined(__powerpc__) +#define MMAP_ADDR 0x20000000 #else #define MMAP_ADDR 0x10000000 #endif diff --git a/Makefile.in b/Makefile.in index 602f8869f..4e19d3e14 100755 --- a/Makefile.in +++ b/Makefile.in @@ -636,7 +636,11 @@ install_library: @YAPLIB@ mkdir -p $(DESTDIR)$(INCLUDEDIR) for h in $(HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done -install_data: +install_data: install_copied_files install_bin + @ENABLE_CHR@ (cd packages/chr ; $(MAKE) install) + @ENABLE_CHR@ (cd packages/clpqr ; $(MAKE) install) + +install_copied_files: (cd library ; $(MAKE) install) (cd packages/swi-minisat2; $(MAKE) install) (cd LGPL ; $(MAKE) install) @@ -646,9 +650,6 @@ install_data: @INSTALLCLP@(cd LGPL/clp ; $(MAKE) install) (cd packages/CLPBN ; $(MAKE) install) (cd packages/ProbLog ; $(MAKE) install) - @ENABLE_CHR@ (cd packages/chr ; $(MAKE) install) - @ENABLE_CHR@ (cd packages/clpqr ; $(MAKE) install) - ########## TAGS: $(C_SOURCES) $(PL_SOURCES) $(HEADERS) diff --git a/configure b/configure index a52c8d5ec..ae949d1c7 100755 --- a/configure +++ b/configure @@ -643,6 +643,7 @@ ENABLE_CLPQR ENABLE_CHR NO_BUILTIN_REGEXP YAP_EXTRAS +SONAMEFLAG DYNYAPLIB YAPLIB EXTRA_LIBS_FOR_SWIDLLS @@ -6932,6 +6933,7 @@ fi fi LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="-Wl,-soname=$DYNYAPLIB" fi if test "$have_nsl" = yes then @@ -6961,6 +6963,7 @@ fi INSTALL_DLLS="" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" @@ -7004,6 +7007,7 @@ fi fi LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" @@ -7017,6 +7021,7 @@ fi #INSTALL_DLLS="" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,\$(LIBDIR)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" @@ -7073,6 +7078,7 @@ fi fi LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" @@ -7087,6 +7093,7 @@ fi INSTALL_DLLS="" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" @@ -7164,7 +7171,8 @@ fi fi CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall -Wstrict-aliasing=2" DYNYAPLIB=libYap."$SO" - YAPLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib" + SONAMEFLAG="" + YAPLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.$SO" PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)" ;; *netbsd*|*openbsd*|*freebsd*|*dragonfly*) @@ -7187,6 +7195,7 @@ fi fi LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="-Wl,--soname=$DYNYAPLIB" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -Wl,-R,\$(YAPLIBDIR)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" @@ -7203,6 +7212,7 @@ fi INSTALL_DLLS="" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="-Wl,--soname=$DYNYAPLIB" if test "$dynamic_loading" = "yes" then YAPLIB_LD="\$(CC)" @@ -7221,6 +7231,7 @@ fi # and -fomit-frame-point -DBP_FREE YAPLIB="yap.dll" DYNYAPLIB="yap.dll" + SONAMEFLAG="" SHLIB_CFLAGS="$CFLAGS" SHLIB_CXXFLAGS="$CXXFLAGS" if test "$target_win64" = no @@ -7300,6 +7311,7 @@ fi fi LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" @@ -8442,6 +8454,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc threaded code" >&5 diff --git a/configure.in b/configure.in index 4ce9538bd..bd683d323 100755 --- a/configure.in +++ b/configure.in @@ -915,6 +915,7 @@ case "$target_os" in fi LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="-Wl,-soname=$DYNYAPLIB" fi if test "$have_nsl" = yes then @@ -944,6 +945,7 @@ case "$target_os" in INSTALL_DLLS="" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" @@ -983,6 +985,7 @@ case "$target_os" in fi LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" @@ -996,6 +999,7 @@ case "$target_os" in #INSTALL_DLLS="" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,\$(LIBDIR)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" @@ -1014,6 +1018,7 @@ dnl Linux has both elf and a.out, in this case we found elf fi LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" @@ -1028,6 +1033,7 @@ dnl Linux has both elf and a.out, in this case we found elf INSTALL_DLLS="" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" @@ -1066,7 +1072,8 @@ dnl Linux has both elf and a.out, in this case we found elf fi CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall -Wstrict-aliasing=2" DYNYAPLIB=libYap."$SO" - YAPLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib" + SONAMEFLAG="" + YAPLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.$SO" PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)" ;; *netbsd*|*openbsd*|*freebsd*|*dragonfly*) @@ -1089,6 +1096,7 @@ dnl Linux has both elf and a.out, in this case we found elf fi LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="-Wl,--soname=$DYNYAPLIB" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -Wl,-R,\$(YAPLIBDIR)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" @@ -1105,6 +1113,7 @@ dnl Linux has both elf and a.out, in this case we found elf INSTALL_DLLS="" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="-Wl,--soname=$DYNYAPLIB" if test "$dynamic_loading" = "yes" then YAPLIB_LD="\$(CC)" @@ -1123,6 +1132,7 @@ dnl Linux has both elf and a.out, in this case we found elf # and -fomit-frame-point -DBP_FREE YAPLIB="yap.dll" DYNYAPLIB="yap.dll" + SONAMEFLAG="" SHLIB_CFLAGS="$CFLAGS" SHLIB_CXXFLAGS="$CXXFLAGS" if test "$target_win64" = no @@ -1163,6 +1173,7 @@ dnl Linux has both elf and a.out, in this case we found elf fi LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" + SONAMEFLAG="" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" @@ -1469,6 +1480,7 @@ dnl objects in YAP library AC_SUBST(YAPLIB) AC_SUBST(DYNYAPLIB) AC_SUBST(LDFLAGS) +AC_SUBST(SONAMEFLAG) dnl install_info AC_SUBST(INSTALL_INFO) dnl let YAP_EXTRAS fall through configure, from the env into Makefile diff --git a/library/matrix/Makefile.in b/library/matrix/Makefile.in index ad180a93b..f1f5134d2 100644 --- a/library/matrix/Makefile.in +++ b/library/matrix/Makefile.in @@ -20,6 +20,7 @@ YAPLIBDIR=@libdir@/Yap # CC=@CC@ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include +LDFLAGS=@LDFLAGS@ # # # You shouldn't need to change what follows. @@ -47,10 +48,10 @@ matrix.o: $(srcdir)/matrix.c $(CC) -c $(CFLAGS) $(srcdir)/matrix.c -o matrix.o @DO_SECOND_LD@%.@SO@: %.o -@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -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@ +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o matrix.@SO@ matrix.o @EXTRA_LIBS_FOR_DLLS@ install: all $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) diff --git a/library/random/Makefile.in b/library/random/Makefile.in index fd2150b16..50e573ba2 100644 --- a/library/random/Makefile.in +++ b/library/random/Makefile.in @@ -20,6 +20,7 @@ YAPLIBDIR=@libdir@/Yap # CC=@CC@ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include +LDFLAGS=@LDFLAGS@ # # # You shouldn't need to change what follows. @@ -47,10 +48,10 @@ yap_random.o: $(srcdir)/yap_random.c $(CC) -c $(CFLAGS) $(srcdir)/yap_random.c -o yap_random.o @DO_SECOND_LD@%.@SO@: %.o -@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ @DO_SECOND_LD@yap_random.@SO@: yap_random.o -@DO_SECOND_LD@ @SHLIB_LD@ -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@ +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@ install: all $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) diff --git a/library/regex/Makefile.in b/library/regex/Makefile.in index 3fa49f6e4..cdb40644a 100644 --- a/library/regex/Makefile.in +++ b/library/regex/Makefile.in @@ -20,6 +20,7 @@ YAPLIBDIR=@libdir@/Yap # CC=@CC@ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include +LDFLAGS=@LDFLAGS@ # # # You shouldn't need to change what follows. @@ -59,22 +60,22 @@ regexec.o: $(srcdir)/regexec.c $(CC) -c $(CFLAGS) $(srcdir)/regexec.c -o regexec.o @DO_SECOND_LD@%.@SO@: %.o -@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -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 @EXTRA_LIBS_FOR_DLLS@ @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regexp.@SO@ regexp.o @EXTRA_LIBS_FOR_DLLS@ @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o @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@ @SHLIB_LD@ $(LDFLAGS) -o regcomp.@SO@ regcomp.o @MERGE_DLL_OBJS@ regfree.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@ @SHLIB_LD@ $(LDFLAGS) -o regerror.@SO@ regerror.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@ @SHLIB_LD@ $(LDFLAGS) -o regfree.@SO@ regfree.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@ +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@ install: all $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) diff --git a/library/rltree/Makefile.in b/library/rltree/Makefile.in index 7a697de9a..ca8ad6dac 100644 --- a/library/rltree/Makefile.in +++ b/library/rltree/Makefile.in @@ -25,6 +25,7 @@ YAPLIBDIR=@libdir@/Yap CC=@CC@ MPI_CC=mpicc CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include +LDFLAGS=@LDFLAGS@ # # # You shouldn't need to change what follows. @@ -52,10 +53,10 @@ yaprl.o: $(srcdir)/yap_rl.c $(CC) -c $(CFLAGS) $(srcdir)/yap_rl.c -o yaprl.o @DO_SECOND_LD@%.@SO@: %.o -@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @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@ +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ install: all @if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR); fi diff --git a/library/system/Makefile.in b/library/system/Makefile.in index 79871fc62..d799392b1 100644 --- a/library/system/Makefile.in +++ b/library/system/Makefile.in @@ -20,6 +20,7 @@ YAPLIBDIR=@libdir@/Yap # CC=@CC@ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include +LDFLAGS=@LDFLAGS@ # # # You shouldn't need to change what follows. @@ -47,10 +48,10 @@ sys.o: $(srcdir)/sys.c $(CC) -c $(CFLAGS) $(srcdir)/sys.c -o sys.o @DO_SECOND_LD@@DO_SECOND_LD@%.@SO@: %.o -@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -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@ +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@ install: all $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) diff --git a/library/tries/Makefile.in b/library/tries/Makefile.in index b8ddc06e2..aff464d86 100644 --- a/library/tries/Makefile.in +++ b/library/tries/Makefile.in @@ -20,6 +20,7 @@ YAPLIBDIR=@libdir@/Yap # CC=@CC@ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include +LDFLAGS=@LDFLAGS@ # # # You shouldn't need to change what follows. @@ -60,13 +61,13 @@ 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@%.@SO@: %.o -@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -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@ @SHLIB_LD@ $(LDFLAGS) -o tries.@SO@ core_tries.o base_tries.o tries.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@ +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@ install: all $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) diff --git a/packages/PLStream/Makefile.in b/packages/PLStream/Makefile.in index 110a96dfb..19a9d5306 100755 --- a/packages/PLStream/Makefile.in +++ b/packages/PLStream/Makefile.in @@ -22,6 +22,7 @@ YAPLIBDIR=@libdir@/Yap DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1 CC=@CC@ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@ +LDFLAGS=@LDFLAGS@ # # # You shouldn't need to change what follows. @@ -78,10 +79,10 @@ uxnt.o: $(srcdir)/uxnt/uxnt.c $(CC) -c $(CFLAGS) $< -o $@ @DO_SECOND_LD@%.@SO@: %.o -@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ @DO_SECOND_LD@libplstream.@SO@: $(OBJS) -@DO_SECOND_LD@ @SHLIB_LD@ -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ install: all $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) diff --git a/packages/clib/Makefile.in b/packages/clib/Makefile.in index 4a5a5753b..feb2f0c52 100755 --- a/packages/clib/Makefile.in +++ b/packages/clib/Makefile.in @@ -39,7 +39,7 @@ CRYPTLIBS=@CLIB_CRYPTLIBS@ PTHREADLIBS=@CLIB_PTHREADS@ LD=@DO_SECOND_LD@ @SHLIB_LD@ -LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ +LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@ BINTARGET=$(DESTDIR)$(YAPLIBDIR) PLTARGET=$(DESTDIR)$(SHAREDIR) diff --git a/packages/http/Makefile.in b/packages/http/Makefile.in index 8609697af..dff4493c9 100755 --- a/packages/http/Makefile.in +++ b/packages/http/Makefile.in @@ -39,7 +39,7 @@ CWD=$(PWD) # LD=@DO_SECOND_LD@ @SHLIB_LD@ -LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ +LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@ BINTARGET=$(DESTDIR)$(YAPLIBDIR) PLTARGET=$(DESTDIR)$(SHAREDIR)/http diff --git a/packages/semweb/Makefile.in b/packages/semweb/Makefile.in index 49d7617c6..54e505886 100755 --- a/packages/semweb/Makefile.in +++ b/packages/semweb/Makefile.in @@ -48,7 +48,7 @@ CWD=$(PWD) # LD=@DO_SECOND_LD@ @SHLIB_LD@ -LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ +LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@ BINTARGET=$(DESTDIR)$(YAPLIBDIR) PLTARGET=$(DESTDIR)$(SHAREDIR)/semweb diff --git a/packages/sgml/Makefile.in b/packages/sgml/Makefile.in index 3eb6c81b1..a76209cbc 100755 --- a/packages/sgml/Makefile.in +++ b/packages/sgml/Makefile.in @@ -31,6 +31,7 @@ LN_S=@LN_S@ DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1 CC=@CC@ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@ +LDFLAGS=@LDFLAGS@ MKINDEX=true LD=$(CC) @@ -117,7 +118,7 @@ ifeq (@PROLOG_SYSTEM@,yap) $(CC) $(CFLAGS) -o $@ -c $< @DO_SECOND_LD@sgml2pl.@SO@: $(PLOBJ) -@DO_SECOND_LD@ @SHLIB_LD@ -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@ +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@ all: $(TARGETS) $(PROGRAMS) diff --git a/packages/swi-minisat2/C/Makefile.in b/packages/swi-minisat2/C/Makefile.in index 0ccf74b4a..0b9c11f05 100755 --- a/packages/swi-minisat2/C/Makefile.in +++ b/packages/swi-minisat2/C/Makefile.in @@ -23,6 +23,7 @@ DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1 CC=@CC@ CXX=@CXX@ CXXFLAGS= @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../../.. -I$(srcdir)/../../../include @CPPFLAGS@ +LDFLAGS=@LDFLAGS@ # # # You shouldn't need to change what follows. @@ -70,7 +71,7 @@ pl-minisat.o : $(srcdir)/pl-minisat.C $(CXX) -c $(CXXFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o @DO_SECOND_LD@pl-minisat.@SO@: $(OBJS) -@DO_SECOND_LD@ @SHLIB_CXX_LD@ -o pl-minisat.@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@ +@DO_SECOND_LD@ @SHLIB_CXX_LD@ $(LDFLAGS) -o pl-minisat.@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@ install: all $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) diff --git a/packages/tai/Makefile.in b/packages/tai/Makefile.in index 1ad6a6045..3e8e4b422 100755 --- a/packages/tai/Makefile.in +++ b/packages/tai/Makefile.in @@ -49,7 +49,7 @@ pl-tai.o: $(srcdir)/pl-tai.c $(CC) -c $(CFLAGS) $(srcdir)/pl-tai.c -o pl-tai.o @DO_SECOND_LD@pl-tai.@SO@: pl-tai.o -@DO_SECOND_LD@ @SHLIB_LD@ -o pl-tai.@SO@ pl-tai.o libtai/libtai.a @EXTRA_LIBS_FOR_SWIDLLS@ +@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o pl-tai.@SO@ pl-tai.o libtai/libtai.a @EXTRA_LIBS_FOR_SWIDLLS@ install: all $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) diff --git a/packages/zlib/Makefile.in b/packages/zlib/Makefile.in index 9793bcf22..fe9f41f0e 100644 --- a/packages/zlib/Makefile.in +++ b/packages/zlib/Makefile.in @@ -46,7 +46,7 @@ CWD=$(PWD) # LD=@DO_SECOND_LD@ @SHLIB_LD@ -LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ +LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@ BINTARGET=$(DESTDIR)$(YAPLIBDIR) PLTARGET=$(DESTDIR)$(SHAREDIR)