#107130# makefile fixes

5 files changed, 36 insertions, 35 deletions

diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx
index ff473ba55034..ddd0a95bcf3d 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: climaker_app.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: dbo $ $Date: 2003-05-08 12:40:58 $
+ *  last change: $Author: dbo $ $Date: 2003-06-05 13:17:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -358,8 +358,7 @@ extern "C" int SAL_CALL main( int argc, char const * argv [] )
         // get rdb tdprovider factory
         Reference< lang::XSingleComponentFactory > xTDprov_factory(
             ::cppu::loadSharedLibComponentFactory(
-//                 OUSTR("regtypeprov.uno" SAL_DLLEXTENSION), OUString(),
-                OUSTR("rdbtdp"), OUString(),
+                OUSTR("regtypeprov.uno" SAL_DLLEXTENSION), OUString(),
                 OUSTR("com.sun.star.comp.stoc.RegistryTypeDescriptionProvider"),
                 Reference< lang::XMultiServiceFactory >(
                     xContext->getServiceManager(), UNO_QUERY ),
diff --git a/cli_ure/source/climaker/makefile.mk b/cli_ure/source/climaker/makefile.mk
index d8736245b994..5dfc869e6691 100644
--- a/cli_ure/source/climaker/makefile.mk
+++ b/cli_ure/source/climaker/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: dbo $ $Date: 2003-03-28 10:17:38 $
+#   last change: $Author: dbo $ $Date: 2003-06-05 13:17:59 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -63,15 +63,15 @@
 PRJ = ..$/..
 PRJNAME = cli_ure
 
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.IF "$(BUILD_FOR_CLI)" != ""
-
 TARGET = climaker
 TARGETTYPE = CUI
 LIBTARGET = NO
 ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
+.IF "$(BUILD_FOR_CLI)" != ""
 
 UNOUCRDEP = $(SOLARBINDIR)$/udkapi.rdb
 UNOUCRRDB = $(SOLARBINDIR)$/udkapi.rdb
@@ -117,6 +117,7 @@ APP1STDLIBS = \
     $(SALLIB)			\
     mscoree.lib
 
-.INCLUDE :  target.mk
-
 .ENDIF
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+.INCLUDE :  target.mk
diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk
index 8c7436c05fdf..42d3eaf37d5a 100644
--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: dbo $ $Date: 2003-04-22 16:33:56 $
+#   last change: $Author: dbo $ $Date: 2003-06-05 13:17:59 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -63,9 +63,6 @@
 PRJ = ..$/..
 PRJNAME = cli_ure
 
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.IF "$(BUILD_FOR_CLI)" != ""
-
 TARGET = cli_cppuhelper
 NO_BSYMBOLIC = TRUE
 ENABLE_EXCEPTIONS = TRUE
@@ -73,6 +70,9 @@ LIBTARGET = NO
 USE_DEFFILE = TRUE
 
 .INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
+.IF "$(BUILD_FOR_CLI)" != ""
 
 UNOUCRRDB = $(SOLARBINDIR)$/udkapi.rdb
 UNOUCRDEP = $(UNOUCRRDB)
@@ -107,6 +107,7 @@ SHL1VERSIONMAP = msvc.map
 SHL1DEF = $(MISC)$/$(SHL1TARGET).def
 DEF1NAME = $(SHL1TARGET)
 
-.INCLUDE : target.mk
-
 .ENDIF
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+.INCLUDE : target.mk
diff --git a/cli_ure/source/ure/makefile.mk b/cli_ure/source/ure/makefile.mk
index 2f83ba739201..878a0b34098b 100644
--- a/cli_ure/source/ure/makefile.mk
+++ b/cli_ure/source/ure/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: dbo $ $Date: 2003-05-08 12:41:02 $
+#   last change: $Author: dbo $ $Date: 2003-06-05 13:18:00 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -63,17 +63,17 @@
 PRJ = ..$/..
 PRJNAME = cli_ure
 
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.IF "$(BUILD_FOR_CLI)" != ""
-
 # for dummy
-TARGET = cli_ure
+TARGET = ure
 
 .INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
 
 .INCLUDE : $(PRJ)$/util$/target.pmk
 .INCLUDE : target.mk
 
+.IF "$(BUILD_FOR_CLI)" != ""
+
 ALLTAR : \
     $(OUT)$/bin$/cli_ure.dll
 
diff --git a/cli_ure/unotypes/makefile.mk b/cli_ure/unotypes/makefile.mk
index 5eb8f8e02b00..1d99edc9c999 100644
--- a/cli_ure/unotypes/makefile.mk
+++ b/cli_ure/unotypes/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: dbo $ $Date: 2003-05-08 12:41:05 $
+#   last change: $Author: dbo $ $Date: 2003-06-05 13:18:00 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -63,25 +63,25 @@
 PRJ = ..
 PRJNAME = cli_ure
 
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.IF "$(BUILD_FOR_CLI)" != ""
-
 # for dummy
-TARGET = cli_ure
-
-CLIMAKERFLAGS =
-.IF "$(debug)" != ""
-CLIMAKERFLAGS += --verbose
-.ENDIF
+TARGET = unotypes
 
 .INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
 
 .INCLUDE : $(PRJ)$/util$/target.pmk
 .INCLUDE : target.mk
 
+.IF "$(BUILD_FOR_CLI)" != ""
+
 ALLTAR : \
     $(OUT)$/bin$/cli_types.dll
 
+CLIMAKERFLAGS =
+.IF "$(debug)" != ""
+CLIMAKERFLAGS += --verbose
+.ENDIF
+
 $(OUT)$/bin$/cli_types.dll : $(OUT)$/bin$/climaker.exe $(SOLARBINDIR)$/types.rdb
     +$(OUT)$/bin$/climaker.exe $(CLIMAKERFLAGS) \
         --out $@ \