diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-21 14:12:29 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-21 14:12:29 +0000 |
| commit | 73cfb3aa3870cdee5ca2066857406109b2fec935 (patch) | |
| tree | 97e7599f5d359fdd99040938ed58f1e72266f96f /bridges | |
| parent | f6e9c30d12c536047200de3bad4fb1f5a90b89f4 (diff) | |
INTEGRATION: CWS ause071 (1.9.32); FILE MERGED
2006/11/03 15:28:48 hjs 1.9.32.1: #i66997# a bit of cleanup
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/test/makefile.mk | 59 |
1 files changed, 8 insertions, 51 deletions
diff --git a/bridges/test/makefile.mk b/bridges/test/makefile.mk index 49f81890f..81108f150 100644 --- a/bridges/test/makefile.mk +++ b/bridges/test/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: hr $ $Date: 2006-06-19 23:54:07 $ +# last change: $Author: vg $ $Date: 2006-11-21 15:12:29 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -40,20 +40,18 @@ TARGET=test LIBTARGET=NO TARGETTYPE=CUI ENABLE_EXCEPTIONS=TRUE -NO_BSYMBOLIC=TRUE +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : svpre.mk .INCLUDE : settings.mk -.INCLUDE : sv.mk # --- Files -------------------------------------------------------- ALLIDLFILES = test_bridge.idl CPPUMAKERFLAGS += -C -UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb +UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb $(BIN)$/test.rdb UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb $(BIN)$/test.rdb # output directory (one dir for each project) @@ -93,34 +91,8 @@ UNOTYPES = \ com.sun.star.lang.XMultiComponentFactory \ com.sun.star.lang.XSingleComponentFactory -#UNOTYPES= com.sun.star.corba.giop.MsgType_1_1 -#UNOTYPES= com.sun.star.uno.XInterface \ -# com.sun.star.uno.TypeClass \ -# com.sun.star.corba.CorbaString8 -#com.sun.star.corba.giop.RequestHeader_1_1 - JARFILES = jurt.jar unoil.jar - - -# GENJAVACLASSFILES = \ -# $(CLASSDIR)$/test$/TestTypes.class \ -# $(CLASSDIR)$/test$/TestBridgeException.class \ -# $(CLASSDIR)$/test$/XCallMe.class \ -# $(CLASSDIR)$/test$/XInterfaceTest.class \ -# $(CLASSDIR)$/test$/XTestFactory.class \ - - -# JAVACLASSFILES= \ -# $(CLASSDIR)$/testclient.class - - - -# TYPES={$(subst,.class, $(subst,$/,. $(subst,$(CLASSDIR)$/,-T $(GENJAVACLASSFILES))))} -# GENJAVAFILES = {$(subst,.class,.java $(subst,$/class, $(GENJAVACLASSFILES)))} -# JAVAFILES= $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES))) $(GENJAVAFILES) - - OBJFILES= \ $(OBJ)$/testserver.obj \ $(OBJ)$/testclient.obj \ @@ -142,8 +114,6 @@ APP2STDLIBS+= \ $(SALLIB) \ $(LIBCIMT) -#APP2DEF= $(MISC)$/$(APP2TARGET).def - APP3TARGET= testclient APP3OBJS= $(OBJ)$/testclient.obj \ $(OBJ)$/testcomp.obj @@ -157,9 +127,6 @@ APP3STDLIBS+= \ $(CPPUHELPERLIB) \ $(SALLIB) \ $(LIBCIMT) -# imsci_uno.lib - -#APP3DEF= $(MISC)$/$(APP3TARGET).def #---------------------------------- @@ -200,19 +167,12 @@ APP4DEF= $(MISC)$/$(APP4TARGET).def # --- Targets ------------------------------------------------------ -#.IF "$(depend)" == "" -ALL : $(BIN)$/test.rdb \ - $(BIN)$/server.rdb \ - $(BIN)$/client.rdb \ - $(GENJAVAFILES) \ - ALLTAR - -#.ELSE -#ALL: ALLDEP -#.ENDIF - .INCLUDE : target.mk +ALLTAR : $(BIN)$/test.rdb \ + $(BIN)$/server.rdb \ + $(BIN)$/client.rdb + $(BIN)$/test.rdb: $(ALLIDLFILES) +idlc -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $? +regmerge $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)} @@ -226,6 +186,3 @@ $(BIN)$/server.rdb: $(BIN)$/test.rdb +rm -f $(BIN)$/client.rdb +regmerge $@ / $(BIN)$/test.rdb $(SOLARBINDIR)$/udkapi.rdb -# $(GENJAVAFILES) : $(RDB) -# +javamaker -BUCR -O$(OUT) $(TYPES) $(UNOUCRRDB) - |