diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 16:05:12 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 16:05:12 +0000 |
commit | fd2cf3dc7cd9c73070fa4d70c8ca99c9fc1ce135 (patch) | |
tree | 9569a564e06fba817528ea414129b4074d83cb61 /tools/workben/makefile.mk | |
parent | ff09f8d6ef2c613037f039dbcafcad6b76243a48 (diff) |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'tools/workben/makefile.mk')
-rw-r--r-- | tools/workben/makefile.mk | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/tools/workben/makefile.mk b/tools/workben/makefile.mk index 57939bf39f4c..8068a02cda12 100644 --- a/tools/workben/makefile.mk +++ b/tools/workben/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: mwu $ $Date: 2002-07-04 08:43:37 $ +# last change: $Author: hr $ $Date: 2003-03-27 17:05:12 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -69,36 +69,26 @@ TARGETTYPE = CUI .INCLUDE: settings.mk OBJFILES = \ - $(OBJ)$/helloworld.obj -# $(OBJ)$/solar.obj \ -# $(OBJ)$/urltest.obj \ + $(OBJ)$/solar.obj \ + $(OBJ)$/urltest.obj # $(OBJ)$/demostor.obj \ # $(OBJ)$/fstest.obj \ # $(OBJ)$/tldem.obj \ -#APP1TARGET = solar -#APP1OBJS = $(OBJ)$/solar.obj -#.IF "$(GUI)" == "UNX" -#APP1STDLIBS = $(TOOLSLIB) -#.ELSE -#APP1LIBS = $(LB)$/itools.lib -#.ENDIF - -#APP2TARGET = urltest -#APP2OBJS = $(OBJ)$/urltest.obj -#.IF "$(GUI)" == "UNX" -#APP2STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) - -#.ELSE -#APP2STDLIBS = $(LB)$/itools.lib ivos.lib isal.lib icppu.lib icppuhelper.lib -#.ENDIF +APP1TARGET = solar +APP1OBJS = $(OBJ)$/solar.obj +.IF "$(GUI)" == "UNX" +APP1STDLIBS = $(TOOLSLIB) +.ELSE +APP1LIBS = $(LB)$/itools.lib +.ENDIF -APP3TARGET = helloworld -APP3OBJS = $(OBJ)$/helloworld.obj +APP2TARGET = urltest +APP2OBJS = $(OBJ)$/urltest.obj .IF "$(GUI)" == "UNX" -APP3STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) +APP2STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) .ELSE -APP3STDLIBS = $(LB)$/itools.lib ivos.lib isal.lib +APP2STDLIBS = $(LB)$/itools.lib ivos.lib isal.lib icppu.lib icppuhelper.lib .ENDIF # APP3TARGET = tldem |