diff options
| author | Patrick Luby <pluby@openoffice.org> | 2001-02-12 02:25:38 +0000 |
|---|---|---|
| committer | Patrick Luby <pluby@openoffice.org> | 2001-02-12 02:25:38 +0000 |
| commit | 9ee09f88d779084c715b7a4235eebc02b5b43469 (patch) | |
| tree | b572719e312b5b3eaa4c225e444e4fb83bc56fa2 /rdbmaker | |
| parent | 30398de1759d3131ccb76f38e311118452b44bb6 (diff) | |
Moved static data member initializations to cppuhelper project
Diffstat (limited to 'rdbmaker')
| -rw-r--r-- | rdbmaker/source/rdbmaker/makefile.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/rdbmaker/source/rdbmaker/makefile.mk b/rdbmaker/source/rdbmaker/makefile.mk index a44aa7d1365d..2833b9d6d154 100644 --- a/rdbmaker/source/rdbmaker/makefile.mk +++ b/rdbmaker/source/rdbmaker/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 19:39:41 $ +# last change: $Author: pluby $ $Date: 2001-02-12 03:25:38 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -105,7 +105,6 @@ CXXFILES= rdbmaker.cxx \ CXXFILES+=staticmbrdbmaker.cxx .ENDIF - APP1TARGET= $(TARGET) APP1OBJS= $(OBJ)$/rdbmaker.obj \ @@ -114,14 +113,11 @@ APP1OBJS= $(OBJ)$/rdbmaker.obj \ $(OBJ)$/specialtypemanager.obj \ $(OBJ)$/rdbtype.obj -# NETBSD: somewhere we have to instantiate the static data members. -# NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCCwon't work. # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols -.IF "$(OS)"=="NETBSD" || "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" +.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" APP1OBJS+=$(OBJ)$/staticmbrdbmaker.obj .ENDIF - APP1STDLIBS=\ $(SALLIB) \ $(VOSLIB) \ |