diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-01 18:07:04 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-01 18:22:56 +0100 |
| commit | 1a6617cf054891b89a330c44e60d9d31bf034d6e (patch) | |
| tree | c795dc260e899b5e0dec40e15fed9bf84b3aff6d /stoc | |
| parent | 95012b599b45aaea7187607770637271ca87e15a (diff) | |
Clean up makefiles
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/test/excomp/makefile.mk | 1 | ||||
| -rw-r--r-- | stoc/test/javavm/testapplet/makefile.mk | 9 | ||||
| -rw-r--r-- | stoc/test/javavm/testcomponent/makefile.mk | 10 |
3 files changed, 6 insertions, 14 deletions
diff --git a/stoc/test/excomp/makefile.mk b/stoc/test/excomp/makefile.mk index b41acb372620..01ffb65a5fcc 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 4ddadebd9aa2..31872c5386df 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 a2f8eb16fe4d..9d77ebfb9bdf 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 - |