move package/PLStream to os

modify Makefiles accordingly
define __unix__ on Unix like clones (OSX, AIX, etc).

H/pl-incl.h

@@ -20,6 +20,12 @@
 #define O_XOS 1
 #endif
 
+#ifndef __unix__
+#if defined(_AIX) || defined(__APPLE__) || defined(__unix) || defined(__BEOS__) || defined(__NetBSD__)
+#define __unix__ 1
+#endif
+#endif
+
 #ifdef THREADS
 #define O_PLMT 1
 #endif

Makefile.in

@@ -60,7 +60,7 @@ YAPSTARTUP=startup.yss
 #
 CC=@CC@
 MPI_CC=@MPI_CC@
-CPPFLAGS=@CPPFLAGS@  -I. -I$(srcdir)/H -I$(srcdir)/include -I$(srcdir)/OPTYap -I$(srcdir)/BEAM -I$(srcdir)/MYDDAS
+CPPFLAGS=@CPPFLAGS@  -I. -I$(srcdir)/H -I$(srcdir)/include  -I$(srcdir)/os -I$(srcdir)/OPTYap -I$(srcdir)/BEAM -I$(srcdir)/MYDDAS
 EXECUTABLE_CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
 CFLAGS=  @YAPLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
 C_INTERF_FLAGS= @YAPLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) -I$(srcdir)/include
@@ -115,25 +115,24 @@ INTERFACE_HEADERS = \
 	$(srcdir)/include/yap_structs.h \
 	$(srcdir)/include/YapInterface.h \
 	$(srcdir)/include/SWI-Prolog.h \
-	$(srcdir)/include/SWI-Stream.h
+	$(srcdir)/os/SWI-Stream.h
 
-IOLIB_HEADERS=$(srcdir)/packages/PLStream/pl-buffer.h \
-	$(srcdir)/packages/PLStream/pl-ctype.h  \
-	$(srcdir)/packages/PLStream/pl-codelist.h \
-	$(srcdir)/packages/PLStream/pl-dtoa.h \
-	$(srcdir)/packages/PLStream/dtoa.c  \
-	$(srcdir)/packages/PLStream/pl-incl.h \
-	$(srcdir)/packages/PLStream/pl-global.h \
-	$(srcdir)/packages/PLStream/pl-mswchar.h \
-	$(srcdir)/packages/PLStream/pl-option.h  \
-	$(srcdir)/packages/PLStream/pl-opts.h  \
-	$(srcdir)/packages/PLStream/pl-os.h \
-	$(srcdir)/packages/PLStream/pl-privitf.h \
-	$(srcdir)/packages/PLStream/pl-stream.h \
-	$(srcdir)/packages/PLStream/pl-table.h \
-	$(srcdir)/packages/PLStream/pl-text.h \
-	$(srcdir)/packages/PLStream/pl-utf8.h \
-	$(srcdir)/packages/PLStream/pl-yap.h @ENABLE_WINCONSOLE@ $(srcdir)/packages/PLStream/windows/dirent.h $(srcdir)/packages/PLStream/windows/utf8.h $(srcdir)/packages/PLStream/windows/utf8.c $(srcdir)/packages/PLStream/windows/uxnt.h  $(srcdir)/packages/PLStream/windows/mswchar.h  $(srcdir)/packages/PLStream/windows/popen.c 
+IOLIB_HEADERS=$(srcdir)/os/pl-buffer.h \
+	$(srcdir)/os/pl-ctype.h  \
+	$(srcdir)/H/pl-codelist.h \
+	$(srcdir)/os/pl-dtoa.h \
+	$(srcdir)/os/dtoa.c  \
+	$(srcdir)/H/pl-incl.h \
+	$(srcdir)/H/pl-global.h \
+	$(srcdir)/os/pl-mswchar.h \
+	$(srcdir)/os/pl-option.h  \
+	$(srcdir)/os/pl-os.h \
+	$(srcdir)/os/pl-privitf.h \
+	$(srcdir)/os/pl-stream.h \
+	$(srcdir)/os/pl-table.h \
+	$(srcdir)/os/pl-text.h \
+	$(srcdir)/os/pl-utf8.h \
+	$(srcdir)/H/pl-yap.h @ENABLE_WINCONSOLE@ $(srcdir)/os/windows/dirent.h $(srcdir)/os/windows/utf8.h $(srcdir)/os/windows/utf8.c $(srcdir)/os/windows/uxnt.h  $(srcdir)/os/windows/mswchar.h  $(srcdir)/os/windows/popen.c 
 
 HEADERS = \
 	$(srcdir)/H/TermExt.h \
@@ -202,26 +201,26 @@ HEADERS = \
 	$(srcdir)/MYDDAS/myddas_statistics_structs.h \
 	$(srcdir)/MYDDAS/myddas_wkb.h $(srcdir)/MYDDAS/myddas_wkb2prolog.h
 
-IOLIB_SOURCES=$(srcdir)/packages/PLStream/pl-buffer.c $(srcdir)/packages/PLStream/pl-ctype.c \
-	$(srcdir)/packages/PLStream/pl-codelist.c \
-	$(srcdir)/packages/PLStream/pl-dtoa.c  \
-	$(srcdir)/packages/PLStream/pl-error.c  \
-	$(srcdir)/packages/PLStream/pl-file.c \
-	$(srcdir)/packages/PLStream/pl-files.c  \
-	$(srcdir)/packages/PLStream/pl-fmt.c  \
-	$(srcdir)/packages/PLStream/pl-glob.c  \
-	$(srcdir)/packages/PLStream/pl-option.c  \
-	$(srcdir)/packages/PLStream/pl-os.c \
-	$(srcdir)/packages/PLStream/pl-prologflag.c \
-	$(srcdir)/packages/PLStream/pl-privitf.c \
-	$(srcdir)/packages/PLStream/pl-read.c \
-	$(srcdir)/packages/PLStream/pl-rl.c  \
-	$(srcdir)/packages/PLStream/pl-stream.c $(srcdir)/packages/PLStream/pl-string.c \
-	$(srcdir)/packages/PLStream/pl-table.c \
-	$(srcdir)/packages/PLStream/pl-tai.c  \
-	$(srcdir)/packages/PLStream/pl-text.c \
-	$(srcdir)/packages/PLStream/pl-write.c \
-	$(srcdir)/packages/PLStream/pl-yap.c @ENABLE_WINCONSOLE@$(srcdir)/packages/PLStream/windows/uxnt.c
+IOLIB_SOURCES=$(srcdir)/os/pl-buffer.c $(srcdir)/os/pl-ctype.c \
+	$(srcdir)/os/pl-codelist.c \
+	$(srcdir)/os/pl-dtoa.c  \
+	$(srcdir)/os/pl-error.c  \
+	$(srcdir)/os/pl-file.c \
+	$(srcdir)/os/pl-files.c  \
+	$(srcdir)/os/pl-fmt.c  \
+	$(srcdir)/os/pl-glob.c  \
+	$(srcdir)/os/pl-option.c  \
+	$(srcdir)/os/pl-os.c \
+	$(srcdir)/os/pl-prologflag.c \
+	$(srcdir)/os/pl-privitf.c \
+	$(srcdir)/os/pl-read.c \
+	$(srcdir)/os/pl-rl.c  \
+	$(srcdir)/os/pl-stream.c $(srcdir)/os/pl-string.c \
+	$(srcdir)/os/pl-table.c \
+	$(srcdir)/os/pl-tai.c  \
+	$(srcdir)/os/pl-text.c \
+	$(srcdir)/os/pl-write.c \
+	$(srcdir)/C/pl-yap.c @ENABLE_WINCONSOLE@$(srcdir)/os/windows/uxnt.c
 
 C_SOURCES= \
 	$(IOLIB_SOURCES) \
@@ -548,7 +547,7 @@ eamindex.o:  $(srcdir)/BEAM/eamindex.c config.h
 sys.o: $(srcdir)/library/system/sys.c config.h
 	$(CC) -c $(CFLAGS) -I$(srcdir)/include $(srcdir)/library/system/sys.c  -o $@
 
-swi.o: $(srcdir)/library/dialect/swi/fli/swi.c  $(srcdir)/library/dialect/swi/fli/swi.h $(srcdir)/include/SWI-Prolog.h $(srcdir)/include/SWI-Stream.h config.h
+swi.o: $(srcdir)/library/dialect/swi/fli/swi.c  $(srcdir)/library/dialect/swi/fli/swi.h $(srcdir)/include/SWI-Prolog.h $(srcdir)/os/SWI-Stream.h config.h
 	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)/library/dialect/swi/fli  $(srcdir)/library/dialect/swi/fli/swi.c  -o $@
 
 blobs.o: $(srcdir)/library/dialect/swi/fli/blobs.c  $(srcdir)/library/dialect/swi/fli/swi.h  $(srcdir)/include/SWI-Prolog.h config.h
