From 5d612e08ab7a6a19b477f4a2b174d140f154f96c Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Thu, 12 Aug 2004 11:19:52 +0000
Subject: INTEGRATION: CWS unotlc (1.2.16); FILE MERGED 2004/07/12 13:37:25 dbo
 1.2.16.1: #i20303# tests for compatibility type checks Issue number:
 Submitted by: Reviewed by:

---
 stoc/test/tdmanager/makefile.mk | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'stoc/test/tdmanager')

diff --git a/stoc/test/tdmanager/makefile.mk b/stoc/test/tdmanager/makefile.mk
index d81092cf8588..a143a53edcf5 100644
--- a/stoc/test/tdmanager/makefile.mk
+++ b/stoc/test/tdmanager/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: obo $ $Date: 2004-06-04 02:35:20 $
+#   last change: $Author: obo $ $Date: 2004-08-12 12:19:52 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -88,15 +88,27 @@ SHL1VERSIONMAP = testtdmanager.map
 
 ALLTAR: test
 
-$(MISC)$/$(TARGET)$/all.rdb: types.idl
+$(MISC)$/$(TARGET)$/%.rdb : %.idl
     - rm $@
     - $(MKDIR) $(MISC)$/$(TARGET)
     idlc -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -C -cid -we $<
-    regmerge $@ /UCR $(MISC)$/$(TARGET)$/types.urd
-    regmerge $@ / $(SOLARBINDIR)$/types.rdb
+    regmerge $@ /UCR $(subst,.rdb,.urd $@)
 
-$(SLOFILES): $(MISC)$/$(TARGET)$/all.rdb
+IDL_FILES = \
+    types.idl \
+    types2_incomp.idl \
+    types3_incomp.idl \
+    types4_incomp.idl \
+    types5_incomp.idl \
+    types5.idl \
+    types6_incomp.idl
 
-test .PHONY: $(SHL1TARGETN) $(MISC)$/$(TARGET)$/all.rdb
+RDB_FILES = $(foreach,i,$(subst,.idl,.rdb $(IDL_FILES)) $(MISC)$/$(TARGET)$/$i)
+
+$(SLOFILES): $(RDB_FILES)
+
+test .PHONY: $(SHL1TARGETN) $(RDB_FILES)
     uno -c test.tdmanager.impl -l $(subst,$/,/ $(SHL1TARGETN)) \
-        -ro $(subst,$/,/ $(MISC)$/$(TARGET)$/all.rdb)
+    -ro $(subst,$/,/ $(SOLARBINDIR)$/udkapi_doc.rdb) \
+        -- $(subst,$/,/ $(SOLARBINDIR)$/types_doc.rdb) \
+           $(subst,$/,/ $(RDB_FILES))
-- 
cgit