harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r382065 [10/10] - in /incubator/harmony/enhanced/classlib/trunk: modules/security/make/ modules/security/make/native/linux/ modules/security/make/native/windows/ native-src/ native-src/linux.IA32/ native-src/linux.IA32/archive/ native-src/l...
Date Wed, 01 Mar 2006 15:43:11 GMT
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=382065&r1=382064&r2=382065&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 Wed Mar  1
07:42:53 2006
@@ -16,32 +16,25 @@
 # Makefile for module 'luni'
 #
 
-APPVER=4.0
-TARGETOS=WIN95
-_WIN32_IE=0x0500
-SEHMAP = TRUE
-!include <win32.mak>
+!include <..\defines.mak>
 
-DLLFILENAME=hyluni.dll# declaration
-
-DLLNAME=..\hyluni.dll# declaration
-
-LIBNAME=hyluni# declaration
-
-LIBPATH=..\lib\# declaration
-
-.c.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32
-Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include /I..\luni /I..\common /I..\zlib /I..\zip /I..\fdlibm
 $(VMDEBUG) $*.c
-
-.rc.res:
-	rc -I..\include $<
+SHAREDSUB=$(SHARED)luni\# comment to avoid \ being treated as continuation
+LIBBASE=hyluni
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I..\zip \
+	   /I$(SHARED)fdlibm
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  luni_copyright.obj file.obj procimpl.obj oos.obj fileis.obj simpl.obj \
-  psimpl2.obj nethelp.obj floatbits.obj rafile.obj ois.obj helpers.obj \
-  math.obj luniglob.obj proxy.obj netif.obj process.obj bigint.obj osc.obj \
-  socket.obj inetadds.obj pssimpl.obj filedesc.obj timezone.obj pmsimpl.obj \
-  pdsimpl.obj fileos.obj
+  $(SHAREDSUB)luni_copyright.obj $(SHAREDSUB)file.obj procimpl.obj \
+  $(SHAREDSUB)oos.obj $(SHAREDSUB)fileis.obj simpl.obj \
+  $(SHAREDSUB)psimpl2.obj nethelp.obj $(SHAREDSUB)floatbits.obj \
+  $(SHAREDSUB)rafile.obj $(SHAREDSUB)ois.obj helpers.obj math.obj \
+  luniglob.obj $(SHAREDSUB)proxy.obj $(SHAREDSUB)netif.obj process.obj \
+  bigint.obj $(SHAREDSUB)osc.obj socket.obj inetadds.obj \
+  $(SHAREDSUB)pssimpl.obj $(SHAREDSUB)filedesc.obj $(SHAREDSUB)timezone.obj \
+  $(SHAREDSUB)pmsimpl.obj pdsimpl.obj $(SHAREDSUB)fileos.obj
 
 VIRTFILES = hyluni.res
 
@@ -51,28 +44,7 @@
   ..\lib\hycommon.lib ..\lib\hysig.lib ..\lib\hyzip.lib ..\lib\hyzlib.lib \
   ..\lib\hypool.lib ..\lib\hyfdlibm.lib ..\lib\hythr.lib ..\lib\vmi.lib
 
-all: $(DLLNAME)
+DLLBASE=0x13200000
+COMMENT=/comment:"LUNI component native code. (c) Copyright 1991, 2005 The Apache Software
Foundation or its licensors, as applicable."
 
-$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
-	-def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
-
-
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib
-	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
-	-entry:_DllMainCRTStartup@12 -dll /BASE:0x13200000 -machine:$(CPU) \
-	/comment:"LUNI component native code. (c) Copyright 1991, 2005 The Apache Software Foundation
or its licensors, as applicable." \
-	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
-	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES) \
-	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
-
-clean:
-	-del *.map
-	-del *.obj
-	-del *.res
-	-del *.pdb
-	-del ..\lib\$(LIBNAME).lib
-	-del ..\lib\$(LIBNAME).exp
-	-del ..\$(LIBNAME).pdb
-	-del $(DLLNAME)
+!include <..\rules.mak>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/math/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/math/makefile?rev=382065&r1=382064&r2=382065&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/math/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/math/makefile Wed Mar  1
07:42:53 2006
@@ -16,31 +16,21 @@
 # Makefile for module 'math'
 #
 
-APPVER=4.0
-TARGETOS=WIN95
-_WIN32_IE=0x0500
-SEHMAP = TRUE
-!include <win32.mak>
+!include <..\defines.mak>
 
