From 9d4fdd4f187ae3082ba5077fbdf33e48aaae3821 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 1 Feb 2011 17:55:57 +0100 Subject: Clean up makefiles --- connectivity/source/dbtools/makefile.mk | 1 - connectivity/source/drivers/ado/makefile.mk | 4 +--- connectivity/source/drivers/calc/makefile.mk | 9 +-------- connectivity/source/drivers/evoab/makefile.mk | 5 ++++- connectivity/source/drivers/evoab2/makefile.mk | 3 ++- desktop/source/deployment/makefile.mk | 1 - desktop/source/so_comp/makefile.mk | 5 ----- desktop/util/makefile.mk | 6 ------ fpicker/source/win32/folderpicker/makefile.mk | 1 - fpicker/source/win32/folderpicker/workbench/makefile.mk | 3 +-- fpicker/test/makefile.mk | 4 ---- framework/qa/complex/framework/recovery/makefile.mk | 9 +-------- oovbaapi/ooo/vba/constants/makefile.mk | 2 -- oovbaapi/util/makefile.pmk | 4 +--- readlicense_oo/docs/readme/makefile.mk | 1 - scripting/source/vbaevents/makefile.mk | 2 -- sfx2/qa/complex/docinfo/makefile.mk | 2 +- sfx2/sdi/makefile.mk | 2 +- sfx2/source/doc/makefile.mk | 2 -- sfx2/util/makefile.mk | 3 --- shell/source/unix/sysshell/makefile.mk | 3 --- shell/source/win32/shlxthandler/thumbviewer/makefile.mk | 1 - shell/source/win32/shlxthandler/util/makefile.mk | 1 - svx/source/gengal/makefile.mk | 5 ----- svx/source/items/makefile.mk | 1 - ucb/test/com/sun/star/comp/ucb/makefile.mk | 1 - xmlhelp/util/makefile.mk | 1 - xmlscript/util/makefile.mk | 1 - 28 files changed, 13 insertions(+), 70 deletions(-) diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk index 1fb9a7130813..1dab5a6f7368 100644 --- a/connectivity/source/dbtools/makefile.mk +++ b/connectivity/source/dbtools/makefile.mk @@ -72,7 +72,6 @@ SHL1STDLIBS=\ SHL1STDLIBS+=$(UCBHELPERLIB) .ENDIF -#SHL1DEPN= SHL1IMPLIB= idbtools SHL1LIBS= $(LIB1TARGET) diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk index 54bebe6a2824..77a3147d549b 100644 --- a/connectivity/source/drivers/ado/makefile.mk +++ b/connectivity/source/drivers/ado/makefile.mk @@ -31,9 +31,8 @@ PRJNAME=connectivity TARGET=ado VISIBILITY_HIDDEN=TRUE -# ENABLE_EXCEPTIONS=TRUE - # --- Settings ---------------------------------- + .IF "$(DBGUTIL_OJ)"!="" ENVCFLAGS+=/FR$(SLO)$/ .ENDIF @@ -97,7 +96,6 @@ SHL1STDLIBS=\ SHL1STDLIBS+= icomphelp2.lib .ENDIF -#SHL1DEPN= SHL1IMPLIB= i$(SHL1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk index c42d52285fe9..8b5958f30778 100644 --- a/connectivity/source/drivers/calc/makefile.mk +++ b/connectivity/source/drivers/calc/makefile.mk @@ -34,6 +34,7 @@ ENABLE_EXCEPTIONS=TRUE VISIBILITY_HIDDEN=TRUE # --- Settings ---------------------------------- + .IF "$(DBGUTIL_OJ)"!="" ENVCFLAGS+=/FR$(SLO)$/ .ENDIF @@ -41,7 +42,6 @@ ENVCFLAGS+=/FR$(SLO)$/ .INCLUDE : $(PRJ)$/makefile.pmk .INCLUDE : $(PRJ)$/version.mk - # --- Files ------------------------------------- SLOFILES=\ @@ -76,10 +76,6 @@ SHL1STDLIBS=\ $(COMPHELPERLIB) -#.IF "$(DBFILELIB)" == "" -#SHL1STDLIBS+= ifile.lib -#.ENDIF - SHL1DEPN= SHL1IMPLIB= i$(TARGET) @@ -88,9 +84,6 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) DEF1EXPORTFILE= exports.dxp - # --- Targets ---------------------------------- .INCLUDE : $(PRJ)$/target.pmk - - diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk index 363b08e40993..82e0ce4b70b0 100644 --- a/connectivity/source/drivers/evoab/makefile.mk +++ b/connectivity/source/drivers/evoab/makefile.mk @@ -33,6 +33,7 @@ TARGET=evoab VISIBILITY_HIDDEN=TRUE # --- Settings ---------------------------------- + .IF "$(DBGUTIL_OJ)"!="" ENVCFLAGS+=/FR$(SLO)$/ .ENDIF @@ -69,7 +70,7 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Library ----------------------------------- -#SHL1TARGET=$(TARGET)$(DLLPOSTFIX) + SHL1TARGET= $(EVOAB_TARGET)$(DLLPOSTFIX) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ @@ -100,5 +101,7 @@ DEF1NAME= $(SHL1TARGET) dummy: @echo "Nothing to build for GUI $(GUI)" .ENDIF + # --- Targets ---------------------------------- + .INCLUDE : $(PRJ)$/target.pmk diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk index 126af9076341..474e001e0926 100644 --- a/connectivity/source/drivers/evoab2/makefile.mk +++ b/connectivity/source/drivers/evoab2/makefile.mk @@ -69,7 +69,7 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Library ----------------------------------- -#SHL1TARGET=$(TARGET)$(DLLPOSTFIX) + SHL1TARGET= $(EVOAB_TARGET)$(DLLPOSTFIX) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ @@ -107,6 +107,7 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) .ENDIF + # --- Targets ---------------------------------- .INCLUDE : $(PRJ)$/target.pmk diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk index 6d83a5c1004b..ce494b449608 100644 --- a/desktop/source/deployment/makefile.mk +++ b/desktop/source/deployment/makefile.mk @@ -30,7 +30,6 @@ PRJ = ..$/.. PRJNAME = desktop TARGET = deployment ENABLE_EXCEPTIONS = TRUE -#USE_DEFFILE = TRUE NO_BSYMBOLIC = TRUE .IF "$(GUI)"=="OS2" diff --git a/desktop/source/so_comp/makefile.mk b/desktop/source/so_comp/makefile.mk index 590f99518c68..5016489425df 100644 --- a/desktop/source/so_comp/makefile.mk +++ b/desktop/source/so_comp/makefile.mk @@ -37,11 +37,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -# --- Define time bomb date. Not active for OOo -------------------- -# --- Change something in evaluation.cxx!!! (e.g. line 313) -# --- You must use the yyyymmdd format!!! -------------------------- -#CDEFS+=-DTIMEBOMB=20050930 - # --- Files -------------------------------------------------------- SLOFILES = $(SLO)$/evaluation.obj \ diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 3d4950cb40f0..0d36c14612b0 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -78,11 +78,6 @@ APP1VERINFO=verinfo.rc APP1LINKRES=$(MISC)$/$(TARGET)1.res APP1STACK=10000000 -# create a manifest file with the same name as the -#office executable file soffice.exe.manifest -#$(BIN)$/$(TARGET).exe.manifest: template.manifest -#$(COPY) $< $@ - .ENDIF # WNT .ENDIF # "$(GUI)" != "OS2" @@ -96,7 +91,6 @@ APP5OBJS=$(OBJ)$/copyright_ascii_ooo.obj $(OBJ)$/main.obj APP5STDLIBS = $(SALLIB) $(SOFFICELIB) .IF "$(OS)" == "LINUX" APP5STDLIBS+= -lXext -lX11 -#APP5STDLIBS+= -lXext -lSM -lICE .ENDIF # LINUX APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc diff --git a/fpicker/source/win32/folderpicker/makefile.mk b/fpicker/source/win32/folderpicker/makefile.mk index 7f0556d7cecb..f42ff9685c3c 100644 --- a/fpicker/source/win32/folderpicker/makefile.mk +++ b/fpicker/source/win32/folderpicker/makefile.mk @@ -28,7 +28,6 @@ PRJ=..$/..$/.. PRJNAME=fpicker TARGET=fop -#LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE COMP1TYPELIST=$(TARGET) diff --git a/fpicker/source/win32/folderpicker/workbench/makefile.mk b/fpicker/source/win32/folderpicker/workbench/makefile.mk index bfdf840989f8..666751f2779d 100644 --- a/fpicker/source/win32/folderpicker/workbench/makefile.mk +++ b/fpicker/source/win32/folderpicker/workbench/makefile.mk @@ -32,9 +32,7 @@ TARGET= testfops LIBTARGET= NO TARGETTYPE= CUI - # --- Settings ----------------------------------------------------- -#.INCLUDE : $(PRJ)$/util$/makefile.pmk .INCLUDE : settings.mk @@ -58,5 +56,6 @@ APP1STDLIBS+= $(CPPULIB) \ APP1DEF= $(MISC)$/$(APP1TARGET).def # --- Targets ------------------------------------------------------ + .INCLUDE : target.mk diff --git a/fpicker/test/makefile.mk b/fpicker/test/makefile.mk index 9cdf1adb157a..4157d339bd3a 100644 --- a/fpicker/test/makefile.mk +++ b/fpicker/test/makefile.mk @@ -30,8 +30,6 @@ PRJ=.. PRJNAME=SV TARGET=svdem LIBTARGET=NO -#TARGETTYPE=GUI - .IF "$(GUI)" == "OS2" TARGETTYPE=GUI @@ -50,8 +48,6 @@ APP1NOSAL= TRUE APP1TARGET= $(TARGET) APP1OBJS= $(OBJFILES) -# $(OBJ)$/salmain.obj - APP1STDLIBS= $(CPPULIB) \ $(CPPUHELPERLIB) \ $(COMPHELPERLIB) \ diff --git a/framework/qa/complex/framework/recovery/makefile.mk b/framework/qa/complex/framework/recovery/makefile.mk index 4a9f80b4b2a5..34155753e873 100755 --- a/framework/qa/complex/framework/recovery/makefile.mk +++ b/framework/qa/complex/framework/recovery/makefile.mk @@ -31,8 +31,8 @@ PRJNAME = framework PACKAGE = complex$/framework$/recovery # --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk +.INCLUDE: settings.mk #----- compile .java files ----------------------------------------- @@ -74,8 +74,6 @@ MYTAR: ALLTAR CT_APPEXECCOMMAND = .ELSE CT_APPEXECCOMMAND = -cmd "$(cmd)" -#CT_APPEXECCOMMAND = -AppExecutionCommand \ -# "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" .ENDIF # test base is java complex @@ -93,11 +91,6 @@ CT_NOOFFICE = -NoOffice true .INCLUDE : target.mk RUN: run -# muss noch angepasst werden: es soll auf -AppExecutionCommand und -NoOffice gepr??ft werden -#.IF "$(OFFICE)" == "" -#run: -# @echo Exit -#.ELSE run: +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_NOOFFICE) $(CT_PACKAGE).RecoveryTest diff --git a/oovbaapi/ooo/vba/constants/makefile.mk b/oovbaapi/ooo/vba/constants/makefile.mk index a731574363be..dbe221391335 100644 --- a/oovbaapi/ooo/vba/constants/makefile.mk +++ b/oovbaapi/ooo/vba/constants/makefile.mk @@ -37,11 +37,9 @@ PACKAGE=org$/vba$/constants .IF "$(L10N_framework)"=="" # ------------------------------------------------------------------------ -# I tried to use the IDLFILES target but it failed dismally MY_GEN_IDL_PATH=$(MISC)$/idl MY_GEN_UCR_PATH=$(OUT)$/ucr$/$(PACKAGE) MYTMPIDLFILES=$(shell @ls $(MY_GEN_IDL_PATH)) -#IDLFILES=$(foreach,i,$(MYTMPIDLFILES) $(MY_GEN_IDL_PATH)$/$(i)) MYIDLFILES=$(foreach,i,$(MYTMPIDLFILES) $(MY_GEN_IDL_PATH)$/$(i)) MYURDFILES=$(foreach,i,$(MYIDLFILES) $(MY_GEN_UCR_PATH)$/$(i:b).urd) MYDBTARGET=$(OUT)$/ucr/constants.db diff --git a/oovbaapi/util/makefile.pmk b/oovbaapi/util/makefile.pmk index e8f7cf4976f6..81737fa21685 100644 --- a/oovbaapi/util/makefile.pmk +++ b/oovbaapi/util/makefile.pmk @@ -26,9 +26,7 @@ #************************************************************************* # --- Settings ----------------------------------------------------- + .INCLUDE : settings.mk LOCALIDLFILES=TRUE - -#URDDOC=TRUE - diff --git a/readlicense_oo/docs/readme/makefile.mk b/readlicense_oo/docs/readme/makefile.mk index efe349d4ba6b..29128100c5ef 100755 --- a/readlicense_oo/docs/readme/makefile.mk +++ b/readlicense_oo/docs/readme/makefile.mk @@ -33,7 +33,6 @@ TARGET = ooo .INCLUDE : settings.mk -#SOLAR_JAVA= # --- Files -------------------------------------------------------- READMEFILES = \ diff --git a/scripting/source/vbaevents/makefile.mk b/scripting/source/vbaevents/makefile.mk index b76ca51702d2..09180a1c616d 100644 --- a/scripting/source/vbaevents/makefile.mk +++ b/scripting/source/vbaevents/makefile.mk @@ -47,8 +47,6 @@ DLLPRE = # ------------------------------------------------------------------ -#.INCLUDE : ..$/cppumaker.mk - SLOFILES= \ $(SLO)$/service.obj \ $(SLO)$/eventhelper.obj diff --git a/sfx2/qa/complex/docinfo/makefile.mk b/sfx2/qa/complex/docinfo/makefile.mk index 8c3525541062..0c350f1a9618 100644 --- a/sfx2/qa/complex/docinfo/makefile.mk +++ b/sfx2/qa/complex/docinfo/makefile.mk @@ -31,8 +31,8 @@ PRJNAME = sfx2 PACKAGE = complex$/docinfo # --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk +.INCLUDE: settings.mk #----- compile .java files ----------------------------------------- diff --git a/sfx2/sdi/makefile.mk b/sfx2/sdi/makefile.mk index c02e51eb6998..07e8a4b7fe19 100644 --- a/sfx2/sdi/makefile.mk +++ b/sfx2/sdi/makefile.mk @@ -39,9 +39,9 @@ TARGET=sfxslots SDI1NAME=$(TARGET) SDI1EXPORT=sfx -#SIDHRCNAME=sfx.hrc unused??? .ENDIF + # --- Files -------------------------------------------------------- SVSDI1DEPEND= \ diff --git a/sfx2/source/doc/makefile.mk b/sfx2/source/doc/makefile.mk index b1bddf82e428..d663d34cf5ba 100644 --- a/sfx2/source/doc/makefile.mk +++ b/sfx2/source/doc/makefile.mk @@ -87,8 +87,6 @@ SLOFILES = \ $(SLO)$/syspath.obj \ $(SLO)$/syspathw32.obj -# $(SLO)$/applet.obj \ - .IF "$(GUI)" == "WNT" #HACK TO DISABLE PCH diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk index b9b4d7acefe4..9e20a82d4252 100644 --- a/sfx2/util/makefile.mk +++ b/sfx2/util/makefile.mk @@ -115,8 +115,6 @@ SHL1DEPN += $(shell @$(FIND) $(SLO) -type f -name "*.OBJ" -print) SHL1LIBS= $(LIB1TARGET) -#SHL1OBJS= $(SLO)$/sfxdll.obj - SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME =$(SHL1TARGET) @@ -159,5 +157,4 @@ SHL3NOCHECK=TRUE # --- Targets ------------------------------------------------------ - .INCLUDE : target.mk diff --git a/shell/source/unix/sysshell/makefile.mk b/shell/source/unix/sysshell/makefile.mk index 3d8a55d4377f..2656fdb8557e 100644 --- a/shell/source/unix/sysshell/makefile.mk +++ b/shell/source/unix/sysshell/makefile.mk @@ -52,9 +52,6 @@ SHL1TARGET=recentfile SHL1IMPLIB=i$(TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) - -.ELSE -#SHL1IMPLIB= .ENDIF SHL1STDLIBS=$(EXPATASCII3RDLIB)\ diff --git a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk index 1b7dd103026e..01936460fae7 100644 --- a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk +++ b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk @@ -36,7 +36,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk CFLAGS+=-DWIN32_LEAN_AND_MEAN -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 -#CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 CDEFS+=-D_WIN32_IE=0x501 # --- Files -------------------------------------------------------- diff --git a/shell/source/win32/shlxthandler/util/makefile.mk b/shell/source/win32/shlxthandler/util/makefile.mk index 8ccf50602f93..195bf9fac6fe 100644 --- a/shell/source/win32/shlxthandler/util/makefile.mk +++ b/shell/source/win32/shlxthandler/util/makefile.mk @@ -28,7 +28,6 @@ PRJ=..$/..$/..$/.. PRJNAME=shell TARGET=util -#LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE diff --git a/svx/source/gengal/makefile.mk b/svx/source/gengal/makefile.mk index eefe8679a139..f3e119a8a7fd 100644 --- a/svx/source/gengal/makefile.mk +++ b/svx/source/gengal/makefile.mk @@ -64,11 +64,6 @@ APP1STDLIBS=$(TOOLSLIB) \ $(UCBHELPERLIB) \ $(SVXCORELIB) -#.IF "$(COM)"=="GCC" -#ADDOPTFILES=$(OBJ)$/gengal.obj -#add_cflagscxx="-frtti -fexceptions" -#.ENDIF - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/svx/source/items/makefile.mk b/svx/source/items/makefile.mk index 8bd3edc036e7..b2f20337191e 100644 --- a/svx/source/items/makefile.mk +++ b/svx/source/items/makefile.mk @@ -30,7 +30,6 @@ PRJ=..$/.. PROJECTPCH4DLL=TRUE PROJECTPCH=svxpch PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch -#ENABLE_EXCEPTIONS=TRUE PRJNAME=svx TARGET=items diff --git a/ucb/test/com/sun/star/comp/ucb/makefile.mk b/ucb/test/com/sun/star/comp/ucb/makefile.mk index 1f2e35593909..1e1f340d1bff 100644 --- a/ucb/test/com/sun/star/comp/ucb/makefile.mk +++ b/ucb/test/com/sun/star/comp/ucb/makefile.mk @@ -52,7 +52,6 @@ $(MISC)$/$(TARGET).createdclassdir: - $(MKDIR) $(CLASSDIR) $(TOUCH) $@ -#ALLTAR .PHONY: runtest: java -classpath $(CLASSPATH) org.openoffice.Runner -TestBase java_complex \ -AppExecutionCommand "c:\staroffice8.m13\program\soffice -accept=socket,host=localhost,port=8100;urp;" \ diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk index 5bc5bc690bac..a1e73bf8a7c7 100644 --- a/xmlhelp/util/makefile.mk +++ b/xmlhelp/util/makefile.mk @@ -77,7 +77,6 @@ DEF1NAME=$(SHL1TARGET) ZIP1TARGET=helpxsl ZIP1FLAGS= -u -r -#ZIP1DIR=$(PRJ)$/source$/auxiliary ZIP1LIST=main_transform*.xsl idxcaption.xsl idxcontent.xsl diff --git a/xmlscript/util/makefile.mk b/xmlscript/util/makefile.mk index dd21c16cd558..a916c42e29d8 100644 --- a/xmlscript/util/makefile.mk +++ b/xmlscript/util/makefile.mk @@ -29,7 +29,6 @@ PRJ=.. PRJNAME=xmlscript TARGET=xcr NO_BSYMBOLIC=TRUE -#USE_DEFFILE=TRUE ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- -- cgit