@@ -572,92 +571,92 @@ regfree.o: $(srcdir)/library/regex/regfree.c $(srcdir)/library/regex/regex2.h co
 regexec.o: $(srcdir)/library/regex/regexec.c config.h
 	$(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/library/regex $(srcdir)/library/regex/regexec.c -o regexec.o
 
-pl-nt.o: $(srcdir)/packages/PLStream/pl-nt.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-nt.c -o $@
+pl-nt.o: $(srcdir)/os/pl-nt.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-nt.c -o $@
 
 pl-ntcon.o: $(srcdir)/console/LGPL/pl-ntcon.c config.h
 	$(CC) -municode -DUNICODE -D_UNICODE -c $(CFLAGS) -DPL_CONSOLE=1 -I$(srcdir)/include $(srcdir)/console/LGPL/pl-ntcon.c -o $@
 
 pl-ntconsole.o: $(srcdir)/console/LGPL/pl-ntconsole.c config.h
-	$(CC) -municode -DUNICODE -D_UNICODE -c $(CFLAGS) -DPL_CONSOLE=1  -I$(srcdir) -I$(srcdir)/include -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/console/LGPL/pl-ntconsole.c -o $@
+	$(CC) -municode -DUNICODE -D_UNICODE -c $(CFLAGS) -DPL_CONSOLE=1  -I$(srcdir) -I$(srcdir)/include -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/console/LGPL/pl-ntconsole.c -o $@
 
 pl-ntmain.o: $(srcdir)/console/LGPL/pl-ntmain.c config.h
-	$(CC) -municode -DUNICODE -D_UNICODE -c $(CFLAGS) -DPL_CONSOLE=1 -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/console/LGPL/pl-ntmain.c -o $@
+	$(CC) -municode -DUNICODE -D_UNICODE -c $(CFLAGS) -DPL_CONSOLE=1 -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/console/LGPL/pl-ntmain.c -o $@
 
-pl-buffer.o: $(srcdir)/packages/PLStream/pl-buffer.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream  @EXTRA_INCLUDES_FOR_WIN32@  $(srcdir)/packages/PLStream/pl-buffer.c -o $@
+pl-buffer.o: $(srcdir)/os/pl-buffer.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os  @EXTRA_INCLUDES_FOR_WIN32@  $(srcdir)/os/pl-buffer.c -o $@
 
-pl-codelist.o: $(srcdir)/packages/PLStream/pl-codelist.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-codelist.c -o $@
+pl-codelist.o: $(srcdir)/os/pl-codelist.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-codelist.c -o $@
 
-pl-ctype.o: $(srcdir)/packages/PLStream/pl-ctype.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-ctype.c -o $@
+pl-ctype.o: $(srcdir)/os/pl-ctype.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-ctype.c -o $@
 
-pl-dtoa.o: $(srcdir)/packages/PLStream/pl-dtoa.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-dtoa.c -o $@
+pl-dtoa.o: $(srcdir)/os/pl-dtoa.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-dtoa.c -o $@
 
-pl-error.o: $(srcdir)/packages/PLStream/pl-error.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-error.c -o $@
+pl-error.o: $(srcdir)/os/pl-error.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-error.c -o $@
 
-pl-file.o: $(srcdir)/packages/PLStream/pl-file.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-file.c -o $@
+pl-file.o: $(srcdir)/os/pl-file.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-file.c -o $@
 
-pl-files.o: $(srcdir)/packages/PLStream/pl-files.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-files.c -o $@
+pl-files.o: $(srcdir)/os/pl-files.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-files.c -o $@
 
-pl-fmt.o: $(srcdir)/packages/PLStream/pl-fmt.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-fmt.c -o $@
+pl-fmt.o: $(srcdir)/os/pl-fmt.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-fmt.c -o $@
 
-pl-glob.o: $(srcdir)/packages/PLStream/pl-glob.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-glob.c -o $@
+pl-glob.o: $(srcdir)/os/pl-glob.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-glob.c -o $@
 
-pl-option.o: $(srcdir)/packages/PLStream/pl-option.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-option.c -o $@
+pl-option.o: $(srcdir)/os/pl-option.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-option.c -o $@
 
-pl-os.o: $(srcdir)/packages/PLStream/pl-os.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-os.c -o $@
+pl-os.o: $(srcdir)/os/pl-os.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-os.c -o $@
 
-pl-privitf.o: $(srcdir)/packages/PLStream/pl-privitf.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-privitf.c -o $@
+pl-privitf.o: $(srcdir)/os/pl-privitf.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-privitf.c -o $@
 
-pl-prologflag.o: $(srcdir)/packages/PLStream/pl-prologflag.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-prologflag.c -o $@
+pl-prologflag.o: $(srcdir)/os/pl-prologflag.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-prologflag.c -o $@
 
-pl-rl.o: $(srcdir)/packages/PLStream/pl-rl.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-rl.c -o $@
+pl-rl.o: $(srcdir)/os/pl-rl.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-rl.c -o $@
 
-pl-read.o: $(srcdir)/packages/PLStream/pl-read.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-read.c -o $@
+pl-read.o: $(srcdir)/os/pl-read.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-read.c -o $@
 
-pl-stream.o: $(srcdir)/packages/PLStream/pl-stream.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-stream.c -o $@
+pl-stream.o: $(srcdir)/os/pl-stream.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-stream.c -o $@
 
-pl-string.o: $(srcdir)/packages/PLStream/pl-string.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-string.c -o $@
+pl-string.o: $(srcdir)/os/pl-string.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-string.c -o $@
 
-pl-table.o: $(srcdir)/packages/PLStream/pl-table.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-table.c -o $@
+pl-table.o: $(srcdir)/os/pl-table.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-table.c -o $@
 
-pl-text.o: $(srcdir)/packages/PLStream/pl-text.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-text.c -o $@
+pl-text.o: $(srcdir)/os/pl-text.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-text.c -o $@
 
-pl-utf8.o: $(srcdir)/packages/PLStream/pl-utf8.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-utf8.c -o $@
+pl-utf8.o: $(srcdir)/os/pl-utf8.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-utf8.c -o $@
 
-pl-write.o: $(srcdir)/packages/PLStream/pl-write.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-write.c -o $@
+pl-write.o: $(srcdir)/os/pl-write.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-write.c -o $@
 
-pl-yap.o: $(srcdir)/packages/PLStream/pl-yap.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/pl-yap.c -o $@
+pl-yap.o: $(srcdir)/C/pl-yap.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/C/pl-yap.c -o $@
 
-pl-tai.o: $(srcdir)/packages/PLStream/pl-tai.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@  $(srcdir)/packages/PLStream/pl-tai.c -o $@
+pl-tai.o: $(srcdir)/os/pl-tai.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@  $(srcdir)/os/pl-tai.c -o $@
 
-uxnt.o: $(srcdir)/packages/PLStream/windows/uxnt.c config.h
-	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/packages/PLStream @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/packages/PLStream/windows/uxnt.c -o $@
+uxnt.o: $(srcdir)/os/windows/uxnt.c config.h
+	$(CC) -c $(CFLAGS) -I$(srcdir)/include  -I$(srcdir)  -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/windows/uxnt.c -o $@
 
 # libtai rule
-%.o : $(srcdir)/packages/PLStream/libtai/%.c config.h
+%.o : $(srcdir)/os/libtai/%.c config.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 
@@ -855,7 +854,7 @@ TAGS: $(C_SOURCES) $(PL_SOURCES) $(HEADERS)
 
 depend: $(HEADERS) $(C_SOURCES)
 	-@if test "$(GCC)" = yes; then\
-	  $(CC) -MM $(CFLAGS) -I$(srcdir)/include $(C_SOURCES) >> Makefile;\
+	  $(CC) -MM $(CFLAGS) -I$(srcdir) -I$(srcdir)/include -I$(srcdir)/os $(C_SOURCES) >> Makefile;\
 	else\
           makedepend -f - -- $(CFLAGS) -I$(srcdir)/include -- $(C_SOURCES) |\
           sed 's|.*/\([^:]*\):|\1:|' >> Makefile ;\

library/gecode/Makefile.in

@@ -23,7 +23,7 @@ SHAREDIR=$(ROOTDIR)/share
 #
 #
 CXX=@CXX@
-CXXFLAGS= @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -I. -I$(srcdir) -I../.. -I$(srcdir)/../../include
+CXXFLAGS= @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -I. -I$(srcdir) -I../.. -I$(srcdir)/../../include -I$(srcdir)/../../os
 #
 #
 # You shouldn't need to change what follows.