harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r523573 - in /harmony/enhanced/jdktools/trunk: make/ modules/jpda/src/main/native/jdwp/common/transport/dt_socket/ modules/jpda/src/main/native/jdwp/linux/agent/ modules/jpda/src/main/native/jdwp/linux/transport/ modules/jpda/src/main/nativ...
Date Thu, 29 Mar 2007 06:11:51 GMT
Author: apetrenko
Date: Wed Mar 28 23:11:47 2007
New Revision: 523573

URL: http://svn.apache.org/viewvc?view=rev&rev=523573
Log:
Patch for HARMONY-3429 "[jdktools] support debug and release build modes in jdktools"

Modified:
    harmony/enhanced/jdktools/trunk/make/build-test.xml
    harmony/enhanced/jdktools/trunk/make/defines.mak
    harmony/enhanced/jdktools/trunk/make/defines.mk
    harmony/enhanced/jdktools/trunk/make/properties.xml
    harmony/enhanced/jdktools/trunk/make/rules.mak
    harmony/enhanced/jdktools/trunk/make/rules.mk
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/transport/dt_socket/SocketTransport.cpp
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/agent/makefile
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/transport/makefile
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/makefile
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/makefile
    harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/linux/makefile
    harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javae
    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/linux/makefile

Modified: harmony/enhanced/jdktools/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/build-test.xml?view=diff&rev=523573&r1=523572&r2=523573
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/build-test.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/build-test.xml Wed Mar 28 23:11:47 2007
@@ -30,7 +30,7 @@
     <property name="hy.hdk" location="deploy" />
     <property name="hy.jdk" location="${hy.hdk}/jdk" />
 
-    <condition property="not.copy.jdk">
+    <condition property="not.copy.jre">
         <isset property="test.jre.home"/>
     </condition>
     <property name="test.jre.home" location="${hy.jdk}" />

Modified: harmony/enhanced/jdktools/trunk/make/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/defines.mak?view=diff&rev=523573&r1=523572&r2=523573
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/defines.mak (original)
+++ harmony/enhanced/jdktools/trunk/make/defines.mak Wed Mar 28 23:11:47 2007
@@ -13,8 +13,14 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-APPVER=4.0
-TARGETOS=WIN95
+!ifndef APPVER
+APPVER=4.0 #Default Windows version
+!endif
+
+!ifndef TARGETOS
+TARGETOS=WIN95 #Compile for Win95 by default
+!endif
+
 _WIN32_IE=0x0500
 SEHMAP = TRUE
 !include <win32.mak>
@@ -24,7 +30,30 @@
 DLLPATH=$(HY_HDK)\jdk\jre\bin\# ditto
 SHAREDSUB=..\shared\# ditto
 
-HYCFLAGS = \
-  -Ogityb1 -WX -GF -Gs -MD -Zi -Zm400 \
-  -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0400 \
-  $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I.
+!IF "$(HY_OS)-$(HY_ARCH)" == "windows-x86_64" 
+WARNING_LEVEL=-W0
+PLATFORM_64=-DHYX86_64
+!ELSE
+WARNING_LEVEL=
+!ENDIF
+
+HYCOMMONCFLAGS = \
+  -GF -Gs -MD -Zm400 \
+  -D_DLL -D_MT -D_WINSOCKAPI_ $(PLATFORM_64) \
+  -I$(HY_HDK)\include -I$(HY_HDK)\jdk\include -I.
+
+!ifndef HYDEBUGCFLAGS
+HYDEBUGCFLAGS = \
+  -Zi -Od -D_DEBUG
+!endif
+
+!ifndef HYRELEASECFLAGS  
+HYRELEASECFLAGS = \
+  -Ogityb1 -DNDEBUG
+!endif
+
+!IF "$(HY_CFG)" == "debug"
+HY_CFLAGS = $(HY_CFLAGS) $(HYCOMMONCFLAGS) $(HYDEBUGCFLAGS)
+!ELSE  
+HY_CFLAGS = $(HY_CFLAGS) $(HYCOMMONCFLAGS) $(HYRELEASECFLAGS)
+!ENDIF

Modified: harmony/enhanced/jdktools/trunk/make/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/defines.mk?view=diff&rev=523573&r1=523572&r2=523573
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/defines.mk (original)
+++ harmony/enhanced/jdktools/trunk/make/defines.mk Wed Mar 28 23:11:47 2007
@@ -29,5 +29,19 @@
 DLLPATH=$(HY_HDK)/jdk/jre/bin/
 SHAREDSUB=../shared/
 
