summaryrefslogtreecommitdiff
path: root/stoc/test
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-02-01 18:07:04 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-02-01 18:22:56 +0100
commit6d0f5c32d0a1c03e29b00cb3c40ce02eb7193f38 (patch)
tree70ffbc2d55d469a942a6b35a272b33142cb5245f /stoc/test
parent96cbf81e6fc78a9758170c480031f17d1e86f33e (diff)
Clean up makefiles
Diffstat (limited to 'stoc/test')
-rw-r--r--stoc/test/excomp/makefile.mk1
-rw-r--r--stoc/test/javavm/testapplet/makefile.mk9
-rw-r--r--stoc/test/javavm/testcomponent/makefile.mk10
3 files changed, 6 insertions, 14 deletions
diff --git a/stoc/test/excomp/makefile.mk b/stoc/test/excomp/makefile.mk
index b41acb372..01ffb65a5 100644
--- a/stoc/test/excomp/makefile.mk
+++ b/stoc/test/excomp/makefile.mk
@@ -31,7 +31,6 @@ TARGET= excomp
TARGET1= excomp1
TARGET2= excomp2
TARGETTYPE=CUI
-#LIBTARGET=NO
ENABLE_EXCEPTIONS=TRUE
USE_DEFFILE= TRUE
NO_BSYMBOLIC= TRUE
diff --git a/stoc/test/javavm/testapplet/makefile.mk b/stoc/test/javavm/testapplet/makefile.mk
index 4ddadebd9..31872c538 100644
--- a/stoc/test/javavm/testapplet/makefile.mk
+++ b/stoc/test/javavm/testapplet/makefile.mk
@@ -31,11 +31,12 @@ PRJNAME = testapplet
PACKAGE =
TARGET = TestApplet
-
# --- Settings -----------------------------------------------------
-#.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
.INCLUDE : settings.mk
+
# Files --------------------------------------------------------
+
JARFILES = ridl.jar jurt.jar unoil.jar
JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
@@ -45,11 +46,7 @@ JAVACLASSFILES= \
$(CLASSDIR)$/$(PACKAGE)$/TestApplet.class
JARCLASSDIRS= .
-#JARTARGET = $(TARGET).jar
-#JARCOMPRESS= TRUE
-#CUSTOMMANIFESTFILE= .$/manifest
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-
diff --git a/stoc/test/javavm/testcomponent/makefile.mk b/stoc/test/javavm/testcomponent/makefile.mk
index a2f8eb16f..9d77ebfb9 100644
--- a/stoc/test/javavm/testcomponent/makefile.mk
+++ b/stoc/test/javavm/testcomponent/makefile.mk
@@ -31,11 +31,12 @@ PRJNAME = testcomponent
PACKAGE =
TARGET = JavaTestComponent
-
# --- Settings -----------------------------------------------------
-#.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
.INCLUDE : settings.mk
+
# Files --------------------------------------------------------
+
JARFILES = ridl.jar jurt.jar unoil.jar
CUSTOMMANIFESTFILE= manifest
@@ -48,11 +49,6 @@ JAVAFILES= \
JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-
-
-
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-