[Libreoffice-commits] .: scp2/source scp2/util

[Andras Timar]

 scp2/source/ooo/makefile.mk   |    1 
 scp2/source/ooo/vc_redist.scp |   60 ------------------------------------------
 scp2/util/makefile.mk         |    1 
 3 files changed, 62 deletions(-)

New commits:
commit 7a3ef2719eb68d2862354181ca5a906129569a57
Author: Andras Timar <atimar at suse.com>
Date:   Fri Jan 6 19:33:42 2012 +0100

    remove vc_redist from scp2

diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 96bcb5f..c5443e9 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -343,7 +343,6 @@ PARFILES +=                        \
         folder_ooo.par             \
         folderitem_ooo.par         \
         registryitem_ooo.par       \
-        vc_redist.par              \
         mingw_dlls.par             \
         windowscustomaction_ooo.par
 .ENDIF
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
deleted file mode 100644
index a01f891..0000000
--- a/scp2/source/ooo/vc_redist.scp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-#if defined(WITH_VC_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86
-    Feature = gm_Root;
-    Name = "Microsoft_VC90_CRT_x86.msm";
-    RootDir = "TARGETDIR";
-End
-
-MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86
-    Feature = gm_Root;
-    Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm";
-    RootDir = "TARGETDIR";
-End
-
-#if defined(BUILD_X64)
-
-MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86_x64
-    Feature = gm_Root;
-    Name = "Microsoft_VC90_CRT_x86_x64.msm";
-    RootDir = "TARGETDIR";
-End
-
-MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64
-    Feature = gm_Root;
-    Name = "policy_9_0_Microsoft_VC90_CRT_x86_x64.msm";
-    RootDir = "TARGETDIR";
-End
-
-#endif
-
-#endif
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 9af2c3a..42e026d 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -148,7 +148,6 @@ SCP1FILES +=                           \
              folder_ooo.par            \
              folderitem_ooo.par        \
              windowscustomaction_ooo.par \
-             vc_redist.par             \
              mingw_dlls.par            \
              registryitem_writer.par   \
              folderitem_writer.par     \