-CFLAGS = -O1 $(HY_CFLAGS) -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT \
-         -D$(HY_ARCH_DEFINE) $(VMDEBUG) -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
+HYCOMMONFLAGS = -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -D$(HY_ARCH_DEFINE) \
+                -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
+
+ifndef HYDEBUGCFLAGS
+HYDEBUGCFLAGS = -g -D_DEBUG
+endif
+
+ifndef HYRELEASECFLAGS  
+HYRELEASECFLAGS = -O1 -DNDEBUG
+endif
+
+ifeq ($(HY_CFG),release)
+HY_CFLAGS += $(HYCOMMONFLAGS) $(HYRELEASECFLAGS)
+else
+HY_CFLAGS += $(HYCOMMONFLAGS) $(HYDEBUGCFLAGS)
+endif

Modified: harmony/enhanced/jdktools/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/properties.xml?view=diff&rev=523573&r1=523572&r2=523573
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/properties.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/properties.xml Wed Mar 28 23:11:47 2007
@@ -24,14 +24,20 @@
         Ant file of common properties to be imported by other ant files
     </description>
 
+    <!-- Debug or release version -->
+    <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"
/>
     <property name="hy.javac.source" value="1.5" />
     <property name="hy.javac.target" value="1.5" />
-    <property name="hy.javac.debug" value="on" />
     <property name="hy.javac.maxmem" value="384M" />
 
+    <condition property="hy.javac.debug" value="on" else="off">
+        <equals arg1="${hy.cfg}" arg2="debug" />
+    </condition>
+
     <!-- Test run property -->
     <property name="hy.test.forkmode" value="perBatch" />
     <property name="hy.test.timeout" value="900000" />
@@ -120,13 +126,23 @@
         <equals arg1="${hy.arch}" arg2="ia64"/>
     </condition>
 
+    <!-- use native compiler option "-fpic" on 64-bit linux/unix platforms -->
     <condition property="hy.cflags" value="-fpic">
-        <equals arg1="${hy.arch}" arg2="x86_64"/>
+        <and>
+            <isset property="is.64bit"/>
+            <not>
+                <isset property="is.windows"/>
+            </not>
+        </and>
     </condition>
+    <!-- use native compiler option "-march=pentium3" on 32-bit linux/unix platform -->
     <condition property="hy.cflags" value="-march=pentium3">
-        <not>
-            <equals arg1="${hy.arch}" arg2="ia64"/>
-        </not>
+        <and>
+            <isset property="is.32bit"/>
+            <not>
+                <isset property="is.windows"/>
+            </not>
+        </and>
     </condition>
     
     <!-- Normalized platform name -->
@@ -172,6 +188,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}
@@ -293,6 +313,7 @@
                 <env key="HY_HDK" value="${hy.hdk}" />
                 <env key="HY_DRLVM" value="${hy.drlvm}" />
                 <env key="HY_JDKTOOLS" value="${harmony.jdktools}" />
+                <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/jdktools/trunk/make/rules.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/rules.mak?view=diff&rev=523573&r1=523572&r2=523573
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/rules.mak (original)
+++ harmony/enhanced/jdktools/trunk/make/rules.mak Wed Mar 28 23:11:47 2007
@@ -13,14 +13,22 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+!IF "$(HY_OS)-$(HY_ARCH)" == "windows-x86_64" 
+ml=ml64
+DLLENTRY=
+!ELSE
+ml=ml
+DLLENTRY=@12
+!ENDIF
+
 .c.obj:
-	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.c
+	$(cc) $(cflags) $(HY_CFLAGS) -Fo$*.obj $*.c
 
 .cpp.obj:
-	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.cpp
+	$(cc) $(cflags) $(HY_CFLAGS) -Fo$*.obj $*.cpp
 
 .asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
+	$(ml) /Fo$*.obj /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
 
 .rc.res:
 	rc -I..\include $<
@@ -30,19 +38,21 @@
 !ifdef LIBNAME
 $(LIBNAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
 	$(implib) /NOLOGO -subsystem:windows -out:$(LIBNAME) \
-	$(HYLDFLAGS) -machine:$(CPU) \
+	$(HY_LDFLAGS) -machine:$(CPU) \
 	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
 !endif
 
 !ifdef DLLNAME
 $(DLLNAME): $(LIBNAME)
 	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
-	-entry:_DllMainCRTStartup@12 -dll /BASE:$(DLLBASE) -machine:$(CPU) \
+	-entry:_DllMainCRTStartup$(DLLENTRY) -dll /BASE:$(DLLBASE) -machine:$(CPU) \
         $(COMMENT) \
 	-subsystem:windows -out:$@ -map:$*.map \
 	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES) \
 	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib \
         comdlg32.lib winspool.lib  $(LIBPATH)$(*F).exp
