incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1336570 - /incubator/ooo/trunk/main/sdext/source/presenter/makefile.mk
Date Thu, 10 May 2012 09:58:50 GMT
Author: af
Date: Thu May 10 09:58:49 2012
New Revision: 1336570

URL: http://svn.apache.org/viewvc?rev=1336570&view=rev
Log:
Fixed build breaker and some cleanup.

Modified:
    incubator/ooo/trunk/main/sdext/source/presenter/makefile.mk

Modified: incubator/ooo/trunk/main/sdext/source/presenter/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sdext/source/presenter/makefile.mk?rev=1336570&r1=1336569&r2=1336570&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sdext/source/presenter/makefile.mk (original)
+++ incubator/ooo/trunk/main/sdext/source/presenter/makefile.mk Thu May 10 09:58:49 2012
@@ -38,14 +38,21 @@ MAXLINELENGTH:=80000
 
 PACKAGE=com.sun.PresenterScreen-$(PLATFORMID)
 
-.IF "$(L10N_framework)"==""
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
 .IF "$(ENABLE_PRESENTER_SCREEN)" == "NO"
 @all:
 	@echo "Presenter Screen build disabled."
 .ELSE
 
+.IF "$(L10N_framework)" != ""
+
+@all:
+	@echo "L10N framework disabled => Presenter Screen can not be built."
+
+.ELSE
+
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+
 DLLPRE=
 common_build_zip=
 
@@ -269,12 +276,10 @@ LINKLINKFILES= \
     $(PACKAGE)/{$(my_XHPFILES)}
 
 # --- Targets ----------------------------------
-.ENDIF # L10N_framework
 
 .INCLUDE : target.mk
 .INCLUDE : extension_helplink.mk
 
-.IF "$(L10N_framework)"==""
 $(SLO)$/PresenterComponent.obj : $(INCCOM)$/PresenterExtensionIdentifier.hxx
 
 $(INCCOM)$/PresenterExtensionIdentifier.hxx : PresenterExtensionIdentifier.txx
@@ -349,9 +354,5 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:
 
 .INCLUDE : extension_post.mk
 
-.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
-.ELSE
-ivo:
-	$(ECHO)
 .ENDIF # L10N_framework
-
+.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"



Mime
View raw message