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/02/23 15:37:07 UTC
svn commit: r380125 -
/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile
Author: tellison
Date: Thu Feb 23 06:36:53 2006
New Revision: 380125
URL: http://svn.apache.org/viewcvs?rev=380125&view=rev
Log:
Applying patch HARMONY-122 (Redundant cd commands in the win.ia32 archive makefile)
Modified:
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile
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=380125&r1=380124&r2=380125&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 Thu Feb 23 06:36:53 2006
@@ -10,75 +10,74 @@
# 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.
-
-#
-# Makefile for module 'archive'
-#
-
-APPVER=4.0
-TARGETOS=WIN95
-_WIN32_IE=0x0500
-SEHMAP = TRUE
-!include <win32.mak>
-
-DLLFILENAME=hyarchive.dll# declaration
-
-DLLNAME=..\hyarchive.dll# declaration
-
-LIBNAME=hyarchive# 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..\archive /I..\common /I..\zlib /I..\zip /I..\fdlibm $(VMDEBUG) $*.c
-
-.cpp.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..\archive /I..\common /I..\zlib /I..\zip /I..\fdlibm $(VMDEBUG) $*.cpp
-
-.asm.obj:
- ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
-
-.rc.res:
- rc -I..\include $<
-
-BUILDFILES1 = archive_copyright.obj jclcrc32.obj zip.obj adler32.obj inflater.obj
-BUILDFILES2 = jarfile.obj deflater.obj archiveglob.obj
-
-VIRTFILES1 = hyarchive.res
-
-SYSLIBFILES1 = ws2_32.lib Iphlpapi.lib
-
-MDLLIBFILES1 = ..\lib\hycommon.lib ..\lib\hysig.lib ..\lib\hyzip.lib ..\lib\hyzlib.lib
-MDLLIBFILES2 = ..\lib\hypool.lib ..\lib\hyfdlibm.lib ..\lib\hythr.lib ..\lib\vmi.lib
-
-all: \
- ..\lib\$(LIBNAME).lib $(DLLNAME)
-
-BUILDLIB: $(LIBPATH)$(LIBNAME).lib
-
-$(LIBPATH)$(LIBNAME).lib:\
- $(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2)
- $(implib) /nologo -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib -def:$(LIBNAME).def -machine:$(CPU) \
- $(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2)
-
-
-$(DLLNAME): $(LIBPATH)$(LIBNAME).lib \
- $(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2)
- link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x13100000 -machine:$(CPU) \
- -subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map \
- $(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) \
- $(SYSLIBFILES1) \
- kernel32.lib ws2_32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib $(LIBPATH)$(LIBNAME).exp
- cd ..
- cd archive
-
-clean:
- -del *.map
- -del *.obj
- -del *.res
- -del *.pdb
- -del ..\lib\$(LIBNAME).lib
- -del ..\lib\$(LIBNAME).exp
- -del ..\$(LIBNAME).pdb
- -del $(DLLNAME)
+# limitations under the License.
+
+#
+# Makefile for module 'archive'
+#
+
+APPVER=4.0
+TARGETOS=WIN95
+_WIN32_IE=0x0500
+SEHMAP = TRUE
+!include <win32.mak>
+
+DLLFILENAME=hyarchive.dll# declaration
+
+DLLNAME=..\hyarchive.dll# declaration
+
+LIBNAME=hyarchive# 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..\archive /I..\common /I..\zlib /I..\zip /I..\fdlibm $(VMDEBUG) $*.c
+
+.cpp.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..\archive /I..\common /I..\zlib /I..\zip /I..\fdlibm $(VMDEBUG) $*.cpp
+
+.asm.obj:
+ ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
+
+.rc.res:
+ rc -I..\include $<
+
+BUILDFILES1 = archive_copyright.obj jclcrc32.obj zip.obj adler32.obj inflater.obj
+BUILDFILES2 = jarfile.obj deflater.obj archiveglob.obj
+
+VIRTFILES1 = hyarchive.res
+
+SYSLIBFILES1 = ws2_32.lib Iphlpapi.lib
+
+MDLLIBFILES1 = ..\lib\hycommon.lib ..\lib\hysig.lib ..\lib\hyzip.lib ..\lib\hyzlib.lib
+MDLLIBFILES2 = ..\lib\hypool.lib ..\lib\hyfdlibm.lib ..\lib\hythr.lib ..\lib\vmi.lib
+
+all: \
+ ..\lib\$(LIBNAME).lib $(DLLNAME)
+
+BUILDLIB: $(LIBPATH)$(LIBNAME).lib
+
+$(LIBPATH)$(LIBNAME).lib:\
+ $(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2)
+ $(implib) /nologo -subsystem:windows -out:$(LIBPATH)$(LIBNAME).lib -def:$(LIBNAME).def -machine:$(CPU) \
+ $(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2)
+
+
+$(DLLNAME): $(LIBPATH)$(LIBNAME).lib \
+ $(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2)
+ link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x13100000 -machine:$(CPU) \
+ -subsystem:windows -out:$(DLLNAME) -map:$(LIBNAME).map \
+ $(BUILDFILES1) $(BUILDFILES2) $(VIRTFILES1) $(MDLLIBFILES1) $(MDLLIBFILES2) \
+ $(SYSLIBFILES1) \
+ 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)