+	if exist $(DLLNAME).manifest \
+		mt -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2
 !endif
 
 !ifdef EXENAME
@@ -50,10 +60,14 @@
 	link /NOLOGO $(EXEFLAGS) /debug /opt:icf /opt:ref $(VMLINK) \
 	-out:$(EXENAME) -machine:$(CPU) setargv.obj  \
 	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(EXEDLLFILES) 
+	if exist $(EXENAME).manifest \
+		mt -manifest $(EXENAME).manifest -outputresource:$(EXENAME);#1
 !endif
 
 clean:
     -del $(BUILDFILES) *.res *.pdb \
              $(LIBNAME) $(LIBNAME:.lib=.exp) \
              $(DLLNAME) $(DLLNAME:.dll=.pdb) $(DLLNAME:.dll=.map) \
-             $(EXENAME) $(EXENAME:.exe=.pdb) >nul 2>&1
+			 $(DLLNAME).manifest \
+             $(EXENAME) $(EXENAME:.exe=.pdb) $(EXENAME).manifest \
+             $(CLEANFILES) >nul 2>&1

Modified: harmony/enhanced/jdktools/trunk/make/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/rules.mk?view=diff&rev=523573&r1=523572&r2=523573
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/rules.mk (original)
+++ harmony/enhanced/jdktools/trunk/make/rules.mk Wed Mar 28 23:11:47 2007
@@ -17,7 +17,9 @@
 # Configuration Makefile
 #
 
-CXXFLAGS=$(CFLAGS)
+CFLAGS   += $(HY_CFLAGS)
+CXXFLAGS += $(HY_CFLAGS)
+LDFLAGS  += $(HY_LDFLAGS)
 
 all: $(DLLNAME) $(EXENAME) $(LIBNAME)
 

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/transport/dt_socket/SocketTransport.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/transport/dt_socket/SocketTransport.cpp?view=diff&rev=523573&r1=523572&r2=523573
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/transport/dt_socket/SocketTransport.cpp
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/common/transport/dt_socket/SocketTransport.cpp
Wed Mar 28 23:11:47 2007
@@ -259,7 +259,7 @@
         return JDWPTRANSPORT_ERROR_NONE;
     }
 
