Clean up makefiles

This commit is contained in:
Thomas Arnhold
2011-02-02 12:06:11 +01:00
parent e5c11afa97
commit 4327ec0dee
22 changed files with 3 additions and 244 deletions
-4
View File
@@ -34,10 +34,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
#.INCLUDE : svpre.mk
#.INCLUDE : settings.mk
#.INCLUDE : sv.mk
LDUMP=ldump2.exe
# --- Library -----------------------------------
@@ -37,19 +37,11 @@ USE_JAVAVER:=TRUE
.INCLUDE : settings.mk
.IF "$(JAVAVER:s/.//)" >= "140"
.INCLUDE : makefile.common
JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
#JARTARGET = $(TARGET).jar
#JARCOMPRESS = TRUE
JARCLASSDIRS = $(PACKAGE) org/openoffice/java/accessibility/awb
#CUSTOMMANIFESTFILE = manifest
.ENDIF
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
@@ -37,19 +37,10 @@ USE_JAVAVER:=TRUE
.INCLUDE : settings.mk
.IF "$(JAVAVER:s/.//)" >= "140"
.INCLUDE : makefile.common
JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
#JARTARGET = $(TARGET).jar
#JARCOMPRESS = TRUE
#JARCLASSDIRS = $(PACKAGE) org/openoffice/java/accessibility/awb
#CUSTOMMANIFESTFILE = manifest
.ENDIF
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
@@ -43,8 +43,6 @@ LIBTARGET=NO
PACKAGE := com$/sun$/star$/testtool
TARGET := com_sun_star_testtool
#RDB=$(SOLARBINDIR)$/applicat.rdb
RDB=$(BIN)$/mozillatesttool.rdb
@@ -61,8 +59,6 @@ GENJAVACLASSFILES = \
TYPES={$(subst,.class, $(subst,$/,. $(subst,$(CLASSDIR)$/,-T $(GENJAVACLASSFILES))))}
GENJAVAFILES = {$(subst,.class,.java $(subst,$/class, $(GENJAVACLASSFILES)))}
#JAVAFILES= $(GENJAVAFILES)
UNOUCRDEP=$(RDB)
@@ -94,34 +90,6 @@ UNOTYPES= \
com.sun.star.testtool.ResultType \
com.sun.star.testtool.XMozillaTesttoolServer
#SLOFILES= \
# $(SLO)$/iserverproxy.obj \
# $(SLO)$/broadcastclient.obj \
# $(SLO)$/genericinformation.obj \
# $(SLO)$/informationclient.obj
# ---- test ----
#LIB1TARGET=$(SLB)$/iserverproxy.lib
#LIB1OBJFILES=$(SLOFILES)
#SHL1TARGET=iserverproxy
#SHL1STDLIBS= \
# $(OSLLIB) $(RTLLIB) $(TOOLSLIB) \
# $(CPPULIB) \
# $(CPPUHELPERLIB) \
# $(UNOLIB) \
# $(SVTOOLLIB) \
# $(SALLIB) \
# $(BOOTSTRP)
#SHL1LIBS= $(LIB1TARGET) $(LB)$/ico.lib
#SHL1DEF= $(MISC)$/$(SHL1TARGET).def
#DEF1NAME= $(SHL1TARGET)
#DEF1EXPORTFILE= exports.dxp
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+1 -1
View File
@@ -24,6 +24,7 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
PRJ=..
PRJNAME=basctl
@@ -44,4 +45,3 @@ ALLTAR : \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
-1
View File
@@ -25,7 +25,6 @@
#
#*************************************************************************
PRJ=..
PRJNAME=basctl
-1
View File
@@ -43,7 +43,6 @@ PROJECTPCHSOURCE=ide_pch
CDEFS+=-DBASICDEBUG
.ENDIF
# --- Allgemein ----------------------------------------------------------
EXCEPTIONSFILES= \
-19
View File
@@ -42,26 +42,7 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
MAXLINELENGTH = 100000
#JARCLASSDIRS = $(PACKAGE)
#JARTARGET = $(TARGET).jar
#JARCOMPRESS = TRUE
# --- Parameters for the test --------------------------------------
# test base is java complex
#CT_TESTBASE = -TestBase java_complex
# test looks something like the.full.package.TestName
#CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
# start the runner application
#CT_APP = org.openoffice.Runner
#CT_NOOFFICE = -NoOffice
OFFICE_CLASSPATH_TMP:=$(foreach,i,$(JARFILES) $(office)$/program$/classes$/$(i)$(PATH_SEPERATOR))
OFFICE_CLASSPATH=$(OFFICE_CLASSPATH_TMP:t"")$(PATH_SEPERATOR)$(CLASSDIR)
OOOBEAN_OPTIONS=-Dcom.sun.star.officebean.Options=-norestore
@@ -72,9 +72,6 @@ SHL1OBJS= $(SLO)$/npshell.obj \
.IF "$(GUI)"=="UNX"
STDLIBS+=$(SOLARLIBDIR)$/npunix.o
SHL1STDLIBS+=$(SOLARLIBDIR)$/npunix.o
#.IF "$(OS)"!="FREEBSD"
#SHL1STDLIBS+= -ldl -lnsl
#.ENDIF #FREEBSD
.ENDIF #UNX
.IF "$(GUI)"=="WNT"
SHL1OBJS+=$(SOLARLIBDIR)$/pathutils-slo.obj
-11
View File
@@ -28,8 +28,6 @@ PRJ=..$/..$/..
PRJNAME=extensions
TARGET=plaqua
#ENABLE_EXCEPTIONS=TRUE
#TARGETTYPE=CUI
.INCLUDE : ..$/util$/makefile.pmk
@@ -58,15 +56,6 @@ SLOFILES=\
$(SLO)$/macmgr.obj \
$(SLO)$/sysplug.obj
#APP1TARGET=pluginapp.bin
#APP1OBJS=$(OBJFILES)
#APP1STDLIBS=\
# $(TOOLSLIB) \
# $(SALLIB)
#APP1DEF= $(MISC)$/$(TARGET).def
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+1 -8
View File
@@ -46,20 +46,13 @@ CDEFS+=-DOJI
# --- Types -------------------------------------
.IF "$(WITH_MOZILLA)" != "NO"
#UNOUCROUT=$(OUT)$/inc$/$(PRJNAME)
#INCPRE+=$(UNOUCROUT)
# --- Types -------------------------------------
SLOFILES = $(SLO)$/winmgr.obj \
$(SLO)$/sysplug.obj
.ENDIF # $(WITH_MOZILLA) != "NO"
.ENDIF
# ------------------------------------------------------------------
.INCLUDE : target.mk
@@ -41,28 +41,4 @@ APP1TARGET = ztool
APP1OBJS = $(OBJ)$/ztool.obj
APP1STDLIBS = $(TOOLSLIB)
#APP1TARGET = ztool
#APP1OBJS = $(OBJ)$/ztool.obj
#.IF "$(GUI)" == "UNX"
#APP1STDLIBS = $(TOOLSLIB)
#.ELSE
#APP1LIBS = $(LB)$/itools.lib
#.ENDIF
#APP2TARGET = urltest
#APP2OBJS = $(OBJ)$/urltest.obj
#.IF "$(GUI)" == "UNX"
#APP2STDLIBS = $(TOOLSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
#.ELSE
#APP2STDLIBS = $(LB)$/itools.lib isal.lib icppu.lib icppuhelper.lib
#.ENDIF
# APP3TARGET = tldem
# APP3OBJS = $(OBJ)$/tldem.obj
# .IF "$(GUI)" == "UNX"
# APP3STDLIBS = $(TOOLSLIB)
# .ELSE
# APP3STDLIBS = $(LB)$/itools.lib
# .ENDIF
.INCLUDE: target.mk
-18
View File
@@ -35,20 +35,6 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
#UNOUCRDEP= $(SOLARBINDIR)$/types.rdb $(BIN)$/oletest.rdb
#UNOUCRRDB= $(SOLARBINDIR)$/types.rdb $(BIN)$/oletest.rdb
#UNOUCROUT= $(OUT)$/inc
#UNOTYPES= oletest.XTestSequence \
# oletest.XTestStruct \
# oletest.XTestOther \
# oletest.XTestInterfaces \
# oletest.XSimple \
# oletest.XSimple2 \
# oletest.XSimple3 \
# oletest.XTestInParameters \
# oletest.XIdentity
INCPRE+= -I$(ATL_INCLUDE)
@@ -62,10 +48,6 @@ SHL1STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB)
#.IF "$(COMEX)"=="8" || "$(COMEX)"=="10"
# SHL1STDLIBS+= $(COMPATH)$/atlmfc$/lib$/atls.lib
#.ENDIF
.IF "$(COMEX)"=="8" || "$(COMEX)"=="10"
.IF "$(USE_STLP_DEBUG)" != ""
SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
-18
View File
@@ -32,11 +32,6 @@ TARGET=workben
LIBTARGET=NO
TESTAPP=testpgp
#TESTAPP=testcomponent
#TESTAPP=pythontest
#TESTAPP=pythonautotest
#TESTAPP=testresource
#TESTAPP=testframecontrol
.IF "$(TESTAPP)" == "testresource" || "$(TESTAPP)" == "testframecontrol"
TARGETTYPE=GUI
@@ -106,27 +101,14 @@ APP2STDLIBS = \
# test python.
#
.IF "$(TESTAPP)" == "phytontest"
OBJFILES= $(OBJ)$/pythontest.obj
#APP4TARGET= pythontest
#APP4OBJS= $(OBJ)$/pythontest.obj
#APP4STDLIBS=$(TOOLSLIB)
#
.ENDIF # phytontest
#
# python auto test
#
.IF "$(TESTAPP)" == "phytonautotest"
OBJFILES= $(OBJ)$/pythonautotest.obj
#APP5TARGET= pythonautotest
#APP5OBJS = $(OBJ)$/pythonautotest.obj
#APP5STDLIBS=$(TOOLSLIB)
.ENDIF # phytonautotest
#
@@ -74,7 +74,6 @@ STDSHL+= \
-lmsvcrt
.ENDIF
#SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1OBJS = $(SLOFILES) \
$(SLO)$/registerextensions.obj \
@@ -94,7 +93,3 @@ DEF1EXPORTFILE=exports.dxp
# --- Targets --------------------------------------------------------------
.INCLUDE : target.mk
# -------------------------------------------------------------------------
@@ -69,7 +69,6 @@ STDSHL+= \
-lmsvcrt
.ENDIF
#SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1OBJS = $(SLOFILES) \
$(SLO)$/respintest.obj \
@@ -63,8 +63,6 @@ STDSHL += \
$(MSILIB)\
$(SHLWAPILIB)\
# msvcprt.lib
SHL1TARGET = $(TARGET)
SHL1IMPLIB = i$(TARGET)
@@ -76,33 +74,8 @@ DEF1EXPORTFILE=exports.dxp
.ENDIF
# --- mapimailer --------------------------------------------------------
#TARGETTYPE=CUI
#OBJFILES= $(OBJ)$/reg64.obj
#APP1TARGET=reg64
#APP1OBJS=$(OBJFILES)
#APP1STDLIBS=$(KERNEL32LIB)\
# $(ADVAPI32LIB)\
# $(MSILIB)\
# $(SHELL32LIB)\
# msvcprt.lib\
# $(OLE32LIB)\
# $(COMCTL32LIB)\
# $(UUIDLIB)
#APP1DEF=$(MISC)$/$(APP1TARGET).def
# --- Targets --------------------------------------------------------------
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
.EXPORT : INCLUDE
# -------------------------------------------------------------------------
-14
View File
@@ -26,27 +26,13 @@
#*************************************************************************
PRJ=..$/..
PRJNAME=wizards
TARGET=configshare
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/util$/target.pmk
ZIP1TARGET = $(CONFIG_SHARE_TARGET)
ZIP1LIST = * -x makefile.*
.INCLUDE : target.mk
-8
View File
@@ -36,14 +36,6 @@ TARGET=depotall
# --- Files --------------------------------------------------------
#
# testresource.
#
# SRS2NAME = depot
# SRC2FILES= webwizar.src
# RESLIB2SRSFILES= $(SRS)$/webwizar.srs
# RESLIB2NAME= wwz
ZIP1TARGET = $(DEPOT_ALL_TARGET)
ZIP1LIST = *.xdl *.xba *.xlb
+1 -1
View File
@@ -24,6 +24,7 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
CONFIG_ALL_TARGET = basicusr
CONFIG_SHARE_TARGET = basicshare
EURO_ALL_TARGET = basicsrveuro
@@ -38,4 +39,3 @@ DEPOT_ALL_TARGET = basicsrvdepot
STANDARD_ALL_TARGET = basicsrvstandard
LAUNCHER_ALL_TARGET = basicsrvlauncher
TUTORIALS_ALL_TARGET = basicsrvtutorials
-15
View File
@@ -91,21 +91,6 @@ INCPOST += \
$(MOZ_INC)$/profile \
-I$(MOZ_INC)$/string \
-I$(MOZ_INC)$/embed_base
#.IF "$(OS)" == "LINUX"
#CFLAGS += -fPIC -g
#CFLAGSCXX += \
# -fno-rtti -Wall -Wconversion -Wpointer-arith \
# -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
# -Wno-long-long -pthread
#CDEFS += -DTRACING
#.ELIF "$(OS)" == "NETBSD"
#CFLAGS += -fPIC
#CFLAGSCXX += \
# -fno-rtti -Wall -Wconversion -Wpointer-arith \
# -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
# -Wno-long-long
#CDEFS += -DTRACING
#.ENDIF
.ENDIF
CDEFS += -DXMLSEC_CRYPTO_NSS -DXMLSEC_NO_XSLT
@@ -31,7 +31,6 @@ PRJNAME=xmlsecurity
TARGET=xmlsecurity-mscxsfit
ENABLE_EXCEPTIONS=TRUE
NO_BSYMBOLIC=TRUE
#TARGETTYPE=CUI
LIBTARGET=NO
@@ -109,21 +108,6 @@ APP4STDLIBS+= -lstdc++
APP4STDLIBS+= \
$(SHARE_LIBS)
##
## The 4th application
##
#APP5TARGET= decrypter
#APP5OBJS= \
# $(SHARE_OBJS) \
# $(OBJ)$/decrypter.obj
#
#.IF "$(OS)" == "LINUX"
#APP5STDLIBS+= -lstdc++
#.ENDIF
#
#APP5STDLIBS+= \
# $(SHARE_LIBS)
#
# The 5th application
#