diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-20 15:33:08 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-20 15:33:08 +0000 |
| commit | 9f8c34e22dea8d20955c4245a14b5307be07c002 (patch) | |
| tree | 0799107907263b4c6282443d28764a8494fac0eb /dtrans | |
| parent | 6a55cf0848626f81787df261195c53ec03fe6e55 (diff) | |
#101685#,#i6886# merge OOO_STABLE_1_PORTS -> HEAD; apply patch from Issue 7002
Diffstat (limited to 'dtrans')
| -rw-r--r-- | dtrans/source/aqua/makefile.mk | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/dtrans/source/aqua/makefile.mk b/dtrans/source/aqua/makefile.mk index c6de7663d36b..fb2e56ab25a1 100644 --- a/dtrans/source/aqua/makefile.mk +++ b/dtrans/source/aqua/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: rt $ $Date: 2001-04-10 12:04:38 $ +# last change: $Author: hr $ $Date: 2002-08-20 16:33:08 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -66,10 +66,12 @@ PRJNAME=dtrans TARGET=dtransaqua ENABLE_EXCEPTIONS=TRUE LIBTARGET=NO -.IF "$(OS)"=="MACOSX" +.IF "$(OS)"=="MACOSX" +.IF "$(GUIBASE)"=="aqua" COMP1TYPELIST=$(TARGET) COMPRDB=$(SOLARBINDIR)$/applicat.rdb -.ENDIF "$(OS)"=="MACOSX" +.ENDIF # "$(GUIBASE)"=="aqua" +.ENDIF # "$(OS)"=="MACOSX" USE_BOUNDCHK= # --- Settings ----------------------------------------------------- @@ -85,9 +87,12 @@ dummy: .ELSE # "$(OS)"!="MACOSX" -.INCLUDE : ..$/cppumaker.mk +.IF "$(GUIBASE)"!="aqua" +dummy: + @echo "Nothing to build for GUIBASE $(GUIBASE)" +.ELSE -SYMBOLPREFIX=$(TARGET)$(UPD)$(DLLPOSTFIX) +.INCLUDE : ..$/cppumaker.mk SLOFILES= \ $(SLO)$/aqua_service.obj \ @@ -114,15 +119,15 @@ APP1STDLIBS= \ $(CPPULIB) \ $(CPPUHELPERLIB) \ -framework Cocoa - -.ENDIF # "$(OS)"!="MACOSX" - + # --- Targets ------------------------------------------------------ -#.IF "$(depend)" == "" ALL : ALLTAR - +deliver + +deliver.pl +regcomp -register -r $(BIN)$/$(COMP1TYPELIST).rdb -c $(SHL1TARGET) .INCLUDE : target.mk +.ENDIF # "$(GUIBASE)"!="aqua" +.ENDIF # "$(OS)"!="MACOSX" + |