-    char* colon = strchr(address, ':');
+    const char* colon = strchr(address, ':');
     if (colon == 0) {  //address is like "port"
         sa->sin_port = htons((u_short)atoi(address));
         sa->sin_addr.s_addr = isServer ? htonl(INADDR_ANY) : inet_addr("127.0.0.1");

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/agent/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/agent/makefile?view=diff&rev=523573&r1=523572&r2=523573
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/agent/makefile
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/agent/makefile
Wed Mar 28 23:11:47 2007
@@ -20,19 +20,15 @@
 
 #
 
-include $(HY_JDKTOOLS)/make/makefile.include
+include $(HY_JDKTOOLS)/make/defines.mk
 
 COMMON=../../common/
 CMNAGENT=$(COMMON)agent/
 
-CFLAGS = -O1 $(HY_CFLAGS) -D_DEBUG -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT \
-         $(VMDEBUG) -I$(HY_HDK)/jdk/include -I. \
-         -I$(CMNAGENT)commands   -I$(CMNAGENT)core \
-         -I$(COMMON)generic -Icore
+HY_CFLAGS += -I$(CMNAGENT)commands -I$(CMNAGENT)core \
+             -I$(COMMON)generic -Icore
 
-CFLAGS += -fPIC
-
-LDFLAGS = -lstdc++ -lgcc_s
+HY_LDFLAGS += -lstdc++ -lgcc_s
 
 BUILDFILES = \
     $(CMNAGENT)commands/ArrayReference.o \

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/transport/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/transport/makefile?view=diff&rev=523573&r1=523572&r2=523573
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/transport/makefile
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/linux/transport/makefile
Wed Mar 28 23:11:47 2007
@@ -21,20 +21,15 @@
 
 #
 
-include $(HY_JDKTOOLS)/make/makefile.include
+include $(HY_JDKTOOLS)/make/defines.mk
 
 COMMON=../../common/
 CMNTRANS=$(COMMON)transport/
 
-CFLAGS = -O1 $(HY_CFLAGS) -D_DEBUG -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT \
-         $(VMDEBUG) -I$(HY_HDK)/jdk/include -I. \
-         -I$(CMNTRANS)common   -I$(CMNTRANS)dt_socket \
-         -I$(COMMON)generic -Idt_socket
-                  
+HY_CFLAGS += -I$(CMNTRANS)common -I$(CMNTRANS)dt_socket \
+             -I$(COMMON)generic -Idt_socket
 
-CFLAGS += -fPIC
-
-LDFLAGS = -lstdc++ -lgcc_s
+HY_LDFLAGS += -lstdc++ -lgcc_s
 
 BUILDFILES = \
     $(CMNTRANS)common/LastTransportError.o \

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/makefile?view=diff&rev=523573&r1=523572&r2=523573
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/makefile
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/makefile
Wed Mar 28 23:11:47 2007
@@ -29,13 +29,13 @@
 DLLNAME=..\$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 
-HYCFLAGS = \
-         -GX -wd4290 \
-         -I$(HY_HDK)\jdk\include -I. \
-         -I$(CMNAGENT)commands   -I$(CMNAGENT)core \
-         -I$(COMMON)generic -Icore $(HYCFLAGS)
+INCLUDES = $(INCLUDES) \
+         -I$(CMNAGENT)commands -I$(CMNAGENT)core \
+         -I$(COMMON)generic -Icore
 
-HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
+HY_CFLAGS = $(HY_CFLAGS) $(INCLUDES) -GX -wd4290
+
+HY_LDFLAGS = $(HY_LDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
     $(CMNAGENT)commands\ArrayReference.obj \

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/makefile?view=diff&rev=523573&r1=523572&r2=523573
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/makefile
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/makefile
Wed Mar 28 23:11:47 2007
@@ -30,13 +30,13 @@
 DLLNAME=..\$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 
-HYCFLAGS = $(HYCFLAGS) \
-         -GX -wd4290 \
-         -I$(HY_HDK)\jdk\include -I. \
-         -I$(CMNTRANS)common   -I$(CMNTRANS)dt_socket \
+INCLUDES = $(INCLUDES) \
+         -I$(CMNTRANS)common -I$(CMNTRANS)dt_socket \
          -I$(COMMON)generic -Idt_socket
 
-HYLDFLAGS = $(HYLDFLAGS) -def:dt_socket\$(LIBBASE).def
+HY_CFLAGS = $(HY_CFLAGS) $(INCLUDES) -GX -wd4290
+
+HY_LDFLAGS = $(HY_LDFLAGS) -def:dt_socket\$(LIBBASE).def
 
 BUILDFILES = \
     $(CMNTRANS)common\LastTransportError.obj \

Modified: harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/linux/makefile?view=diff&rev=523573&r1=523572&r2=523573
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/linux/makefile
(original)
+++ harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/linux/makefile
Wed Mar 28 23:11:47 2007
@@ -17,7 +17,7 @@
 # Makefile for 'launcher'
 #
 
-include $(HY_JDKTOOLS)/make/makefile.include
+include $(HY_JDKTOOLS)/make/defines.mk
 
 BUILDFILES = $(SHAREDSUB)main.o $(SHAREDSUB)cmain.o \
 	$(SHAREDSUB)launcher_copyright.o $(SHAREDSUB)strbuf.o \

Modified: harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javae
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javae?view=diff&rev=523573&r1=523572&r2=523573
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javae
(original)
+++ harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/windows/makefile.javae
Wed Mar 28 23:11:47 2007
@@ -20,7 +20,6 @@
 !include <$(HY_JDKTOOLS)\make\defines.mak>
 
 EXENAME=$(EXEPATH)java.exe
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
 BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)cmain.obj \
         $(SHAREDSUB)main.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/linux/makefile?view=diff&rev=523573&r1=523572&r2=523573
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/linux/makefile (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/linux/makefile Wed
Mar 28 23:11:47 2007
@@ -17,7 +17,7 @@
 # Makefile for 'samsa'
 #
 
-include $(HY_JDKTOOLS)/make/makefile.include
+include $(HY_JDKTOOLS)/make/defines.mk
 
 BUILDFILES = ../samsa.o
 



Mime
View raw message