-DLLFILENAME=hymath.dll# declaration
-
-DLLNAME=..\hymath.dll# declaration
-
-LIBNAME=hymath# declaration
-
-LIBPATH=..\lib\# declaration
-
-.c.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32
-Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include /I..\math /I..\common /I..\zlib /I..\zip /I..\fdlibm
 $(VMDEBUG) $*.c
-
-.rc.res:
-	rc -I..\include $<
+SHAREDSUB=$(SHARED)math\# comment to avoid \ being treated as continuation
+LIBBASE=hymath
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+HYCFLAGS = $(HYCFLAGS) /I$(SHARED)common /I..\zip /I..\fdlibm
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  math_copyright.obj fltparse.obj mathglob.obj dblparse.obj bigint.obj \
-  cbigint.obj
+  $(SHAREDSUB)math_copyright.obj $(SHAREDSUB)fltparse.obj \
+  $(SHAREDSUB)mathglob.obj $(SHAREDSUB)dblparse.obj bigint.obj \
+  $(SHAREDSUB)cbigint.obj
 
-VIRTFILES = hymath.res
+VIRTFILES = $(LIBBASE).res
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
@@ -48,29 +38,7 @@
   ..\lib\hycommon.lib ..\lib\hysig.lib ..\lib\hypool.lib ..\lib\hyfdlibm.lib \
   ..\lib\hythr.lib ..\lib\vmi.lib
 
-all: $(DLLNAME)
+DLLBASE=0x13300000
+COMMENT=/comment:"Math component native code. (c) Copyright 1991, 2005 The Apache Software
Foundation or its licensors, as applicable."
 
-$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) 
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
-	-def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) 
-
-
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib
-	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
-	-entry:_DllMainCRTStartup@12 -dll /BASE:0x13300000 -machine:$(CPU) \
-	/comment:"Math component native code. (c) Copyright 1991, 2005 The Apache Software Foundation
or its licensors, as applicable." \
-	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
-	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) \
-	$(SYSLIBFILES)  \
-	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
-
-clean:
-	-del *.map
-	-del *.obj
-	-del *.res
-	-del *.pdb
-	-del ..\lib\$(LIBNAME).lib
-	-del ..\lib\$(LIBNAME).exp
-	-del ..\$(LIBNAME).pdb
-	-del $(DLLNAME)
+!include <..\rules.mak>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/makefile?rev=382065&r1=382064&r2=382065&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/makefile Wed Mar  1
07:42:53 2006
@@ -16,31 +16,23 @@
 # Makefile for module 'nio'
 #
 
-APPVER=4.0
-TARGETOS=WIN95
-SEHMAP = TRUE
-!include <win32.mak>
+!include <..\defines.mak>
 
-DLLFILENAME=hynio.dll# declaration
+SHAREDSUB=$(SHARED)nio\# comment to avoid \ being treated as continuation
+LIBBASE=hynio
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
 
-DLLNAME=..\hynio.dll# declaration
-
-LIBNAME=hynio# declaration
-
-LIBPATH=..\lib\# declaration
-
-.c.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32
-Ogityb1 -Gs -GF -Zm400 -Zi -WX  /I..\include /I..\nio /I..\common /I..\zlib /I..\zip /I..\fdlibm
 $(VMDEBUG) $*.c
-
-.rc.res:
-	rc -I..\include $<
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I..\zip /I..\fdlibm
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  nio_copyright.obj OSFileSystemWin32.obj OSFileSystem.obj OSMemoryWin32.obj \
+  $(SHAREDSUB)nio_copyright.obj OSFileSystemWin32.obj \
+  $(SHAREDSUB)OSFileSystem.obj OSMemoryWin32.obj \
   OSMemory.obj nethelp.obj helpers.obj socket.obj OSNetworkSystem.obj \
   OSNetworkSystemWin32.obj
 
-VIRTFILES = hynio.res
+VIRTFILES = $(LIBBASE).res
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib Mswsock.lib
 
@@ -48,29 +40,7 @@
   ..\lib\hycommon.lib ..\lib\hysig.lib ..\lib\hyzip.lib ..\lib\hyzlib.lib \
   ..\lib\hypool.lib ..\lib\hyfdlibm.lib ..\lib\hythr.lib ..\lib\vmi.lib
 
