INTEGRATION: CWS sb87 (1.11.10); FILE MERGED

2008/04/24 13:15:56 sb 1.11.10.2: RESYNC: (1.11-1.12); FILE MERGED
2008/04/10 15:47:55 sb 1.11.10.1: #i87512# removed configimport
This commit is contained in:
Rüdiger Timm 2008-06-09 11:42:37 +00:00
parent 91a9a45899
commit 126ffa2343

View file

@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.12 $
# $Revision: 1.13 $
#
# This file is part of OpenOffice.org.
#
@ -30,69 +30,34 @@
#*************************************************************************
PRJ = ..$/..
PRJINC=$(PRJ)$/source
PRJNAME = configmgr
TARGET=configtools
TARGET1=configimport
TARGET2=setofficelang
# Targettype should be CUI, but we need to be able to run the tools on Windows without a shell
.IF "$(GUI)" == "WNT"
TARGETTYPE=GUI
APP1NOSAL="TRUE"
APP2NOSAL="TRUE"
.ELSE # "$(GUI)" == "WNT
TARGETTYPE=CUI
.ENDIF # "$(GUI)" == "WNT
PRJINC = $(PRJ)$/source
TARGET = cmdtools
LIBTARGET = NO
ENABLE_EXCEPTIONS = TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
APPSTDLIBS=\
$(SALLIB) \
$(CPPULIB) \
$(CPPUHELPERLIB)
OBJFILES=\
$(OBJ)$/configimport.obj \
$(OBJ)$/setofficelang.obj \
$(OBJ)$/unomain.obj
# --- Apps --------------------------------------------------------
APP1STDLIBS = $(APPSTDLIBS)
APP2STDLIBS = $(APPSTDLIBS)
.IF "$(GUI)"=="UNX"
APP1TARGET= $(TARGET1).bin
APP2TARGET= $(TARGET2).bin
# Targettype should be CUI, but we need to be able to run the tools on Windows
# without a shell:
.IF "$(GUI)" == "WNT"
TARGETTYPE = GUI
APP1NOSAL = TRUE
.ELSE
APP1TARGET= $(TARGET1)
APP2TARGET= $(TARGET2)
TARGETTYPE = CUI
.ENDIF
APP1OBJS= \
$(OBJ)$/filehelper.obj \
$(OBJ)$/oslstream.obj \
$(OBJ)$/bufferedfile.obj \
$(OBJ)$/configimport.obj \
$(OBJ)$/unomain.obj
.INCLUDE: settings.mk
APP2OBJS= \
APP1TARGET = setofficelang
APP1OBJS = \
$(OBJ)$/setofficelang.obj \
$(OBJ)$/unomain.obj
APP1STDLIBS = \
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB)
# --- Scripts ------------------------------------------------------
OBJFILES = $(APP1OBJS)
UNIXTEXT = $(MISC)/configimport.sh
UNIXTEXT = $(MISC)/setofficelang.sh
.INCLUDE: target.mk