diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-27 16:12:26 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-27 16:12:26 +0000 |
| commit | 7253193112aa3b7f3fe56e8d74efed2b43a5bc86 (patch) | |
| tree | ee1517960ea72fa56956166c7fb26811cf446005 /codemaker | |
| parent | INTEGRATION: CWS skeletonmaker (1.7.6); FILE MERGED (diff) | |
| download | core-7253193112aa3b7f3fe56e8d74efed2b43a5bc86.tar.gz core-7253193112aa3b7f3fe56e8d74efed2b43a5bc86.zip | |
INTEGRATION: CWS skeletonmaker (1.11.6); FILE MERGED
2005/10/19 08:48:08 jsc 1.11.6.1: #i52208# use new variables for static libs
Diffstat (limited to 'codemaker')
| -rw-r--r-- | codemaker/source/javamaker/makefile.mk | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/codemaker/source/javamaker/makefile.mk b/codemaker/source/javamaker/makefile.mk index 48690e07f91e..91d55e363299 100644 --- a/codemaker/source/javamaker/makefile.mk +++ b/codemaker/source/javamaker/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: rt $ $Date: 2005-09-08 02:18:46 $ +# last change: $Author: hr $ $Date: 2005-10-27 17:12:26 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -44,7 +44,8 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk +.INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/codemaker.pmk # --- Files -------------------------------------------------------- @@ -58,13 +59,7 @@ APP1TARGET= $(TARGET) APP1OBJS = $(OBJFILES) -APP1STDLIBS= \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(REGLIB) - -APP1LIBS= \ - $(LB)$/codemaker.lib $(LB)$/commonjava.lib +APP1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(CODEMAKERLIB) $(COMMONJAVALIB) .INCLUDE : target.mk |