-all: $(DLLNAME)
-	
-$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
-	-def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
-
-
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib
-	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
-	-entry:_DllMainCRTStartup@12 -dll /BASE:0x13300000 -machine:$(CPU) \
-	/comment:"NIO component native code. (c) Copyright 1991, 2005 The Apache Software Foundation
or its licensors, as applicable." \
-	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
-	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES)  \
-	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
-
-
-clean:
-	-del *.map
-	-del *.obj
-	-del *.res
-	-del *.pdb
-	-del ..\lib\$(LIBNAME).lib
-	-del ..\lib\$(LIBNAME).exp
-	-del ..\$(LIBNAME).pdb
-	-del $(DLLNAME)
+DLLBASE=0x13300000
+COMMENT=/comment:"NIO component native code. (c) Copyright 1991, 2005 The Apache Software
Foundation or its licensors, as applicable."
+
+!include <..\rules.mak>

Propchange: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar  1 07:42:53 2006
@@ -1 +1,2 @@
 *.obj
+*.pdb

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile?rev=382065&r1=382064&r2=382065&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile Wed Mar  1
07:42:53 2006
@@ -16,27 +16,10 @@
 # Makefile for module 'pool'
 #
 
-APPVER=4.0
-TARGETOS=WIN95
-_WIN32_IE=0x0500
-SEHMAP = TRUE
-!include <win32.mak>
+!include <..\defines.mak>
 
-LIBNAME=hypool.lib# declaration
+SHAREDSUB=$(SHARED)pool\# comment to avoid \ being treated as continuation
+LIBNAME=$(LIBPATH)hypool.lib
+BUILDFILES = pool.obj $(SHAREDSUB)pool_cap.obj
 
-LIBPATH=..\lib\# declaration
-
-BUILDFILES = pool.obj pool_cap.obj
-
-.c.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32
-Ogityb1 -Gs -GF -Zm400 -WX -Zi -Fd$(LIBPATH)hypool.pdb /I..\include  $(VMDEBUG) $*.c
-
-all: $(LIBPATH)$(LIBNAME)
-
-$(LIBPATH)$(LIBNAME): $(BUILDFILES) 
-	$(implib) /NOLOGO -out:$(LIBPATH)$(LIBNAME) $(BUILDFILES)
-
-clean:
-	-del *.obj
-	-del $(LIBPATH)$(LIBNAME)
-	-del $(LIBPATH)hypool.pdb
+!include <..\rules.mak>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile?rev=382065&r1=382064&r2=382065&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile Wed Mar  1
07:42:53 2006
@@ -1,11 +1,11 @@
 # Copyright 1998, 2005 The Apache Software Foundation or its licensors, as applicable
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,64 +16,34 @@
 # Makefile for module 'port'
 #
 
-APPVER=4.0
-TARGETOS=WIN95
-_WIN32_IE=0x0500
-SEHMAP = TRUE
-!include <win32.mak>
-
-DLLFILENAME=hyprt.dll# declaration
-
-DLLNAME=..\hyprt.dll # declaration
-
-LIBNAME=hyprt# declaration
-
-LIBPATH=..\lib\# declaration
+!include <..\defines.mak>
 
-.c.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32
-Ogityb1 -Gs -GF -Zm400 -WX -Zi  -DHYPORT_LIBRARY_DEFINE /I..\include $(VMDEBUG) $*.c
+SHAREDSUB=$(SHARED)port\# comment to avoid \ being treated as continuation
+LIBBASE=hyprt
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
 
-.rc.res:
-	rc -I..\include $<
+HYCFLAGS = $(HYCFLAGS) -DHYPORT_LIBRARY_DEFINE /I$(SHAREDSUB)
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  port_copyright.obj hycpu.obj hyerror.obj hyerrorhelpers.obj hyexit.obj \
-  hyfile.obj hyfiletext.obj hygp.obj hyipcmutex.obj hymem.obj hymmap.obj \
-  hynls.obj hynlshelpers.obj hyosdump.obj hyport.obj hyportcontrol.obj \
+  $(SHAREDSUB)port_copyright.obj hycpu.obj $(SHAREDSUB)hyerror.obj \
+  hyerrorhelpers.obj $(SHAREDSUB)hyexit.obj hyfile.obj hyfiletext.obj \
+  $(SHAREDSUB)hygp.obj hyipcmutex.obj hymem.obj hymmap.obj hynls.obj \
+  hynlshelpers.obj hyosdump.obj hyport.obj $(SHAREDSUB)hyportcontrol.obj \
   hyportptb.obj hyshmem.obj hyshsem.obj hysignal.obj hysl.obj hysock.obj \
