harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r483045 - in /harmony/enhanced/classlib/trunk: depends/build/ depends/build/platform/ make/ modules/archive/src/main/native/archive/unix/ modules/archive/src/main/native/zip/unix/ modules/auth/src/main/native/auth/unix/ modules/awt/src/main...
Date Wed, 06 Dec 2006 11:58:07 GMT
Author: hindessm
Date: Wed Dec  6 03:58:05 2006
New Revision: 483045

URL: http://svn.apache.org/viewvc?view=rev&rev=483045
Log:
Added hy.cfg ant property to control debug/release.  Default is debug
ant it is only used in linux native code at present.  A similar
refactoring is required on Windows, but I'm not planning to do it.

Most of the changes were based on the patch from
"[#HARMONY-803] [classlib] debug mode by default" that I've made obsolete
by recent changes.

Modified:
    harmony/enhanced/classlib/trunk/depends/build/defines.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk
    harmony/enhanced/classlib/trunk/depends/build/rules.mk
    harmony/enhanced/classlib/trunk/make/properties.xml
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/unix/makefile
    harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/unix/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/unix/makefile
    harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile
    harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile

Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mk?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Wed Dec  6 03:58:05 2006
@@ -36,5 +36,11 @@
 DLLPATH=$(HY_HDK)/jdk/jre/bin/
 SHAREDSUB=../shared/
 
-CFLAGS = -O1 $(HY_CFLAGS) -D_REENTRANT -DIPv6_FUNCTION_SUPPORT $(VMDEBUG) \
-         -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
+DEFINES += -D_REENTRANT -DIPv6_FUNCTION_SUPPORT
+INCLUDES += -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
+
+ifeq ($(HY_CFG),release)
+OPT += -O1
+else
+OPT += -g
+endif

Modified: harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk Wed Dec  6 03:58:05
2006
@@ -13,5 +13,5 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-HY_CFLAGS = -DFREEBSD -DFREEBSD_X86 -DHYX86 -march=pentium3 \
-            -DNEEDS_SYS_TYPES
+DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES
+OPT += -march=pentium3

Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk Wed Dec  6 03:58:05
2006
@@ -13,4 +13,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-HY_CFLAGS = -DLINUX -DLINUX_IA64 -DHYIA64
+DEFINES += -DLINUX -DLINUX_IA64 -DHYIA64

Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk Wed Dec  6 03:58:05
2006
@@ -13,4 +13,5 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-HY_CFLAGS = -DLINUX -DLINUX_X86 -DHYX86 -march=pentium3
+DEFINES += -DLINUX -DLINUX_X86 -DHYX86
+OPT += -march=pentium3

Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk Wed Dec  6 03:58:05
2006
@@ -13,4 +13,5 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-HY_CFLAGS = -DLINUX -DLINUX_X86_64 -DHYX86_86 -fpic
+DEFINES += -DLINUX -DLINUX_X86_64 -DHYX86_86
+OPT += -fpic

Modified: harmony/enhanced/classlib/trunk/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/rules.mk?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mk Wed Dec  6 03:58:05 2006
@@ -17,7 +17,8 @@
 # Configuration Makefile
 #
 
-CXXFLAGS=$(CFLAGS)
+CFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(CFLAGS)
+CXXFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(CXXFLAGS)
 
 all: $(DLLNAME) $(EXENAME) $(LIBNAME)
 

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Wed Dec  6 03:58:05 2006
@@ -24,6 +24,9 @@
         Ant file of common properties to be imported by other ant files
     </description>
 
+    <!-- Release configuration -->
+    <property name="hy.cfg" value="debug" />
+
     <!-- Javac properties -->
     <!-- Explicitly set to ECJ as the default compiler. -->
     <property name="hy.javac.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"
/>
@@ -174,6 +177,10 @@
     <target name="echo" depends="svn-prop, svn-info"
             description="Display the properties defined by this ant file" >
         <echo>
+Harmony release configuration property:
+
+  hy.cfg = ${hy.cfg}
+
 Harmony javac properties:
 
   hy.javac.compiler = ${hy.javac.compiler}
@@ -297,6 +304,7 @@
                   executable="${make.command}"
                   dir="@{dir}">
                 <env key="HY_HDK" value="${hy.hdk}" />
+                <env key="HY_CFG" value="${hy.cfg}" />
                 <env key="HY_ARCH" value="${hy.arch}" />
                 <env key="HY_OS" value="${hy.os}" />
                 <env key="HY_PLATFORM" value="${hy.platform}" />

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
Wed Dec  6 03:58:05 2006
@@ -19,8 +19,8 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic -I$(SHARED)common -I../../zlib_dist \
-	-I../../include/shared
+INCLUDES += -I$(SHARED)common -I../../zlib_dist -I../../include/shared
+CFLAGS += -fpic
 
 BUILDFILES = $(SHAREDSUB)archive_copyright.o $(SHAREDSUB)jclcrc32.o \
 	$(SHAREDSUB)zip.o $(SHAREDSUB)adler32.o $(SHAREDSUB)inflater.o \

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/unix/makefile?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/unix/makefile Wed
Dec  6 03:58:05 2006
@@ -19,7 +19,9 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic -I../../zlib_dist
+INCLUDES += -I../../zlib_dist
+CFLAGS += -fpic
+
 BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
 	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o
 LIBNAME = $(LIBPATH)libhyzip.a

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile Wed Dec
 6 03:58:05 2006
