Author: arielch
Date: Thu Dec 6 13:30:41 2012
New Revision: 1417860
URL: http://svn.apache.org/viewvc?rev=1417860&view=rev
Log:
odk - Add output directory for deploying extenisons
Modified:
openoffice/trunk/main/odk/examples/cpp/custompanel/Makefile
openoffice/trunk/main/odk/settings/std.mk
Modified: openoffice/trunk/main/odk/examples/cpp/custompanel/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/odk/examples/cpp/custompanel/Makefile?rev=1417860&r1=1417859&r2=1417860&view=diff
==============================================================================
--- openoffice/trunk/main/odk/examples/cpp/custompanel/Makefile (original)
+++ openoffice/trunk/main/odk/examples/cpp/custompanel/Makefile Thu Dec 6
13:30:41 2012
@@ -43,9 +43,6 @@ COMP_TYPEFLAG = $(OUT_MISC)/cpp_$(COMP_N
# Allow deploying the extension when running it
-#this should be in odk/settings/std.mk
-OUT_DEPLOY=$(OUT)/deploy
-
OUT_COMP_DEPLOY=$(OUT_DEPLOY)/$(COMP_NAME)
OUT_DEPLOY_DIR=$(subst /,$(PS),$(OUT_COMP_DEPLOY))
OUT_DEPLOY_URL=$(URLPREFIX)$(OUT_COMP_DEPLOY)
Modified: openoffice/trunk/main/odk/settings/std.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/odk/settings/std.mk?rev=1417860&r1=1417859&r2=1417860&view=diff
==============================================================================
--- openoffice/trunk/main/odk/settings/std.mk (original)
+++ openoffice/trunk/main/odk/settings/std.mk Thu Dec 6 13:30:41 2012
@@ -35,6 +35,7 @@ OUT_SLB=$(OUT)/slb
OUT_MISC=$(OUT)/misc
OUT_OBJ=$(OUT)/obj
OUT_CLASS=$(OUT)/class
+OUT_DEPLOY=$(OUT)/deploy
IDL_DIR=$(PRJ)/idl
BIN_DIR=$(PRJ)/bin
CLASSES_DIR=$(PRJ)/classes