From d89cf9224bb26d79baab236ae85dfbc3ca08f284 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Mon, 6 Oct 2003 12:07:42 +0000 Subject: [PATCH] INTEGRATION: CWS unopkg (1.7.30); FILE MERGED 2003/09/25 14:13:52 dbo 1.7.30.2: #112352# separate header generation 2003/09/23 09:04:20 dbo 1.7.30.1: #112352# generating headers into separate output directories --- cpputools/source/registercomponent/makefile.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cpputools/source/registercomponent/makefile.mk b/cpputools/source/registercomponent/makefile.mk index 007b56acb66d..bf77080de862 100644 --- a/cpputools/source/registercomponent/makefile.mk +++ b/cpputools/source/registercomponent/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: mh $ $Date: 2003-03-24 16:59:14 $ +# last change: $Author: vg $ $Date: 2003-10-06 13:07:42 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -77,20 +77,20 @@ ENABLE_EXCEPTIONS=TRUE UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb -# output directory (one dir for each project) -UNOUCROUT=$(OUT)$/inc - -# adding to inludepath -INCPRE+=$(UNOUCROUT) +UNOUCROUT = $(OUT)$/inc$/$(TARGET) +INCPRE += $(UNOUCROUT) +CPPUMAKERFLAGS += -C UNOTYPES=\ com.sun.star.uno.TypeClass \ com.sun.star.lang.XMultiServiceFactory \ com.sun.star.lang.XSingleServiceFactory \ - com.sun.star.lang.XMultiComponentFactory \ - com.sun.star.lang.XSingleComponentFactory \ + com.sun.star.lang.XMultiComponentFactory \ + com.sun.star.lang.XSingleComponentFactory \ com.sun.star.lang.XComponent \ com.sun.star.container.XContentEnumerationAccess \ + com.sun.star.container.XSet \ + com.sun.star.loader.CannotActivateFactoryException \ com.sun.star.registry.XImplementationRegistration # --- Files --------------------------------------------------------