strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS ause069 (1.9.34); FILE MERGED

Browse source 
2006/12/04 21:19:28 hjs 1.9.34.2: RESYNC: (1.9-1.10); FILE MERGED
2006/11/28 11:48:42 hjs 1.9.34.1: #i70359# remove forced shell calls; a bit cleanup
This commit is contained in:
Oliver Bolte 2007-01-25 12:30:54 +00:00
parent eed5079259
commit 94c808a89c
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bridges/test/makefile.mk
View file

@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.10 $
# $Revision: 1.11 $
#
# last change: $Author: vg $ $Date: 2006-11-21 15:12:29 $
# last change: $Author: obo $ $Date: 2007-01-25 13:30:54 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -174,15 +174,15 @@ ALLTAR : $(BIN)$/test.rdb \
$(BIN)$/client.rdb
$(BIN)$/test.rdb: $(ALLIDLFILES)
+idlc -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $?
+regmerge $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)}
$(IDLC) -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $?
$(REGMERGE) $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)}
touch $@
$(BIN)$/client.rdb: $(BIN)$/test.rdb
+rm -f $(BIN)$/client.rdb
+regmerge $@ / $(BIN)$/test.rdb $(SOLARBINDIR)$/udkapi.rdb
rm -f $(BIN)$/client.rdb
$(REGMERGE) $@ / $(BIN)$/test.rdb $(SOLARBINDIR)$/udkapi.rdb
$(BIN)$/server.rdb: $(BIN)$/test.rdb
+rm -f $(BIN)$/client.rdb
+regmerge $@ / $(BIN)$/test.rdb $(SOLARBINDIR)$/udkapi.rdb
rm -f $(BIN)$/client.rdb
$(REGMERGE) $@ / $(BIN)$/test.rdb $(SOLARBINDIR)$/udkapi.rdb