diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-10-15 13:32:00 +0200 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-10-15 13:32:00 +0200 |
| commit | 192aeb2871ac755cdd4fbb18ea521fda77ae921d (patch) | |
| tree | 5ac12e4c06ee923763af0fb280c530fdf83eeff5 /test | |
| parent | 5588b80f74960ba3e6c2cad18532564cf558b443 (diff) | |
undoapi: fixed makefiles
Diffstat (limited to 'test')
| -rw-r--r-- | test/source/java/org/openoffice/test/makefile.mk | 6 | ||||
| -rw-r--r-- | test/source/java/org/openoffice/test/tools/makefile.mk | 16 |
2 files changed, 15 insertions, 7 deletions
diff --git a/test/source/java/org/openoffice/test/makefile.mk b/test/source/java/org/openoffice/test/makefile.mk index 76e2ffe0bcda..8340f144aed3 100644 --- a/test/source/java/org/openoffice/test/makefile.mk +++ b/test/source/java/org/openoffice/test/makefile.mk @@ -25,7 +25,7 @@ PRJ = ../../../../.. PRJNAME = test -TARGET = java +TARGET = test .IF "$(OOO_JUNIT_JAR)" != "" @@ -39,9 +39,9 @@ JAVAFILES = \ JARFILES = juh.jar ridl.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -JARTARGET = test.jar +JARTARGET = $(TARGET).jar JARCLASSDIRS = $(PACKAGE) -JARCLASSEXCLUDES = $(PACKAGE)/tools/* FOOBAR +JARCLASSEXCLUDES = $(PACKAGE)/tools/* JARCLASSPATH = $(JARFILES) # expect $(OOO_JUNIT_JAR) to be on CLASSPATH wherever test.jar is used (also, # on Windows, $(OOO_JUNIT_JAR) could be an absolute pathname with drive letter diff --git a/test/source/java/org/openoffice/test/tools/makefile.mk b/test/source/java/org/openoffice/test/tools/makefile.mk index ec7d191e6b10..1464bb958d49 100644 --- a/test/source/java/org/openoffice/test/tools/makefile.mk +++ b/test/source/java/org/openoffice/test/tools/makefile.mk @@ -25,17 +25,25 @@ PRJ = ../../../../../.. PRJNAME = test -TARGET = java +TARGET = test-tools PACKAGE = org/openoffice/test/tools +.INCLUDE: settings.mk + JARFILES = juh.jar ridl.jar unoil.jar -JAVAFILES = $(shell @$(FIND) . -name "*.java") +JAVAFILES = \ + OfficeDocument.java \ + OfficeDocumentView.java \ + DocumentType.java \ + SpreadsheetDocument.java \ + SpreadsheetView.java \ -JARTARGET = test-tools.jar +JARTARGET = $(TARGET).jar JARCLASSDIRS = $(PACKAGE) JARCLASSPATH = $(JARFILES) -.INCLUDE: settings.mk .INCLUDE: target.mk +test: + echo $(JAVACLASSFILES) |