diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-16 11:45:54 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-16 11:45:54 +0000 |
| commit | 46c6fa84d275a81f9b1eb0d953baec342ea7f052 (patch) | |
| tree | a702c593baf2801cbd1a2c5f2328d3a184d5046a /qadevOOo | |
| parent | 067a4c72eaa42d5346aaa0dd07d742b391f9fe46 (diff) | |
CWS-TOOLING: integrate CWS l10nframework01
Diffstat (limited to 'qadevOOo')
| -rwxr-xr-x | qadevOOo/makefile.mk | 3 | ||||
| -rw-r--r-- | qadevOOo/runner/makefile.mk | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/qadevOOo/makefile.mk b/qadevOOo/makefile.mk index de756b44a149..b6f816f3ce3d 100755 --- a/qadevOOo/makefile.mk +++ b/qadevOOo/makefile.mk @@ -42,13 +42,14 @@ debug=true # ------------------------------------------------ .INCLUDE : ant.mk - TST: echo $(SOLAR_JAVA) .IF "$(SOLAR_JAVA)"=="TRUE" .IF "$(ANT_HOME)"!="NO_ANT_HOME" ANT_FLAGS+=-Dbuild.source=1.5 +.IF "$(L10N_framework)"=="" ALLTAR: ANTBUILD .ENDIF .ENDIF +.ENDIF diff --git a/qadevOOo/runner/makefile.mk b/qadevOOo/runner/makefile.mk index b3afff1ba9ce..986111bd5bad 100644 --- a/qadevOOo/runner/makefile.mk +++ b/qadevOOo/runner/makefile.mk @@ -44,7 +44,7 @@ JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i) JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i) # --- Targets ------------------------------------------------------ -.IF "$(SOLAR_JAVA)"=="TRUE" +.IF "$(SOLAR_JAVA)"=="TRUE" && "$(L10N_framework)"=="" OWNJAR: ALLTAR |