You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/08/05 16:11:06 UTC
svn commit: r1510486 - in /openoffice/branches/l10n40/main:
accessibility/source/makefile.mk avmedia/prj/build.lst
avmedia/source/makefile.mk avmedia/source/quicktime/makefile.mk
solenv/inc/rules.mk
Author: jani
Date: Mon Aug 5 14:11:06 2013
New Revision: 1510486
URL: http://svn.apache.org/r1510486
Log:
extract in place for avmedia
Added:
openoffice/branches/l10n40/main/avmedia/source/makefile.mk
Modified:
openoffice/branches/l10n40/main/accessibility/source/makefile.mk
openoffice/branches/l10n40/main/avmedia/prj/build.lst
openoffice/branches/l10n40/main/avmedia/source/quicktime/makefile.mk
openoffice/branches/l10n40/main/solenv/inc/rules.mk
Modified: openoffice/branches/l10n40/main/accessibility/source/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/accessibility/source/makefile.mk?rev=1510486&r1=1510485&r2=1510486&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/accessibility/source/makefile.mk (original)
+++ openoffice/branches/l10n40/main/accessibility/source/makefile.mk Mon Aug 5 14:11:06 2013
@@ -23,7 +23,7 @@ PRJ=..
PRJNAME=accessibility
TARGET=helper
-LANGUAGE_FILELIST="helper/accessiblestrings.src,helper/accessiblestrings.src"
+LANGUAGE_FILELIST="helper/accessiblestrings.src"
.INCLUDE : settings.mk
Modified: openoffice/branches/l10n40/main/avmedia/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/avmedia/prj/build.lst?rev=1510486&r1=1510485&r2=1510486&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/avmedia/prj/build.lst (original)
+++ openoffice/branches/l10n40/main/avmedia/prj/build.lst Mon Aug 5 14:11:06 2013
@@ -2,6 +2,7 @@ av avmedia : languages tools sfx2 LIB
av avmedia usr1 - all av_mkout NULL
av avmedia\prj get - all av_prj NULL
av avmedia\inc get - all av_inv NULL
+av avmedia\source nmake - all av_source NULL
av avmedia\source\viewer nmake - all av_viewer NULL
av avmedia\source\framework nmake - all av_framework NULL
av avmedia\source\win nmake - all av_win NULL
Added: openoffice/branches/l10n40/main/avmedia/source/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/avmedia/source/makefile.mk?rev=1510486&view=auto
==============================================================================
--- openoffice/branches/l10n40/main/avmedia/source/makefile.mk (added)
+++ openoffice/branches/l10n40/main/avmedia/source/makefile.mk Mon Aug 5 14:11:06 2013
@@ -0,0 +1,30 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+#**************************************************************
+
+PRJ=..
+PRJNAME=avmedia
+TARGET=none
+
+LANGUAGE_FILELIST="framework/mediacontrol.src,viewer/mediawindow.src"
+
+.INCLUDE : settings.mk
+
+.INCLUDE : target.mk
Modified: openoffice/branches/l10n40/main/avmedia/source/quicktime/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/avmedia/source/quicktime/makefile.mk?rev=1510486&r1=1510485&r2=1510486&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/avmedia/source/quicktime/makefile.mk (original)
+++ openoffice/branches/l10n40/main/avmedia/source/quicktime/makefile.mk Mon Aug 5 14:11:06 2013
@@ -73,12 +73,12 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component
# --- Targets ------------------------------------------------------
-.INCLUDE : target.mk
.ELSE
dummy:
@echo " Nothing to build for GUIBASE=$(GUIBASE)"
.ENDIF
+.INCLUDE : target.mk
ALLTAR : $(MISC)/avmediaQuickTime.component
Modified: openoffice/branches/l10n40/main/solenv/inc/rules.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/rules.mk?rev=1510486&r1=1510485&r2=1510486&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/solenv/inc/rules.mk (original)
+++ openoffice/branches/l10n40/main/solenv/inc/rules.mk Mon Aug 5 14:11:06 2013
@@ -465,12 +465,15 @@ $(SLO)/%.obj : %.mm
.ENDIF # "$(OS)"=="MACOSX"
$(MISC)/%.dpslo :
+ @@noop
+.IF "$(MAKETARGETS)"!="genPO"
@echo "Making: " $(@:f)
@@$(RM) $@
@@-$(CDD) $(MISC) && $(!null,$(all_local_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_slo:b:+".dpcc") s_$(i)) > $(@:f)
@@-$(CDD) $(MISC) && $(!null,$(all_misc_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_misc_slo:b:+".dpcc") s_$(i)) >> $(@:f)
@$(TYPE) $(mktmp $(foreach,i,$(all_local_slo:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/s_$i) $(foreach,i,$(all_misc_slo:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/s_$i)) >> $@
@$(TYPE) $(mktmp $(TARGET)_known_dpcc+=$(all_local_slo:b:+".dpcc":^"s_") $(all_misc_slo:b:+".dpcc":^"s_")) >> $@
+.ENDIF
$(MISC)/%.dpobj :
@echo "Making: " $(@:f)