diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-02 11:53:23 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-04 12:45:54 +0100 |
| commit | d01f0bea9307a56f00916715eeae4839e403f1be (patch) | |
| tree | 5100c39355a029451ac6883f75a77b2fbb0f6c17 /stoc | |
| parent | d83bc2c263f20f72e2181b484d010cc6218a6b0a (diff) | |
Clean up makefiles
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/test/javavm/makefile.mk | 6 | ||||
| -rw-r--r-- | stoc/test/makefile.mk | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/stoc/test/javavm/makefile.mk b/stoc/test/javavm/makefile.mk index 7f6190fec..4998b0a64 100644 --- a/stoc/test/javavm/makefile.mk +++ b/stoc/test/javavm/makefile.mk @@ -35,14 +35,11 @@ NO_BSYMBOLIC= TRUE UNOUCRDEP= $(SOLARBINDIR)$/udkapi.rdb UNOUCRRDB= $(SOLARBINDIR)$/udkapi.rdb -#UNOUCROUT= $(OUT)$/inc$/test UNOUCROUT= $(OUT)$/inc$ -#INCPRE+= $(OUT)$/inc$/test INCPRE+= $(OUT)$/inc$ - - # --- Settings ----------------------------------------------------- + .INCLUDE : settings.mk # --- Application 6 - testjavavm ------------------------------------ @@ -65,7 +62,6 @@ APP6STDLIBS= \ $(CPPUHELPERLIB) \ $(SALHELPERLIB) \ $(SALLIB) -# $(UNOLIB) # --- Target ------------------------------------------------ diff --git a/stoc/test/makefile.mk b/stoc/test/makefile.mk index a7b18d062..2f24634da 100644 --- a/stoc/test/makefile.mk +++ b/stoc/test/makefile.mk @@ -24,6 +24,7 @@ # for a copy of the LGPLv3 License. # #************************************************************************* + PRJ=.. PRJNAME=stoc @@ -38,7 +39,7 @@ TARGET7=testconv TARGET8=testproxyfac TARGET9=testsmgr2 TARGETTYPE=CUI -#LIBTARGET=NO + ENABLE_EXCEPTIONS=TRUE NO_BSYMBOLIC=TRUE @@ -59,7 +60,6 @@ SHL1STDLIBS= \ SHL1TARGET=testsmgr_component SHL1DEPN= SHL1IMPLIB=i$(SHL1TARGET) -#SHL1LIBS=$(SLB)$/$(SHL1TARGET).lib SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) SHL1VERSIONMAP=testsmgr_cpnt.map |