-  hystr.obj hystrftime.obj hystsl.obj hysysinfo.obj hytime.obj \
-  hytlshelpers.obj hytty.obj hyvmem.obj
+  hystr.obj $(SHAREDSUB)hystrftime.obj $(SHAREDSUB)hystsl.obj hysysinfo.obj \
+  hytime.obj $(SHAREDSUB)hytlshelpers.obj hytty.obj hyvmem.obj
 
 VIRTFILES = hyprt.res
 
-SYSLIBFILES = ws2_32.lib Iphlpapi.lib shell32.lib
+SYSLIBFILES = \
+	Delayimp.lib -delayload:shell32.dll -delayload:Iphlpapi.dll \
+	ws2_32.lib Iphlpapi.lib shell32.lib
 
 MDLLIBFILES = ..\lib\hythr.lib ..\lib\hycommon.lib ..\lib\hysig.lib
 
-all: $(DLLNAME)
+DLLBASE=0x11100000
+COMMENT=/comment:"Platform port library. (c) Copyright 1993, 2005 The Apache Software Foundation
or its licensors, as applicable."
 
-$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) 
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
-	-def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) 
-
-
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib
-	link $(VMLINK) /NOLOGO /debug /opt:icf /opt:ref /INCREMENTAL:NO \
-	/NOLOGO -entry:_DllMainCRTStartup@12 \
-         -dll /BASE:0x11100000 -machine:$(CPU) \
-	/comment:"Platform port library. (c) Copyright 1993, 2005 The Apache Software Foundation
or its licensors, as applicable." \
-	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map Delayimp.lib -delayload:shell32.dll
-delayload:Iphlpapi.dll \
-	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES)  \
-	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
-
-clean:
-	-del *.map
-	-del *.obj
-	-del *.res
-	-del *.pdb
-	-del ..\lib\$(LIBNAME).lib
-	-del ..\lib\$(LIBNAME).exp
-	-del ..\$(LIBNAME).pdb
-	-del $(DLLNAME)
-	
+!include <..\rules.mak>

Added: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/rules.mak
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/rules.mak?rev=382065&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/rules.mak (added)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/rules.mak Wed Mar  1 07:42:53
2006
@@ -0,0 +1,54 @@
+# Copyright 1998, 2005 The Apache Software Foundation or its licensors, as applicable
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.c.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.c
+
+.asm.obj:
+	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
+
+.rc.res:
+	rc -I..\include $<
+
+all: $(DLLNAME) $(EXENAME) $(LIBNAME)
+
+!ifdef LIBNAME
+$(LIBNAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+	$(implib) /NOLOGO -subsystem:windows -out:$(LIBNAME) \
+	$(HYLDFLAGS) -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) \
+        $(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
+!endif
+
+!ifdef EXENAME
+$(EXENAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+	link /NOLOGO $(EXEFLAGS) /debug /opt:icf /opt:ref $(VMLINK) \
+	-out:$(EXENAME) -machine:$(CPU) setargv.obj  \
+	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(EXEDLLFILES) 
+!endif
+
+clean:
+	-del $(BUILDFILES) *.res *.pdb \
+             $(LIBNAME) $(LIBNAME:.lib=.exp) $(LIBNAME:.lib=.map) \
+             $(DLLNAME) $(EXENAME)

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile?rev=382065&r1=382064&r2=382065&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile Wed Mar  1
07:42:53 2006
@@ -16,52 +16,15 @@
 # Makefile for module 'sig'
 #
 
-APPVER=4.0
-TARGETOS=WIN95
-_WIN32_IE=0x0500
-SEHMAP = TRUE
-!include <win32.mak>
-
-DLLFILENAME=hysig.dll# declaration
-
-DLLNAME=..\hysig.dll# declaration
-
-LIBNAME=hysig# declaration
-
-LIBPATH=..\lib\# declaration
-
-.c.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32
-Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include $(VMDEBUG) $*.c
-
-.rc.res:
-	rc -I..\include $<
+!include <..\defines.mak>
 
+LIBBASE=hysig
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
 BUILDFILES = hysig_copyright.obj hysigwin.obj
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
+VIRTFILES = $(LIBBASE).res
+DLLBASE=0x13100000
+COMMENT=/comment:"Signal handling support DLL. (c) Copyright 1993, 2005 The Apache Software
Foundation or its licensors, as applicable."
 
-VIRTFILES = hysig.res
-
-all: $(DLLNAME)
-
-$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) 
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
-	-def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES) $(VIRTFILES) 
-
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib
-	link $(VMLINK) /NOLOGO /debug /opt:icf /opt:ref /INCREMENTAL:NO \
-	/NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x13100000 \
-	-machine:$(CPU) \
-	/comment:"Signal handling support DLL. (c) Copyright 1993, 2005 The Apache Software Foundation
or its licensors, as applicable." \
-	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
-	$(BUILDFILES) $(VIRTFILES)  \
-	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
-
-clean:
-	-del *.map
-	-del *.obj
-	-del *.res
-	-del *.pdb
-	-del ..\lib\$(LIBNAME).lib
-	-del ..\lib\$(LIBNAME).exp
-	-del ..\$(LIBNAME).pdb
-	-del $(DLLNAME)
+!include <..\rules.mak>

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=382065&r1=382064&r2=382065&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 Wed Mar  1
07:42:53 2006
@@ -16,57 +16,23 @@
 # Makefile for module 'text'
 #
 
