You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/05/05 21:48:59 UTC
svn commit: r400156 - in
/incubator/harmony/enhanced/classlib/trunk/native-src: linux.IA32/archive/
linux.IA32/common/ linux.IA32/luni/ linux.IA32/text/ linux.IA32/vmls/
win.IA32/archive/ win.IA32/common/ win.IA32/luni/ win.IA32/prefs/
win.IA32/text/ w...
Author: tellison
Date: Fri May 5 12:48:57 2006
New Revision: 400156
URL: http://svn.apache.org/viewcvs?rev=400156&view=rev
Log:
Apply patch HARMONY-417 (Remove include path references that aren't used)
Modified:
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile?rev=400156&r1=400155&r2=400156&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile Fri May 5 12:48:57 2006
@@ -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 \
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile?rev=400156&r1=400155&r2=400156&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile Fri May 5 12:48:57 2006
@@ -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
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile?rev=400156&r1=400155&r2=400156&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile Fri May 5 12:48:57 2006
@@ -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 \
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile?rev=400156&r1=400155&r2=400156&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile Fri May 5 12:48:57 2006
@@ -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 = \
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile?rev=400156&r1=400155&r2=400156&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile Fri May 5 12:48:57 2006
@@ -18,7 +18,6 @@
include ../makefile.include
-CFLAGS += -I../vmls
BUILDFILES = $(SHAREDSUB)vmls.o
LIBNAME = $(LIBPATH)libhyvmls.a
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile?rev=400156&r1=400155&r2=400156&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile Fri May 5 12:48:57 2006
@@ -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 = \
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile?rev=400156&r1=400155&r2=400156&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile Fri May 5 12:48:57 2006
@@ -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>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile?rev=400156&r1=400155&r2=400156&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile Fri May 5 12:48:57 2006
@@ -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 = \
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/makefile?rev=400156&r1=400155&r2=400156&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/makefile Fri May 5 12:48:57 2006
@@ -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
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile?rev=400156&r1=400155&r2=400156&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile Fri May 5 12:48:57 2006
@@ -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
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile?rev=400156&r1=400155&r2=400156&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile Fri May 5 12:48:57 2006
@@ -24,6 +24,6 @@
BUILDFILES = \
$(SHAREDSUB)vmls.obj
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\vmls
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
!include <..\rules.mak>