diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:28:43 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:28:43 +0000 |
| commit | 233a66d56b9efeb0861645082f716f80cc6b2f30 (patch) | |
| tree | fe2c8c44dc6957170b51fed80de37f5cb06a432f | |
| parent | 633df1fd471f810f86fb647349cb9536d9f913df (diff) | |
INTEGRATION: CWS sb71 (1.8.6); FILE MERGED
2007/06/26 15:12:36 sb 1.8.6.2: #i75466# Fixed dependency creation.
2007/06/14 14:55:11 sb 1.8.6.1: #i75466# Adapted to new APP|SHLnRPATH.
| -rw-r--r-- | registry/tools/makefile.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/registry/tools/makefile.mk b/registry/tools/makefile.mk index c8916a717..b60816623 100644 --- a/registry/tools/makefile.mk +++ b/registry/tools/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: vg $ $Date: 2007-02-06 13:36:18 $ +# last change: $Author: vg $ $Date: 2007-10-15 12:28:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -56,13 +56,9 @@ LINKFLAGSRUNPATH = -R\''$$ORIGIN/../lib:$$ORIGIN'\' # --- Files -------------------------------------------------------- CDEFS += -DDLL_VERSION=\"$(UPD)$(DLLPOSTFIX)\" -CXXFILES= regview.cxx \ - regmerge.cxx \ - regcompare.cxx - - APP1TARGET= $(TARGET) APP1OBJS= $(OBJ)$/regmerge.obj +APP1RPATH= UREBIN APP1STDLIBS=\ $(SALLIB) \ @@ -71,6 +67,7 @@ APP1STDLIBS=\ APP2TARGET= regview APP2OBJS= $(OBJ)$/regview.obj +APP2RPATH= UREBIN APP2STDLIBS=\ $(SALLIB) \ @@ -93,4 +90,6 @@ APP4STDLIBS=\ $(SALHELPERLIB) \ $(REGLIB) +OBJFILES = $(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) + .INCLUDE : target.mk |