Index: native-src/linux.IA32/archive/makefile =================================================================== --- native-src/linux.IA32/archive/makefile.orig 2006-03-29 10:30:45.000000000 +0100 +++ native-src/linux.IA32/archive/makefile 2006-04-26 17:41:33.000000000 +0100 @@ -18,7 +18,7 @@ include ../makefile.include -CFLAGS += -fpic -I$(SHARED)common -I../zlib/dist -I../zip -I../fdlibm +CFLAGS += -fpic -I$(SHARED)common -I../zlib/dist BUILDFILES = $(SHAREDSUB)archive_copyright.o $(SHAREDSUB)jclcrc32.o \ $(SHAREDSUB)zip.o $(SHAREDSUB)adler32.o $(SHAREDSUB)inflater.o \ Index: native-src/linux.IA32/common/makefile =================================================================== --- native-src/linux.IA32/common/makefile.orig 2006-03-29 10:30:47.000000000 +0100 +++ native-src/linux.IA32/common/makefile 2006-04-26 17:42:19.000000000 +0100 @@ -18,7 +18,6 @@ include ../makefile.include -CFLAGS += -I../zlib -I../zip -I../fdlibm BUILDFILES = $(SHAREDSUB)libglob.o $(SHAREDSUB)iohelp.o \ $(SHAREDSUB)utf8encode.o $(SHAREDSUB)utf8decode.o LIBNAME = $(LIBPATH)libhycommon.a Index: native-src/linux.IA32/luni/makefile =================================================================== --- native-src/linux.IA32/luni/makefile.orig 2006-04-20 21:31:04.000000000 +0100 +++ native-src/linux.IA32/luni/makefile 2006-04-26 17:44:32.000000000 +0100 @@ -18,7 +18,7 @@ include ../makefile.include -CFLAGS += -fpic -I$(SHARED)common -I../zlib -I../zip -I$(SHARED)fdlibm +CFLAGS += -fpic -I$(SHARED)common -I$(SHARED)fdlibm BUILDFILES = \ $(SHAREDSUB)luni_copyright.o $(SHAREDSUB)file.o procimpl.o \ Index: native-src/linux.IA32/text/makefile =================================================================== --- native-src/linux.IA32/text/makefile.orig 2006-03-29 10:30:47.000000000 +0100 +++ native-src/linux.IA32/text/makefile 2006-04-26 17:45:12.000000000 +0100 @@ -18,7 +18,7 @@ include ../makefile.include -CFLAGS += -fpic -I../zlib -I../zip -I../fdlibm +CFLAGS += -fpic BUILDFILES = text_copyright.o $(SHAREDSUB)BidiWrapper.o MDLLIBFILES = \ Index: native-src/linux.IA32/vmls/makefile =================================================================== --- native-src/linux.IA32/vmls/makefile.orig 2006-03-31 17:30:16.000000000 +0100 +++ native-src/linux.IA32/vmls/makefile 2006-04-26 17:45:28.000000000 +0100 @@ -18,7 +18,6 @@ include ../makefile.include -CFLAGS += -I../vmls BUILDFILES = $(SHAREDSUB)vmls.o LIBNAME = $(LIBPATH)libhyvmls.a Index: native-src/win.IA32/archive/makefile =================================================================== --- native-src/win.IA32/archive/makefile.orig 2006-03-29 10:30:38.000000000 +0100 +++ native-src/win.IA32/archive/makefile 2006-04-26 18:02:59.000000000 +0100 @@ -22,8 +22,7 @@ LIBBASE=hyarchive DLLNAME=$(DLLPATH)$(LIBBASE).dll LIBNAME=$(LIBPATH)$(LIBBASE).lib -HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I..\zlib\dist \ - /I..\zip /I..\fdlibm +HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I..\zlib\dist HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def BUILDFILES = \ Index: native-src/win.IA32/common/makefile =================================================================== --- native-src/win.IA32/common/makefile.orig 2006-03-29 10:30:42.000000000 +0100 +++ native-src/win.IA32/common/makefile 2006-04-26 18:01:04.000000000 +0100 @@ -26,6 +26,6 @@ locklbl.obj lock386.obj \ $(SHAREDSUB)utf8decode.obj $(SHAREDSUB)utf8encode.obj -HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\zip /I..\fdlibm +HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) !include <..\rules.mak> Index: native-src/win.IA32/luni/makefile =================================================================== --- native-src/win.IA32/luni/makefile.orig 2006-04-20 21:31:04.000000000 +0100 +++ native-src/win.IA32/luni/makefile 2006-04-26 18:01:37.000000000 +0100 @@ -22,8 +22,7 @@ LIBBASE=hyluni DLLNAME=$(DLLPATH)$(LIBBASE).dll LIBNAME=$(LIBPATH)$(LIBBASE).lib -HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I..\zip \ - /I$(SHARED)fdlibm +HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I$(SHARED)fdlibm HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def BUILDFILES = \ Index: native-src/win.IA32/prefs/makefile =================================================================== --- native-src/win.IA32/prefs/makefile.orig 2006-03-29 10:30:38.000000000 +0100 +++ native-src/win.IA32/prefs/makefile 2006-04-26 18:01:58.000000000 +0100 @@ -22,7 +22,7 @@ LIBBASE=hyprefs DLLNAME=$(DLLPATH)$(LIBBASE).dll LIBNAME=$(LIBPATH)$(LIBBASE).lib -HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\zlib\dist /I..\zip /I..\fdlibm +HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def BUILDFILES = prefs_copyright.obj PreferencesImpl.obj Index: native-src/win.IA32/text/makefile =================================================================== --- native-src/win.IA32/text/makefile.orig 2006-03-29 10:30:42.000000000 +0100 +++ native-src/win.IA32/text/makefile 2006-04-26 18:02:10.000000000 +0100 @@ -23,7 +23,7 @@ DLLNAME=$(DLLPATH)$(LIBBASE).dll LIBNAME=$(LIBPATH)$(LIBBASE).lib HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def -HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\zip /I..\fdlibm +HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) BUILDFILES = text_copyright.obj $(SHAREDSUB)BidiWrapper.obj VIRTFILES = hytext.res SYSLIBFILES = ws2_32.lib Iphlpapi.lib Index: native-src/win.IA32/vmls/makefile =================================================================== --- native-src/win.IA32/vmls/makefile.orig 2006-03-31 17:30:16.000000000 +0100 +++ native-src/win.IA32/vmls/makefile 2006-04-26 18:02:29.000000000 +0100 @@ -24,6 +24,6 @@ BUILDFILES = \ $(SHAREDSUB)vmls.obj -HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\vmls +HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) !include <..\rules.mak>