diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-06-09 13:57:25 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-06-09 13:57:25 +0000 |
| commit | 4b19827e4ccaae7082c2e7f551d8acdb8412eca7 (patch) | |
| tree | a874eaafd5ac4ba40871dacf88d46649cd34adfa /extensions/source/resource | |
| parent | 8303044568ec2f4b7cb5db2bf41cb23826b3b37e (diff) | |
INTEGRATION: CWS ause028 (1.7.94); FILE MERGED
2005/05/03 09:39:10 hjs 1.7.94.1: #109143# use generated includes from solver; cleanup
Diffstat (limited to 'extensions/source/resource')
| -rw-r--r-- | extensions/source/resource/makefile.mk | 38 |
1 files changed, 5 insertions, 33 deletions
diff --git a/extensions/source/resource/makefile.mk b/extensions/source/resource/makefile.mk index 1c84bb8f1e6c..15508f0736ae 100644 --- a/extensions/source/resource/makefile.mk +++ b/extensions/source/resource/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: obo $ $Date: 2004-11-16 12:15:01 $ +# last change: $Author: hr $ $Date: 2005-06-09 14:57:25 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -66,31 +66,21 @@ TARGET=res LIBTARGET=NO USE_LDUMP2=TRUE USE_DEFFILE=TRUE -# NEW -NO_BSYMBOLIC=TRUE -# END NEW +ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk +.INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- SLOFILES= $(SLO)$/resource.obj -EXCEPTIONSFILES= $(SLO)$/resource.obj - LIB1TARGET= $(SLB)$/$(TARGET).lib -LIB1OBJFILES= $(EXCEPTIONSFILES) +LIB1OBJFILES= $(SLOFILES) SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX) -# $(UNOLIB) \ -# NEW \ -# $(CPPULIB) \ -# $(CPPUHELPERLIB) \ -# END NEW \ - SHL1STDLIBS= \ $(CPPULIB) \ $(CPPUHELPERLIB) \ @@ -104,24 +94,6 @@ SHL1IMPLIB= ires SHL1LIBS= $(LIB1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -UNOUCROUT=$(OUT)$/inc$/$(TARGET) -INCPRE+=$(UNOUCROUT) - -UNOTYPES=\ - com.sun.star.uno.XWeak \ - com.sun.star.uno.XAggregation \ - com.sun.star.lang.XSingleServiceFactory \ - com.sun.star.lang.XMultiServiceFactory \ - com.sun.star.lang.XTypeProvider \ - com.sun.star.lang.XServiceInfo \ - com.sun.star.reflection.InvocationTargetException \ - com.sun.star.registry.XRegistryKey \ - com.sun.star.script.XInvocation \ - com.sun.star.script.XTypeConverter \ - com.sun.star.beans.XExactName -# END NEW - SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1IMPLIB=i$(TARGET) SHL1LIBS=$(SLB)$/$(TARGET).lib |