@@ -19,7 +19,7 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic 
+CFLAGS += -fpic
 BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
 MDLLIBFILES = \
         $(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a
\

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile Wed Dec 
6 03:58:05 2006
@@ -17,7 +17,8 @@
 
 PNG_DIR=$(HY_HDK)/../depends/libs/build/png
 
-CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include -I$(PNG_DIR)
+CFLAGS += -fpic
+INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)/include -I$(PNG_DIR)
 
 BUILDFILES = \
   $(SHAREDSUB)/blitter.o \

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
Wed Dec  6 03:58:05 2006
@@ -17,7 +17,8 @@
 
 JPEG_DIR=$(HY_HDK)/../depends/libs/build/jpeg/
 
-CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include -I$(JPEG_DIR)
+CFLAGS += -fpic
+INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)/include -I$(JPEG_DIR)
 
 BUILDFILES = \
   $(SHAREDSUB)/JpegDecoder.o \

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile Wed Dec
 6 03:58:05 2006
@@ -17,7 +17,8 @@
 
 LCMS_DIR=$(HY_HDK)/../depends/libs/build/lcms
 
-CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include -I$(LCMS_DIR)
+CFLAGS += -fpic
+INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)/include -I$(LCMS_DIR)
 
 BUILDFILES = \
   $(SHAREDSUB)/cmmerror.o \

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile Wed
Dec  6 03:58:05 2006
@@ -15,9 +15,9 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic -I$(SHARED)common \
-	  -I/usr/X11R6/include -I/usr/include/freetype2 \
-	  -Iinclude # TOFIX move includes
+CFLAGS += -fpic
+INCLUDES += -I$(SHARED)common -I/usr/X11R6/include -I/usr/include/freetype2 \
+            -Iinclude # TOFIX move includes
 
 BUILDFILES = LinuxNativeFont.o
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile Wed
Dec  6 03:58:05 2006
@@ -15,7 +15,8 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include
+CFLAGS += -fpic
+INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)/include
 
 BUILDFILES = \
   $(SHAREDSUB)/org_apache_harmony_awt_gl_opengl_GL.o

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile Wed
Dec  6 03:58:05 2006
@@ -15,7 +15,8 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic -I$(SHARED)common -I/usr/X11R6/include
+CFLAGS += -fpic
+INCLUDES += -I$(SHARED)common -I/usr/X11R6/include
 
 BUILDFILES = \
   org_apache_harmony_awt_nativebridge_linux_ErrorHandler.o \

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
Wed Dec  6 03:58:05 2006
@@ -17,7 +17,8 @@
 
 JPEG_DIR=$(HY_HDK)/../depends/libs/build/jpeg/
 
-CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include -I$(JPEG_DIR)
+CFLAGS += -fpic
+INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)/include -I$(JPEG_DIR)
 
 BUILDFILES = \
   $(SHAREDSUB)/JpegEncoder.o \

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/unix/makefile?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/unix/makefile Wed
Dec  6 03:58:05 2006
@@ -44,11 +44,9 @@
 	$(FDLIBM_DIST)w_log.o $(FDLIBM_DIST)w_log10.o $(FDLIBM_DIST)w_pow.o $(FDLIBM_DIST)w_remainder.o
\
 	$(FDLIBM_DIST)w_scalb.o $(FDLIBM_DIST)w_sinh.o $(FDLIBM_DIST)w_sqrt.o
 
-# CFLAGS are overriden not just appended to
-CFLAGS= -O0 -fpic -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -DHYX86 -D_IEEE_LIBM \
-        -DHY_PLATFORM_DOUBLE_ORDER \
-	-I. -I$(SHAREDSUB) -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include \
-	-ffloat-store $(VMDEBUG)
+# OPTS is overriden
+OPTS := -O0 -ffloat-store -fpic
+DEFINES += -D_IEEE_LIBM -DHY_PLATFORM_DOUBLE_ORDER
 
 LIBNAME = $(LIBPATH)libhyfdlibm.a
 

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/unix/makefile?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/unix/makefile Wed Dec
 6 03:58:05 2006
@@ -19,7 +19,7 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -I../../include/shared
+INCLUDES += -I../../include/shared
 BUILDFILES = $(SHAREDSUB)vmls.o
 LIBNAME = $(LIBPATH)libhyvmls.a
 

Modified: harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile Wed
Dec  6 03:58:05 2006
@@ -15,7 +15,8 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic -I$(SHARED)common
+CFLAGS += -fpic
+INCLUDES += -I$(SHARED)common
 
 BUILDFILES = \
   $(SHAREDSUB)org_apache_harmony_misc_accessors_ArrayAccessorImpl.o \

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile Wed
Dec  6 03:58:05 2006
@@ -19,7 +19,8 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic -DHYPORT_LIBRARY_DEFINE -I$(HY_PLATFORM)
+INCLUDES += -DHYPORT_LIBRARY_DEFINE -I$(HY_PLATFORM)
+CFLAGS += -fpic
 
 BUILDFILES = \
 	$(SHAREDSUB)port_copyright.o hycpu.o $(SHAREDSUB)hyerror.o \

Modified: harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile?view=diff&rev=483045&r1=483044&r2=483045
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile Wed Dec
 6 03:58:05 2006
@@ -19,7 +19,9 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic -I../../icu4c
+CFLAGS += -fpic
+INCLUDES += -I../../icu4c
+
 BUILDFILES = $(SHAREDSUB)text_copyright.o $(SHAREDSUB)BidiWrapper.o
 
 MDLLIBFILES = \



Mime
View raw message