fix user c predicates

fix Makefiles to handle case where so is o.


git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@183 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc
2001-11-18 21:00:57 +00:00
parent b2934a5aeb
commit 5682ce7622
8 changed files with 192 additions and 162 deletions

View File

@@ -45,11 +45,11 @@ dll: random@SHLIB_SUFFIX@
random.o: $(srcdir)/random.c
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/random.c -o random.o
%@SHLIB_SUFFIX@: %.o
@SHLIB_LD@ -o $@ $<
@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $<
random@SHLIB_SUFFIX@: random.o
@SHLIB_LD@ -o random@SHLIB_SUFFIX@ random.o
@DO_SECOND_LD@random@SHLIB_SUFFIX@: random.o
@DO_SECOND_LD@ @SHLIB_LD@ -o random@SHLIB_SUFFIX@ random.o
#
# create a new DLL library on cygwin environments

View File

@@ -57,23 +57,23 @@ regfree.o: $(srcdir)/regfree.c
regexec.o: $(srcdir)/regexec.c
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/regexec.c -o regexec.o
%@SHLIB_SUFFIX@: %.o
@SHLIB_LD@ -o $@ $<
@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $<
regexp@SHLIB_SUFFIX@: regexp.o
@SHLIB_LD@ -o regexp@SHLIB_SUFFIX@ regexp.o
@DO_SECOND_LD@regexp@SHLIB_SUFFIX@: regexp.o
@DO_SECOND_LD@ @SHLIB_LD@ -o regexp@SHLIB_SUFFIX@ regexp.o
regcomp@SHLIB_SUFFIX@: regcomp.o
@SHLIB_LD@ -o regcomp@SHLIB_SUFFIX@ regcomp.o
@DO_SECOND_LD@regcomp@SHLIB_SUFFIX@: regcomp.o
@DO_SECOND_LD@ @SHLIB_LD@ -o regcomp@SHLIB_SUFFIX@ regcomp.o
regerror@SHLIB_SUFFIX@: regerror.o
@SHLIB_LD@ -o regerror@SHLIB_SUFFIX@ regerror.o
@DO_SECOND_LD@regerror@SHLIB_SUFFIX@: regerror.o
@DO_SECOND_LD@ @SHLIB_LD@ -o regerror@SHLIB_SUFFIX@ regerror.o
regfree@SHLIB_SUFFIX@: regfree.o
@SHLIB_LD@ -o regfree@SHLIB_SUFFIX@ regfree.o
@DO_SECOND_LD@regfree@SHLIB_SUFFIX@: regfree.o
@DO_SECOND_LD@ @SHLIB_LD@ -o regfree@SHLIB_SUFFIX@ regfree.o
regexec@SHLIB_SUFFIX@: regexec.o
@SHLIB_LD@ -o regexec@SHLIB_SUFFIX@ regexec.o
@DO_SECOND_LD@regexec@SHLIB_SUFFIX@: regexec.o
@DO_SECOND_LD@ @SHLIB_LD@ -o regexec@SHLIB_SUFFIX@ regexec.o
#
# create a new DLL library on cygwin environments

View File

@@ -147,10 +147,22 @@ file_property(File, Type, Size, Date) :-
file_property(File, Type, Size, Date, _Permissions, Error),
handle_system_error(Error, off, file_property(File)).
file_exists(File) :-
var(File), !,
throw(error(instantiation_error,file_exists(File))).
file_exists(File) :-
\+ atom(File), !,
throw(error(type_error(atom,File),file_exists(File))).
file_exists(File) :-
file_property(File, _Type, _Size, _Date, _Permissions, Error),
var(Error).
file_exists(File, Permissions) :-
var(File), !,
throw(error(instantiation_error,file_exists(File, Permissions))).
file_exists(File, Permissions) :-
\+ atom(File), !,
throw(error(type_error(atom,File),file_exists(File, Permissions))).
file_exists(File, Permissions) :-
file_property(File, _Type, _Size, _Date, FPermissions, Error),
var(Error),

View File

@@ -45,11 +45,11 @@ dll: sys@SHLIB_SUFFIX@
sys.o: $(srcdir)/sys.c
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/sys.c -o sys.o
%@SHLIB_SUFFIX@: %.o
@SHLIB_LD@ -o $@ $<
@DO_SECOND_LD@@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $<
sys@SHLIB_SUFFIX@: sys.o
@SHLIB_LD@ -o sys@SHLIB_SUFFIX@ sys.o
@DO_SECOND_LD@sys@SHLIB_SUFFIX@: sys.o
@DO_SECOND_LD@ @SHLIB_LD@ -o sys@SHLIB_SUFFIX@ sys.o
#
# create a new DLL library on cygwin environments