diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:56 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:56 +0100 |
| commit | 761118f831295454a896a6d2921db0d8212fcd5b (patch) | |
| tree | 40872f5c098ce390ef666bf86fcb124af6697989 /jfreereport/java/sac/makefile.mk | |
| parent | 459cbc6cada544c9e50cf4f86dc821853f26deda (diff) | |
| parent | 39250f089adfce87856a0a7a250511decd7418e2 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
jfreereport/java/flute/makefile.mk
jfreereport/java/libbase/makefile.mk
jfreereport/java/libfonts/makefile.mk
jfreereport/java/libformula/makefile.mk
jfreereport/java/libloader/makefile.mk
jfreereport/java/librepository/makefile.mk
jfreereport/java/libserializer/makefile.mk
jfreereport/java/libxml/makefile.mk
jfreereport/java/sac/makefile.mk
mysqlc/source/mysqlc_connection.cxx
mysqlc/source/mysqlc_connection.hxx
mysqlc/source/mysqlc_databasemetadata.cxx
mysqlc/source/mysqlc_databasemetadata.hxx
mysqlc/source/mysqlc_driver.cxx
mysqlc/source/mysqlc_driver.hxx
mysqlc/source/mysqlc_general.hxx
mysqlc/source/mysqlc_preparedstatement.hxx
mysqlc/source/mysqlc_resultsetmetadata.hxx
mysqlc/source/mysqlc_statement.hxx
sdext/source/minimizer/impoptimizer.cxx
sdext/source/pdfimport/config/description.xml
sdext/source/pdfimport/tree/drawtreevisiting.cxx
sdext/source/presenter/PresenterWindowManager.cxx
swext/prj/build.lst
Diffstat (limited to 'jfreereport/java/sac/makefile.mk')
| -rw-r--r-- | jfreereport/java/sac/makefile.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jfreereport/java/sac/makefile.mk b/jfreereport/java/sac/makefile.mk index a0dafe9c3179..4dc9b0692ad3 100644 --- a/jfreereport/java/sac/makefile.mk +++ b/jfreereport/java/sac/makefile.mk @@ -58,7 +58,7 @@ ADDITIONAL_FILES=build.xml .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all .ELSE BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all .ENDIF |