Kaydet (Commit) 98df445a authored tarafından Thomas Arnhold's avatar Thomas Arnhold

Clean up makefiles

üst 7bdd6275
...@@ -51,16 +51,6 @@ APP1STDLIBS= \ ...@@ -51,16 +51,6 @@ APP1STDLIBS= \
$(CPPULIB) \ $(CPPULIB) \
$(SOTLIB) \ $(SOTLIB) \
#.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
#APP1STDLIBS+=$(CPPULIB)
#.ENDIF
#.IF "$(GUI)"=="UNX"
#APP1STDLIBS+= \
# \
# $(SALLIB)
#.ENDIF
.IF "$(GUI)"!="OS2" .IF "$(GUI)"!="OS2"
APP1LIBS= \ APP1LIBS= \
$(LB)$/basic.lib $(LB)$/basic.lib
......
...@@ -30,7 +30,6 @@ PRJ = ..$/..$/.. ...@@ -30,7 +30,6 @@ PRJ = ..$/..$/..
PRJNAME = desktop PRJNAME = desktop
TARGET = deploymentgui TARGET = deploymentgui
ENABLE_EXCEPTIONS = TRUE ENABLE_EXCEPTIONS = TRUE
#USE_DEFFILE = TRUE
NO_BSYMBOLIC = TRUE NO_BSYMBOLIC = TRUE
USE_PCH := USE_PCH :=
ENABLE_PCH := ENABLE_PCH :=
...@@ -87,8 +86,6 @@ SHL1LIBS = $(SLB)$/$(TARGET).lib ...@@ -87,8 +86,6 @@ SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1DEF = $(MISC)$/$(SHL1TARGET).def SHL1DEF = $(MISC)$/$(SHL1TARGET).def
DEF1NAME = $(SHL1TARGET) DEF1NAME = $(SHL1TARGET)
#DEFLIB1NAME = $(TARGET)
#DEF1DEPN =
SRS1NAME = $(TARGET) SRS1NAME = $(TARGET)
SRC1FILES = \ SRC1FILES = \
......
...@@ -34,6 +34,7 @@ COMP1TYPELIST = migrationoo2 ...@@ -34,6 +34,7 @@ COMP1TYPELIST = migrationoo2
LIBTARGET=NO LIBTARGET=NO
# --- Settings ----------------------------------------------------- # --- Settings -----------------------------------------------------
.INCLUDE : ..$/..$/deployment/inc/dp_misc.mk .INCLUDE : ..$/..$/deployment/inc/dp_misc.mk
.INCLUDE : settings.mk .INCLUDE : settings.mk
DLLPRE = DLLPRE =
...@@ -80,7 +81,6 @@ SHL1STDLIBS= \ ...@@ -80,7 +81,6 @@ SHL1STDLIBS= \
SHL1DEPN= SHL1DEPN=
SHL1IMPLIB=imigrationoo2 SHL1IMPLIB=imigrationoo2
#SHL1LIBS=$(SLB)$/$(TARGET).lib
SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET) DEF1NAME=$(SHL1TARGET)
...@@ -108,7 +108,6 @@ SHL2STDLIBS= \ ...@@ -108,7 +108,6 @@ SHL2STDLIBS= \
SHL2DEPN= SHL2DEPN=
SHL2IMPLIB=imigrationoo3 SHL2IMPLIB=imigrationoo3
#SHL2LIBS=$(SLB)$/$(SHL2TARGET).lib
SHL2DEF=$(MISC)$/$(SHL2TARGET).def SHL2DEF=$(MISC)$/$(SHL2TARGET).def
DEF2NAME=$(SHL2TARGET) DEF2NAME=$(SHL2TARGET)
......
...@@ -30,7 +30,6 @@ PRJ=..$/..$/.. ...@@ -30,7 +30,6 @@ PRJ=..$/..$/..
PRJNAME=desktop PRJNAME=desktop
TARGET=officeloader TARGET=officeloader
LIBTARGET=NO LIBTARGET=NO
#TARGETTYPE=GUI
# --- Settings ----------------------------------------------------- # --- Settings -----------------------------------------------------
...@@ -41,23 +40,6 @@ LIBTARGET=NO ...@@ -41,23 +40,6 @@ LIBTARGET=NO
OBJFILES = \ OBJFILES = \
$(OBJ)$/officeloader.obj $(OBJ)$/officeloader.obj
#APP1TARGET=so$/officeloader
#APP1NOSAL=TRUE
#APP1LINKRES=$(MISC)$/$(TARGET).res
#APP1ICON=$(SOLARRESDIR)$/icons/001_star_main.ico
#APP1OBJS = \
# $(OBJ)$/officeloader.obj
#APP2TARGET=officeloader
#APP2NOSAL=TRUE
#APP2LINKRES=$(MISC)$/$(TARGET).res
#APP2ICON=$(SOLARRESDIR)$/icons/ooo_gulls.ico
#APP2OBJS = \
# $(OBJ)$/officeloader.obj
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------
.INCLUDE : target.mk .INCLUDE : target.mk
...@@ -30,13 +30,8 @@ PRJNAME=editeng ...@@ -30,13 +30,8 @@ PRJNAME=editeng
TARGET=editeng TARGET=editeng
AUTOSEG=true AUTOSEG=true
#PROJECTPCH4DLL=TRUE
#PROJECTPCH=eeng_pch
#PROJECTPCHSOURCE=eeng_pch
ENABLE_EXCEPTIONS=TRUE ENABLE_EXCEPTIONS=TRUE
# --- Settings ----------------------------------------------------------- # --- Settings -----------------------------------------------------------
.INCLUDE : settings.mk .INCLUDE : settings.mk
......
...@@ -27,11 +27,6 @@ ...@@ -27,11 +27,6 @@
PRJ=..$/.. PRJ=..$/..
#PROJECTPCH4DLL=TRUE
#PROJECTPCH=svxpch
#PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
#ENABLE_EXCEPTIONS=TRUE
PRJNAME=editeng PRJNAME=editeng
TARGET=items TARGET=items
......
...@@ -29,10 +29,6 @@ PRJ=..$/.. ...@@ -29,10 +29,6 @@ PRJ=..$/..
PRJNAME=editeng PRJNAME=editeng
TARGET=misc TARGET=misc
#PROJECTPCH4DLL=TRUE
#PROJECTPCH=eeng_pch
#PROJECTPCHSOURCE=eeng_pch
ENABLE_EXCEPTIONS=TRUE ENABLE_EXCEPTIONS=TRUE
# --- Settings ----------------------------------------------------------- # --- Settings -----------------------------------------------------------
......
...@@ -29,8 +29,6 @@ PRJ=.. ...@@ -29,8 +29,6 @@ PRJ=..
PRJNAME=embeddedobj PRJNAME=embeddedobj
TARGET=embobj TARGET=embobj
#LIBTARGET=NO
#USE_DEFFILE=TRUE
ENABLE_EXCEPTIONS=TRUE ENABLE_EXCEPTIONS=TRUE
# --- Settings ----------------------------------------------------------- # --- Settings -----------------------------------------------------------
......
...@@ -30,6 +30,7 @@ PRJINC=$(PRJ)$/source ...@@ -30,6 +30,7 @@ PRJINC=$(PRJ)$/source
PRJNAME=formula PRJNAME=formula
TARGET=ui_resource TARGET=ui_resource
ENABLE_EXCEPTIONS=TRUE ENABLE_EXCEPTIONS=TRUE
# --- Settings ----------------------------------------------------- # --- Settings -----------------------------------------------------
.INCLUDE : settings.mk .INCLUDE : settings.mk
...@@ -37,11 +38,6 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -37,11 +38,6 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files -------------------------------------------------------- # --- Files --------------------------------------------------------
#SRS1NAME=ui_res
#SRC1FILES= \
# ui_resource.src
SLOFILES= $(SLO)$/ModuleHelper.obj \ SLOFILES= $(SLO)$/ModuleHelper.obj \
# --- Targets ---------------------------------- # --- Targets ----------------------------------
......
...@@ -32,8 +32,6 @@ TARGET=kdefilepicker ...@@ -32,8 +32,6 @@ TARGET=kdefilepicker
LIBTARGET=NO LIBTARGET=NO
ENABLE_EXCEPTIONS=TRUE ENABLE_EXCEPTIONS=TRUE
EXTERNAL_WARNINGS_NOT_ERRORS=TRUE EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
#COMP1TYPELIST=$(TARGET)
#COMPRDB=$(SOLARBINDIR)$/types.rdb
# --- Settings ----------------------------------------------------- # --- Settings -----------------------------------------------------
......
...@@ -29,7 +29,6 @@ PRJ=..$/..$/.. ...@@ -29,7 +29,6 @@ PRJ=..$/..$/..
PRJNAME=fpicker PRJNAME=fpicker
TARGET=fps TARGET=fps
#LIBTARGET=NO
ENABLE_EXCEPTIONS=TRUE ENABLE_EXCEPTIONS=TRUE
COMP1TYPELIST=$(TARGET) COMP1TYPELIST=$(TARGET)
...@@ -41,11 +40,8 @@ COMP1TYPELIST=$(TARGET) ...@@ -41,11 +40,8 @@ COMP1TYPELIST=$(TARGET)
CDEFS+=-D_UNICODE CDEFS+=-D_UNICODE
CDEFS+=-DUNICODE CDEFS+=-DUNICODE
#CDEFS+=-DWIN32_LEAN_AND_MEAN
#CDEFS+=-DWIN32
CDEFS+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0600 CDEFS+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0600
# --- Resources ---------------------------------------------------- # --- Resources ----------------------------------------------------
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
......
...@@ -30,6 +30,7 @@ PRJNAME = $(TARGET) ...@@ -30,6 +30,7 @@ PRJNAME = $(TARGET)
PACKAGE = complex$/ModuleManager PACKAGE = complex$/ModuleManager
# --- Settings ----------------------------------------------------- # --- Settings -----------------------------------------------------
.INCLUDE: settings.mk .INCLUDE: settings.mk
#----- compile .java files ----------------------------------------- #----- compile .java files -----------------------------------------
......
...@@ -31,6 +31,7 @@ PRJNAME = $(TARGET) ...@@ -31,6 +31,7 @@ PRJNAME = $(TARGET)
PACKAGE = complex$/accelerators PACKAGE = complex$/accelerators
# --- Settings ----------------------------------------------------- # --- Settings -----------------------------------------------------
.INCLUDE: settings.mk .INCLUDE: settings.mk
#----- compile .java files ----------------------------------------- #----- compile .java files -----------------------------------------
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# for a copy of the LGPLv3 License. # for a copy of the LGPLv3 License.
# #
#************************************************************************* #*************************************************************************
PRJ=.. PRJ=..
PRJNAME= framework PRJNAME= framework
...@@ -36,29 +37,6 @@ USE_DEFFILE= TRUE ...@@ -36,29 +37,6 @@ USE_DEFFILE= TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
# --- applikation: "test" --------------------------------------------------
#APP1TARGET= test
#APP1OBJS= $(SLO)$/test.obj
#DEPOBJFILES+= $(APP1OBJS)
#APP1LIBS= $(SLB)$/fwk_classes.lib \
# $(SLB)$/fwk_helper.lib
#APP1STDLIBS= $(CPPULIB) \
# $(CPPUHELPERLIB) \
# $(SALLIB) \
# \
# $(TOOLSLIB) \
# $(SVTOOLLIB) \
# $(TKLIB) \
# $(COMPHELPERLIB) \
# $(VCLLIB)
#APP1DEPN= $(SLB)$/fwk_helper.lib \
# $(SLB)$/fwk_classes.lib
# --- application: "threadtest" -------------------------------------------------- # --- application: "threadtest" --------------------------------------------------
APP2TARGET= threadtest APP2TARGET= threadtest
...@@ -90,4 +68,3 @@ APP2DEPN= $(SLO)$/fairrwlock.obj \ ...@@ -90,4 +68,3 @@ APP2DEPN= $(SLO)$/fairrwlock.obj \
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------
.INCLUDE : target.mk .INCLUDE : target.mk
...@@ -78,7 +78,6 @@ SHL1STDLIBS= \ ...@@ -78,7 +78,6 @@ SHL1STDLIBS= \
SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1DEPN= $(SLB)$/$(TARGET).lib SHL1DEPN= $(SLB)$/$(TARGET).lib
SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1DEF= $(MISC)$/$(SHL1TARGET).def
#SHL1VERSIONMAP= $(TARGET).map
SHL1IMPLIB= ilng SHL1IMPLIB= ilng
# build DEF file # build DEF file
...@@ -86,7 +85,6 @@ DEF1NAME =$(SHL1TARGET) ...@@ -86,7 +85,6 @@ DEF1NAME =$(SHL1TARGET)
DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt
DEFLIB1NAME =$(TARGET) DEFLIB1NAME =$(TARGET)
DEF1DES =Linguistic main DLL DEF1DES =Linguistic main DLL
#DEF1EXPORTFILE= exports.dxp
.IF "$(GUI)"=="WNT" .IF "$(GUI)"=="WNT"
...@@ -97,7 +95,6 @@ DEF1EXPORT3 = component_getImplementationEnvironment ...@@ -97,7 +95,6 @@ DEF1EXPORT3 = component_getImplementationEnvironment
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------
.INCLUDE : target.mk .INCLUDE : target.mk
......
...@@ -44,8 +44,6 @@ OBJFILES=\ ...@@ -44,8 +44,6 @@ OBJFILES=\
$(OBJ)$/srcharg.obj \ $(OBJ)$/srcharg.obj \
$(OBJ)$/ucbdemo.obj $(OBJ)$/ucbdemo.obj
#SRSFILES= $(SRS)$/ucbdemo.srs
# #
# UCBDEMO # UCBDEMO
# #
...@@ -53,7 +51,6 @@ APP1TARGET= ucbdemo ...@@ -53,7 +51,6 @@ APP1TARGET= ucbdemo
APP1OBJS=\ APP1OBJS=\
$(OBJ)$/srcharg.obj \ $(OBJ)$/srcharg.obj \
$(OBJ)$/ucbdemo.obj $(OBJ)$/ucbdemo.obj
#APP1RES= $(RES)$/ucbdemo.res
.IF "$(COMPHELPERLIB)"=="" .IF "$(COMPHELPERLIB)"==""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment