mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up makefiles

Browse Source
This commit is contained in:
Thomas Arnhold
2011-02-01 18:07:04 +01:00
parent 95012b599b
commit 1a6617cf05
13 changed files with 12 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk
View File

@@ -44,8 +44,6 @@ CHECKFORPIC=
.IF "$(COM)" == "C52" && "$(CPU)"=="S"
#CFLAGS += -O5 -xO5
.IF "$(cppu_no_leak)" == ""
CFLAGS += -DLEAK_STATIC_DATA
.ENDIF

2
bridges/source/remote/context/makefile.mk
View File

@@ -57,8 +57,6 @@ SHL1RPATH=URELIB
SHL1VERSIONMAP= $(TARGET).map
DEF1NAME= $(SHL1TARGET)
#DEF1EXPORTFILE= exports.dxp
# --- Targets ------------------------------------------------------

7
cppuhelper/test/loader/makefile.mk
View File

@@ -34,15 +34,8 @@ ENABLE_EXCEPTIONS := TRUE
NO_BSYMBOLIC := TRUE
USE_DEFFILE := TRUE
.INCLUDE : settings.mk
.IF "$(COM)" == "GCC"
#LINKFLAGS += -rdynamic
.ENDIF
ENVINCPRE := -I$(OUT)$/inc$/$(TARGET)
APP1TARGET := $(TARGET)

2
jurt/demo/com/sun/star/demo/makefile.mk
View File

@@ -34,6 +34,7 @@ TARGET := com_sun_star_demo
RDB=$(SOLARBINDIR)$/applicat.rdb
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
#Files --------------------------------------------------------
@@ -53,5 +54,4 @@ JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFI
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk

9
jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
View File

@@ -27,13 +27,9 @@
PRJ=..$/..$/..
PRJNAME= jvmfwk
TARGET = plugin
ENABLE_EXCEPTIONS=TRUE
LIBTARGET=NO
UNOCOMPONENT1=sunjavaplugin
# --- Settings -----------------------------------------------------
@@ -43,7 +39,6 @@ DLLPRE =
# ------------------------------------------------------------------
#.INCLUDE : ..$/cppumaker.mk
.IF "$(SOLAR_JAVA)"!=""
SLOFILES= \
@@ -58,8 +53,6 @@ SLOFILES= \
LIB1OBJFILES= $(SLOFILES)
LIB1TARGET=$(SLB)$/$(UNOCOMPONENT1).lib
SHL1TARGET= $(UNOCOMPONENT1)
@@ -95,8 +88,6 @@ JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES)))
.ENDIF # SOLAR_JAVA
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk

10
pyuno/source/loader/makefile.mk
View File

@@ -73,16 +73,6 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
SLOFILES= $(SLO)$/pyuno_loader.obj
#COMPONENTS= \
# tcv \
# inv \
# corefl \
# insp \
# invadp \
# proxyfac \
# pythonloader.uno \
COMPONENTS= \
stocservices.uno \
invocation.uno \

2
registry/util/makefile.mk
View File

@@ -33,12 +33,12 @@ TARGET=reg
UNIXVERSIONNAMES=UDK
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
# ------------------------------------------------------------------
USE_LDUMP2=TRUE
#USE_DEFFILE=TRUE
LDUMP2=LDUMP3
DOCPPFILES= $(INC)$/registry$/registry.hxx \

1
remotebridges/source/factory/makefile.mk
View File

@@ -51,7 +51,6 @@ SHL1STDLIBS= \
$(CPPUHELPERLIB) \
$(RMCXTLIB)
#SHL1DEPN=
SHL1IMPLIB= i$(TARGET)
SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1DEF= $(MISC)$/$(SHL1TARGET).def

6
sal/test/makefile.mk
View File

@@ -33,13 +33,13 @@ TARGETTYPE=CUI
LIBTARGET=NO
USE_LDUMP2=TRUE
ENABLE_EXCEPTIONS=TRUE
#LDUMP2=LDUMP3
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
# ------------------------------------------------------------------
.IF "$(GUI)"=="WNT"
@@ -70,6 +70,7 @@ APP4STDLIBS = $(SALLIB)
# --- Targets ------------------------------------------------------
.IF "$(depend)" == ""
ALL : ALLTAR \
$(BIN)$/$(BOOTSTRAPSCRIPT) \
@@ -144,6 +145,7 @@ $(BIN)$/bootstraptest.ini : bootstraptest.ini
# --- SO2-Filter-Datei ---
$(MISC)$/tsl$(DLLPOSTFIX).flt:
@echo ------------------------------
@echo Making: $@

1
stoc/test/excomp/makefile.mk
View File

@@ -31,7 +31,6 @@ TARGET= excomp
TARGET1= excomp1
TARGET2= excomp2
TARGETTYPE=CUI
#LIBTARGET=NO
ENABLE_EXCEPTIONS=TRUE
USE_DEFFILE= TRUE
NO_BSYMBOLIC= TRUE

9
stoc/test/javavm/testapplet/makefile.mk
View File

@@ -31,11 +31,12 @@ PRJNAME = testapplet
PACKAGE =
TARGET = TestApplet
# --- Settings -----------------------------------------------------
#.INCLUDE : $(PRJ)$/util$/makefile.pmk
.INCLUDE : settings.mk
# Files --------------------------------------------------------
JARFILES = ridl.jar jurt.jar unoil.jar
JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
@@ -45,11 +46,7 @@ JAVACLASSFILES= \
$(CLASSDIR)$/$(PACKAGE)$/TestApplet.class
JARCLASSDIRS= .
#JARTARGET = $(TARGET).jar
#JARCOMPRESS= TRUE
#CUSTOMMANIFESTFILE= .$/manifest
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk

10
stoc/test/javavm/testcomponent/makefile.mk
View File

@@ -31,11 +31,12 @@ PRJNAME = testcomponent
PACKAGE =
TARGET = JavaTestComponent
# --- Settings -----------------------------------------------------
#.INCLUDE : $(PRJ)$/util$/makefile.pmk
.INCLUDE : settings.mk
# Files --------------------------------------------------------
JARFILES = ridl.jar jurt.jar unoil.jar
CUSTOMMANIFESTFILE= manifest
@@ -48,11 +49,6 @@ JAVAFILES= \
JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk

1
unoil/climaker/makefile.mk
View File

@@ -34,7 +34,6 @@ TARGET = unotypes
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/util$/makefile.pmk
#.INCLUDE : $(PRJ)$/util$/target.pmk
.INCLUDE : target.mk
.INCLUDE : version.txt