diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-04-29 07:50:44 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-04-29 07:50:44 +0000 |
| commit | dc390b91679ee0299ec1a2e0ac3202fb1cbdbe1d (patch) | |
| tree | eb128f59bc072ab56b25e1e183d468e9363c377c /configmgr/source/cmdtools | |
| parent | 7b22245645126bbeaf8ffc4ed25de2822892864f (diff) | |
INTEGRATION: CWS winregclean1 (1.7.32); FILE MERGED
2005/04/25 14:04:23 jb 1.7.32.1: #121941# Reanimate setofficelang program
Diffstat (limited to 'configmgr/source/cmdtools')
| -rw-r--r-- | configmgr/source/cmdtools/makefile.mk | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/configmgr/source/cmdtools/makefile.mk b/configmgr/source/cmdtools/makefile.mk index 866a8ed71d08..4c951bcb7e6c 100644 --- a/configmgr/source/cmdtools/makefile.mk +++ b/configmgr/source/cmdtools/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: obo $ $Date: 2004-11-17 12:56:45 $ +# last change: $Author: obo $ $Date: 2005-04-29 08:50:44 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -67,11 +67,13 @@ 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 @@ -84,7 +86,7 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk # --- Files -------------------------------------------------------- -CDEFS += -DDLL_VERSION=\"$(UPD)$(DLLPOSTFIX)\" +# CDEFS += -DDLL_VERSION=\"$(UPD)$(DLLPOSTFIX)\" APPSTDLIBS=\ $(SALLIB) \ @@ -93,16 +95,20 @@ APPSTDLIBS=\ OBJFILES=\ $(OBJ)$/configimport.obj \ + $(OBJ)$/setofficelang.obj \ $(OBJ)$/unomain.obj # --- Apps -------------------------------------------------------- APP1STDLIBS = $(APPSTDLIBS) +APP2STDLIBS = $(APPSTDLIBS) .IF "$(GUI)"=="UNX" APP1TARGET= $(TARGET1).bin +APP2TARGET= $(TARGET2).bin .ELSE APP1TARGET= $(TARGET1) +APP2TARGET= $(TARGET2) .ENDIF APP1OBJS= \ @@ -112,6 +118,10 @@ APP1OBJS= \ $(OBJ)$/configimport.obj \ $(OBJ)$/unomain.obj +APP2OBJS= \ + $(OBJ)$/setofficelang.obj \ + $(OBJ)$/unomain.obj + # --- Scripts ------------------------------------------------------ UNIXTEXT = $(MISC)/configimport.sh |