-APPVER=4.0
-TARGETOS=WIN95
-SEHMAP = TRUE
-!include <win32.mak>
-
-DLLFILENAME=hytext.dll# declaration
-
-DLLNAME=..\hytext.dll# declaration
-
-LIBNAME=hytext# declaration
-
-LIBPATH=..\lib\# declaration
-
-.c.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32
-Ogityb1 -Gs -GF -Zm400 -Zi -WX  /I..\include /I..\text /I..\zlib /I..\zip /I..\fdlibm  $(VMDEBUG)
$*.c
-
-.rc.res:
-	rc -I..\include $<
+!include <..\defines.mak>
 
+SHAREDSUB=$(SHARED)text\# comment to avoid \ being treated as continuation
+LIBBASE=hytext
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def 
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\zip /I..\fdlibm
 BUILDFILES = text_copyright.obj BidiWrapper.obj
-
 VIRTFILES = hytext.res
-
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = \
   ..\lib\hysig.lib ..\lib\hycommon.lib ..\lib\hypool.lib ..\lib\hyfdlibm.lib \
   ..\lib\hythr.lib ..\lib\vmi.lib icuuc.lib
 
-all: $(DLLNAME)
-	
-$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
-	-def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
-
-
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib
-	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
-	-entry:_DllMainCRTStartup@12 -dll /BASE:0x13300000 -machine:$(CPU) \
-	/comment:"Text component native code. (c) Copyright 1993, 2005 The Apache Software Foundation
or its licensors, as applicable." \
-	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
-	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES)  \
-	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib icuuc.lib
$(LIBPATH)$(LIBNAME).exp
+DLLBASE=0x13300000
+COMMENT=/comment:"Text component native code. (c) Copyright 1993, 2005 The Apache Software
Foundation or its licensors, as applicable."
 
-clean:
-	-del *.map
-	-del *.obj
-	-del *.res
-	-del *.pdb
-	-del ..\lib\$(LIBNAME).lib
-	-del ..\lib\$(LIBNAME).exp
-	-del ..\$(LIBNAME).pdb
-	-del $(DLLNAME)
+!include <..\rules.mak>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile?rev=382065&r1=382064&r2=382065&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile Wed Mar
 1 07:42:53 2006
@@ -16,60 +16,25 @@
 # Makefile for module 'thread'
 #
 
-APPVER=4.0
-TARGETOS=WIN95
-_WIN32_IE=0x0500
-SEHMAP = TRUE
-!include <win32.mak>
+!include <..\defines.mak>
 
-DLLFILENAME=hythr.dll# declaration
-
-DLLNAME=..\hythr.dll# declaration
-
-LIBNAME=hythr# declaration
-
-LIBPATH=..\lib\# declaration
-
-.c.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32
-Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include  $(VMDEBUG) $*.c
-
-.asm.obj:
-	ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32  $<
-
-.rc.res:
-	rc -I..\include $<
+SHAREDSUB=$(SHARED)thread\# comment to avoid \ being treated as continuation
+LIBBASE=hythr
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
 
 BUILDFILES = \
