Kill copy'n'paste.

1 files changed, 3 insertions, 171 deletions

diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 7d5a4cccb868..1d6d69450a41 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -233,179 +233,11 @@ SCP1FILES += \
 
 SCP2LINK_PRODUCT_TYPE=osl
 SCP2TARGET = setup_osljre
-SCP2FILES  = installation_ooo.par          \
-             scpaction_ooo.par             \
-             directory_ooo.par             \
-             file_ooo.par                  \
-             file_extra_ooo.par            \
-             file_font_ooo.par             \
-             file_library_ooo.par          \
-             file_resource_ooo.par         \
-             shortcut_ooo.par              \
-             module_ooo.par                \
-             module_hidden_ooo.par         \
-             module_langpack.par           \
-             module_lang_template.par      \
-             module_helppack.par           \
-             module_help_template.par      \
-             module_java.par               \
-             profile_ooo.par               \
-             profileitem_ooo.par           \
-             module_writer.par             \
-             file_writer.par               \
-             module_calc.par               \
-             file_calc.par                 \
-             module_draw.par               \
-             file_draw.par                 \
-             module_impress.par            \
-             file_impress.par              \
-             module_base.par               \
-             file_base.par                 \
-             canvascommons.par             \
-             module_math.par               \
-             file_math.par                 \
-             module_systemint.par          \
-             module_graphicfilter.par      \
-             file_graphicfilter.par        \
-             module_extensions.par         \
-             module_extensions_sun_templates.par         \
-             module_extensions_lightproof.par  \
-             directory_extensions.par                     \
-             file_extensions.par           \
-             module_testtool.par           \
-             file_testtool.par             \
-             module_xsltfilter.par         \
-             file_xsltfilter.par           \
-             module_python.par             \
-             module_python_mailmerge.par   \
-             file_python.par               \
-             profileitem_python.par        \
-             module_accessories.par
-.IF "$(WITH_EXTRA_GALLERY)" != ""
-SCP2FILES +=                               \
-             module_gallery_accessories.par   \
-             file_gallery_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_SAMPLE)" != ""
-SCP2FILES +=                               \
-             module_samples_accessories.par   \
-             file_samples_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_TEMPLATE)" != ""
-SCP2FILES +=                               \
-             module_templates_accessories.par \
-             file_templates_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_FONT)" != ""
-SCP2FILES +=                               \
-             module_font_accessories.par      \
-             file_font_accessories.par
-.ENDIF
-SCP2FILES +=                           \
-             ure_into_ooo.par              \
-             ure.par                       \
-             common_brand.par              \
-             common_brand_readme.par       \
-             ooo_brand.par
-
-.IF "$(OS)"=="MACOSX" 
-SCP2FILES +=                               \
-             directory_ooo_macosx.par      
-.ENDIF
- 
-.IF "$(WITH_BINFILTER)" != "NO"
-SCP2FILES +=                               \
-             module_binfilter.par          \
-             registryitem_binfilter.par    \
-             file_binfilter.par
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"!=""
-SCP2FILES +=                               \
-             module_javafilter.par         \
-             file_javafilter.par
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"!="" 
-.IF "$(GUI)"=="WNT"
-SCP2FILES +=                               \
-             registryitem_javafilter.par
-.ENDIF
-.ENDIF
+SCP2FILES  = $(SCP1FILES) \
+             module_java.par
 
 .IF "$(GUI)"=="WNT"
-SCP2FILES +=                           \
-             file_jre_ooo.par          \
-             registryitem_ooo.par      \
-             folder_ooo.par            \
-             folderitem_ooo.par        \
-             windowscustomaction_ooo.par \
-             vc_redist.par             \
-             mingw_dlls.par            \
-             registryitem_writer.par   \
-             folderitem_writer.par     \
-             registryitem_calc.par     \
-             folderitem_calc.par       \
-             registryitem_draw.par     \
-             folderitem_draw.par       \
-             registryitem_impress.par  \
-             folderitem_impress.par    \
-             registryitem_base.par     \
-             folderitem_base.par       \
-             registryitem_math.par     \
-             folderitem_math.par       \
-             module_quickstart.par     \
-             file_quickstart.par       \
-             registryitem_quickstart.par
-
-.IF "$(COM)" == "MSC"
-SCP2FILES +=                           \
-             module_winexplorerext.par \
-             file_winexplorerext.par   \
-             registryitem_winexplorerext.par
-.ENDIF
-
-.IF "$(ENABLE_DIRECTX)"!=""
-SCP2FILES += directxcanvas.par
-.ENDIF
-
-.IF "$(DISABLE_ACTIVEX)"==""
-SCP2FILES +=                           \
-             module_activex.par        \
-             file_activex.par
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-.IF "$(ENABLE_GCONF)"!="" || "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!=""
-SCP2FILES += \
-             module_gnome.par   \
-             file_gnome.par
-.ENDIF
-
-.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_KDE4)" == "TRUE"
-SCP2FILES += \
-             module_kde.par     \
-             file_kde.par
-.ENDIF
-.ENDIF
-
-.IF "$(ENABLE_CRASHDUMP)" != ""
-SCP2FILES += \
-             file_crashrep.par
-.ENDIF
-
-SCP2FILES += \
-             vclcanvas.par
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-SCP2FILES += layout.par
-.ENDIF # ENABLE_LAYOUT == TRUE
-
-.IF "$(ENABLE_ONLINE_UPDATE)"!=""
-SCP2FILES += \
-             module_onlineupdate.par   \
-             file_onlineupdate.par
+SCP2FILES += file_jre_ooo.par
 .ENDIF
 
 # ------------------------------------------------------------------------