convert zip of makefiles.mk to a patch and skip building some we don't need

4 files changed, 256 insertions, 1 deletions

diff --git a/icc/SampleICC-makefiles.patch b/icc/SampleICC-makefiles.patch
new file mode 100644
index 000000000000..8b2781c142dd
--- /dev/null
+++ b/icc/SampleICC-makefiles.patch
@@ -0,0 +1,176 @@
+--- /dev/null	2011-10-28 11:24:51.341910850 +0100
++++ misc/build/SampleICC-1.3.2/makefile.mk	2008-04-04 14:47:18.000000000 +0100
+@@ -0,0 +1,47 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: makefile.mk,v $
++#
++# $Revision: 1.21 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++PRJ=..$/..$/..$/..
++
++PRJNAME=icc
++TARGET=create_sRGB_profile
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :	settings.mk
++
++.INCLUDE :	target.mk
++
++ALLTAR: Contrib$/CmdLine$/create_sRGB_profile$/$(TARGET)$(EXECPOST)
++
++Contrib$/CmdLine$/create_sRGB_profile$/$(TARGET)$(EXECPOST) .PHONY:
++    cd IccProfLib && dmake && cd ..$/Contrib$/ICC_utils && dmake && cd ..$/CmdLine$/create_sRGB_profile && dmake
++
+--- /dev/null	2011-10-28 11:24:51.341910850 +0100
++++ misc/build/SampleICC-1.3.2/Contrib/ICC_utils/makefile.mk	2011-11-04 08:50:20.000000000 +0000
+@@ -0,0 +1,57 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: makefile.mk,v $
++#
++# $Revision: 1.21 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++PRJ=..$/..$/..$/..$/..$/..
++
++PRJNAME=icc
++TARGET=icutil
++ENABLE_EXCEPTIONS=TRUE
++
++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :	settings.mk
++
++CFLAGS+=-I..$/..$/IccProfLib
++
++# --- Files --------------------------------------------------------
++
++SLOFILES=\
++    $(SLO)$/CAT.obj \
++    $(SLO)$/ICC_tool_exception.obj \
++    $(SLO)$/Stubs.obj \
++    $(SLO)$/Vetters.obj
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE :	target.mk
++
+--- /dev/null	2011-10-28 11:24:51.341910850 +0100
++++ misc/build/SampleICC-1.3.2/IccProfLib/makefile.mk	2011-11-04 08:51:29.000000000 +0000
+@@ -0,0 +1,63 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: makefile.mk,v $
++#
++# $Revision: 1.31 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++PRJ=..$/..$/..$/..$/..
++
++PRJNAME=icc
++TARGET=proflib
++
++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++ENABLE_EXCEPTIONS=TRUE
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :	settings.mk
++
++# --- Files --------------------------------------------------------
++
++SLOFILES=\
++	$(SLO)$/IccIO.obj \
++	$(SLO)$/IccMpeACS.obj \
++	$(SLO)$/IccMpeBasic.obj \
++	$(SLO)$/IccMpeFactory.obj \
++	$(SLO)$/IccProfile.obj \
++	$(SLO)$/IccTagBasic.obj \
++	$(SLO)$/IccTagFactory.obj \
++	$(SLO)$/IccTagLut.obj \
++	$(SLO)$/IccTagMPE.obj \
++	$(SLO)$/IccTagProfSeqId.obj \
++	$(SLO)$/IccUtil.obj \
++	$(SLO)$/md5.obj
++    
++# --- Targets ------------------------------------------------------
++
++.INCLUDE :	target.mk
++
diff --git a/icc/makefile.mk b/icc/makefile.mk
index 779def4dcf66..8bf13c3d9f7f 100644
--- a/icc/makefile.mk
+++ b/icc/makefile.mk
@@ -39,6 +39,7 @@ TARGET=icc
 TARFILE_NAME=SampleICC-1.3.2
 TARFILE_MD5=fdb27bfe2dbe2e7b57ae194d9bf36bab
 PATCH_FILES= \
+    SampleICC-makefiles.patch \
     $(TARFILE_NAME).patch \
     $(TARFILE_NAME)-fmtargs.patch
 
@@ -49,7 +50,7 @@ CONVERTFILES= \
     Contrib$/ICC_utils$/Vetters.cpp
 
 .IF "$(CROSS_COMPILING)"!="YES"
-CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip -o $(BACK_PATH)..$/makefiles.zip
+CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine
 BUILD_ACTION=dmake &&  cd Contrib$/CmdLine$/create_sRGB_profile && $(AUGMENT_LIBRARY_PATH) .$/create_sRGB_profile
 .ELSE
 CONFIGURE_ACTION= 
diff --git a/icc/makefiles.zip b/icc/makefiles.zip
deleted file mode 100644
index db08c73a206b..000000000000
--- a/icc/makefiles.zip
+++ /dev/null
diff --git a/icc/source/create_sRGB_profile/makefile.mk b/icc/source/create_sRGB_profile/makefile.mk
new file mode 100644
index 000000000000..8b687bb00fbc
--- /dev/null
+++ b/icc/source/create_sRGB_profile/makefile.mk
@@ -0,0 +1,78 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.21 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..$/..$/..$/..$/..
+
+PRJNAME=icc
+TARGET=create_sRGB_profile
+LIBTARGET=NO
+TARGETTYPE=CUI
+
+ENABLE_EXCEPTIONS=TRUE
+
+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+CFLAGS+=-I..$/..$/..$/IccProfLib -I..$/..$/ICC_utils
+
+# This tool uses unaligned memory accesses which will lead
+# to SIGBUS on platforms who care, like Solaris LP64
+.IF "$(OS)$(CPU)"=="SOLARISU"
+LINKFLAGS+=-xmemalign=8i
+.ENDIF
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= $(OBJ)$/create_sRGB_profile.obj
+
+# --- Targets ------------------------------------------------------
+
+# svdem
+APP1LIBSALCPPRT:=
+UWINAPILIB:=
+APP1NOSAL=		TRUE
+APP1TARGET= 	$(TARGET)
+APP1LIBS=\
+    $(SLB)$/proflib.lib \
+    $(SLB)$/icutil.lib
+APP1OBJS= $(OBJFILES)
+APP1STDLIBS=
+
+.INCLUDE :	target.mk
+
+ALLTAR: $(TARGET)$(EXECPOST)
+
+$(TARGET)$(EXECPOST): $(BIN)$/$(TARGET)$(EXECPOST) makefile.mk
+    rm -f $@
+    $(GNUCOPY) $(BIN)$/$(TARGET)$(EXECPOST) $@