-  thread_copyright.obj thrhelp.obj thrspinlock.obj hythread.obj \
-  hythreadinspect.obj rwmutex.obj thrdsup.obj thrprof.obj
-
-VIRTFILES = hythr.res
+  $(SHAREDSUB)thread_copyright.obj thrhelp.obj thrspinlock.obj hythread.obj \
+  $(SHAREDSUB)hythreadinspect.obj $(SHAREDSUB)rwmutex.obj thrdsup.obj \
+  thrprof.obj
+
+# TOFIX $(LIBBASE).def should be a dependency on all libs
+VIRTFILES = $(LIBBASE).res
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def 
 
 MDLLIBFILES = ..\lib\hypool.lib ..\lib\hycommon.lib
 
-all: $(DLLNAME)
+DLLBASE=0x11500000
+COMMENT=/comment:"Thread support library. (c) Copyright 1993, 2005 The Apache Software Foundation
or its licensors, as applicable."
 
-$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) 
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
-	-def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES) $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) 
-
-
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib $(LIBNAME).def
-	link $(VMLINK) /NOLOGO /debug /opt:icf /opt:ref /INCREMENTAL:NO \
-	/NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x11500000 \
-	-machine:$(CPU) -subsystem:windows \
-	-out:$(DLLNAME) -map:$(LIBNAME).map  \
-	/comment:"Thread support library. (c) Copyright 1993, 2005 The Apache Software Foundation
or its licensors, as applicable." \
-	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)  \
-	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
-
-clean:
-	-del *.map
-	-del *.obj
-	-del *.res
-	-del *.pdb
-	-del ..\lib\$(LIBNAME).lib
-	-del ..\lib\$(LIBNAME).exp
-	-del ..\hythr.pdb
-	-del $(DLLNAME)
+!include <..\rules.mak>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile?rev=382065&r1=382064&r2=382065&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile Wed Mar  1
07:42:53 2006
@@ -16,40 +16,16 @@
 # Makefile for module 'vmi'
 #
 
-APPVER=4.0
-TARGETOS=WIN95
-_WIN32_IE=0x0500
-SEHMAP = TRUE
-!include <win32.mak>
+!include <..\defines.mak>
 
-DLLFILENAME=vmi.dll# declaration
+SHAREDSUB=$(SHARED)vmi\# comment to avoid \ being treated as continuation
+LIBBASE=vmi
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+HYCFLAGS = $(HYCFLAGS) -DHYPORT_LIBRARY_DEFINE
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
-DLLNAME=..\vmi.dll# declaration
-
-LIBNAME=vmi# declaration
-
-LIBPATH=..\lib\# declaration
-
-.c.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32
-Ogityb1 -Gs -GF -Zm400 -WX -Zi  /I..\include  $(VMDEBUG) $*.c
-
-.rc.res:
-	rc -I..\include $<
-
-BUILDFILES = vmi_copyright.obj vmi.obj
+BUILDFILES = $(SHAREDSUB)vmi_copyright.obj $(SHAREDSUB)vmi.obj
 
 VIRTFILES = vmi.res
 
-all: ..\lib\$(LIBNAME).lib
-
-$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES)
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
-	-def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES) $(VIRTFILES)
-
-clean:
-	-del *.obj
-	-del *.pdb
-	-del *.res
-	-del $(LIBPATH)$(LIBNAME).lib
-	-del $(LIBPATH)$(LIBNAME).exp
+!include <..\rules.mak>

Propchange: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar  1 07:42:53 2006
@@ -1 +1,2 @@
 *.obj
+*.pdb

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile?rev=382065&r1=382064&r2=382065&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile Wed Mar  1
07:42:53 2006
@@ -16,27 +16,13 @@
 # Makefile for module 'zip'
 #
 
-APPVER=4.0
-TARGETOS=WIN95
-_WIN32_IE=0x0500
-SEHMAP = TRUE
-!include <win32.mak>
+!include <..\defines.mak>
 
-LIBNAME=hyzip.lib# declaration
+SHAREDSUB=$(SHARED)zip\# comment to avoid \ being treated as continuation
+LIBBASE=hyzip
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+BUILDFILES = $(SHAREDSUB)zcpool.obj $(SHAREDSUB)zipalloc.obj \
+	$(SHAREDSUB)zipcache.obj $(SHAREDSUB)zipsup.obj
+HYCFLAGS = $(HYCFLAGS) /I..\zlib\dist
 
