diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-21 14:12:41 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-21 14:12:41 +0000 |
| commit | 50ebfcf0765aa486d2ae4e67b1d3315eff5f316a (patch) | |
| tree | 4914fc4a7f451a63bd5f160254d55d7557ef56dc /bridges/test | |
| parent | 26e7f15c31c4df4a8b967d30fb1694ba53d01d8a (diff) | |
INTEGRATION: CWS ause071 (1.3.80); FILE MERGED
2006/11/03 15:28:49 hjs 1.3.80.1: #i66997# a bit of cleanup
Diffstat (limited to 'bridges/test')
| -rw-r--r-- | bridges/test/inter_libs_exc/makefile.mk | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/bridges/test/inter_libs_exc/makefile.mk b/bridges/test/inter_libs_exc/makefile.mk index 1d00afb9ea8e..8522a3e9fc91 100644 --- a/bridges/test/inter_libs_exc/makefile.mk +++ b/bridges/test/inter_libs_exc/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: rt $ $Date: 2005-09-07 22:57:16 $ +# last change: $Author: vg $ $Date: 2006-11-21 15:12:41 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -39,17 +39,28 @@ TARGET=inter LIBTARGET=NO TARGETTYPE=CUI ENABLE_EXCEPTIONS=TRUE -NO_BSYMBOLIC=TRUE USE_DEFFILE=TRUE +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : svpre.mk .INCLUDE : settings.mk -.INCLUDE : sv.mk # --- Files -------------------------------------------------------- +UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb +UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb + +# output directory (one dir for each project) +UNOUCROUT=$(OUT)$/inc$/$(TARGET) + +# adding to inludeoath +INCPRE+=$(UNOUCROUT) + +UNOTYPESTYPES := \ + com.sun.star.lang.IllegalArgumentException \ + com.sun.star.uno.DeploymentException + SLOFILES=$(SLO)$/starter.obj $(SLO)$/thrower.obj SHL1TARGET=starter @@ -75,20 +86,5 @@ APP1STDLIBS+=\ $(SALLIB) \ $(LIBCIMT) -#APP1DEF= $(MISC)$/$(APP1TARGET).def - -.IF "$(depend)" == "" -ALL : $(OUT)$/misc/inter_libs.flag ALLTAR -.ELSE -ALL: ALLDEP -.ENDIF - .INCLUDE : target.mk -TYPES := -Tcom.sun.star.lang.IllegalArgumentException \ - -Tcom.sun.star.uno.DeploymentException - -$(OUT)$/misc/inter_libs.flag : $(SOLARBINDIR)$/udkapi.rdb - $(RM) $(OUT)$/misc/inter_libs.flag - +cppumaker $(CPPUMAKERFLAGS) -C -BUCR -O$(UNOUCROUT) $(TYPES) $(SOLARBINDIR)$/udkapi.rdb - touch $(OUT)$/misc/inter_libs.flag |