diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-27 16:12:10 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-27 16:12:10 +0000 |
| commit | edeaaae5b499d03d7b0f5bbfe5df0957c6f7a706 (patch) | |
| tree | d67959ccb2f1ab602e65171e53873724b465d5b1 /codemaker | |
| parent | f8312b43cd730161e40d305a619611f31015607f (diff) | |
INTEGRATION: CWS skeletonmaker (1.7.6); FILE MERGED
2005/10/19 08:48:07 jsc 1.7.6.1: #i52208# use new variables for static libs
Diffstat (limited to 'codemaker')
| -rw-r--r-- | codemaker/source/cppumaker/makefile.mk | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/codemaker/source/cppumaker/makefile.mk b/codemaker/source/cppumaker/makefile.mk index 2464c688ea2d..89ed25dfbd8d 100644 --- a/codemaker/source/cppumaker/makefile.mk +++ b/codemaker/source/cppumaker/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: rt $ $Date: 2005-09-08 02:13:52 $ +# last change: $Author: hr $ $Date: 2005-10-27 17:12:10 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -43,7 +43,8 @@ LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk +.INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/codemaker.pmk # --- Files -------------------------------------------------------- @@ -64,12 +65,7 @@ APP1TARGET= $(TARGET) APP1OBJS= $(OBJFILES) -APP1STDLIBS= \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(REGLIB) -APP1LIBS= \ - $(LB)$/codemaker.lib +APP1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(CODEMAKERLIB) .INCLUDE : target.mk |