-LIBPATH=..\lib\# declaration
-
-BUILDFILES = zcpool.obj zipalloc.obj zipcache.obj zipsup.obj
-
-.c.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32
-Ogityb1 -Gs -GF -Zm400 -WX -Zi -Fd$(LIBPATH)hyzip.pdb /I..\include /I..\zlib\dist  $(VMDEBUG)
$*.c
-
-all: $(LIBPATH)$(LIBNAME)
-
-$(LIBPATH)$(LIBNAME): $(BUILDFILES)
-	$(implib) /NOLOGO -out:$(LIBPATH)$(LIBNAME) $(BUILDFILES)
-
-clean:
-	-del *.obj
-	-del $(LIBPATH)$(LIBNAME)
-	-del $(LIBPATH)hyzip.pdb
+!include <..\rules.mak>

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile?rev=382065&r1=382064&r2=382065&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile Wed Mar  1
07:42:53 2006
@@ -16,56 +16,28 @@
 # Makefile for module 'zlib'
 #
 
-APPVER=4.0
-TARGETOS=WIN95
-_WIN32_IE=0x0500
-SEHMAP = TRUE
-!include <win32.mak>
+!include <..\defines.mak>
 
-DLLFILENAME=hyzlib.dll# declaration
-
-DLLNAME=..\hyzlib.dll# declaration
-
-LIBNAME=hyzlib# declaration
-
-LIBPATH=..\lib\# declaration
-
-.c.obj:
-	$(cc) -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 $(cflags) -D_MT -D_DLL -MD -D_WINSOCKAPI_ -DWIN32
-Ogityb1 -Gs -GF -Zm400 -W3 -Zi  /I..\include /I. $(VMDEBUG) -Fo$*.obj $*.c
-
-.rc.res:
-	rc -I..\include $<
+SHAREDSUB=$(SHARED)zlib\# comment to avoid \ being treated as continuation
+LIBBASE=hyzlib
+DLLNAME=..\$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+
+# override HYCFLAGS to get different warning behaviour (W3 not WX)
+HYCFLAGS = \
+  -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
+  -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0400 \
+  $(VMDEBUG) /I..\include /I$(SHARED)include /I.
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  zlib_copyright.obj dist/adler32.obj dist/compress.obj dist/crc32.obj \
-  dist/deflate.obj dist/gzio.obj dist/infback.obj dist/inffast.obj \
-  dist/inflate.obj dist/inftrees.obj dist/trees.obj dist/uncompr.obj \
-  dist/zutil.obj
-
-VIRTFILES = $(LIBNAME).res
-
-all: $(DLLNAME)
-
-$(LIBPATH)$(LIBNAME).lib: $(BUILDFILES) $(VIRTFILES) 
-	$(implib) /NOLOGO -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib \
-	-def:$(LIBNAME).def -machine:$(CPU) \
-	$(BUILDFILES) $(VIRTFILES) 
-
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib
-	link $(VMLINK) /NOLOGO /debug /opt:icf /opt:ref /INCREMENTAL:NO \
-	/NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x11700000 \
-	-machine:$(CPU) \
-	/comment:"zlib data compression library Copyright (C) 1995-2003 Jean-loup Gailly and Mark
Adler" \
-	-subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map  \
-	$(BUILDFILES) $(VIRTFILES)  \
-	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib  $(LIBPATH)$(LIBNAME).exp
+  $(SHAREDSUB)zlib_copyright.obj dist\adler32.obj dist\compress.obj \
+  dist\crc32.obj dist\deflate.obj dist\gzio.obj dist\infback.obj \
+  dist\inffast.obj dist\inflate.obj dist\inftrees.obj dist\trees.obj \
+  dist\uncompr.obj dist\zutil.obj
+
+VIRTFILES = $(LIBBASE).res
+DLLBASE=0x11700000
+COMMENT=/comment:"zlib data compression library Copyright (C) 1995-2003 Jean-loup Gailly
and Mark Adler"
 
-clean:
-	-del *.map
-	-del *.obj dist\*.obj
-	-del *.res
-	-del *.pdb
-	-del ..\lib\$(LIBNAME).lib
-	-del ..\lib\$(LIBNAME).exp
-	-del ..\$(LIBNAME).pdb
-	-del $(DLLNAME)
+!include <..\rules.mak>



Mime
View raw message