summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk2
-rw-r--r--bridges/source/remote/context/makefile.mk2
-rw-r--r--cppuhelper/test/loader/makefile.mk7
-rw-r--r--jurt/demo/com/sun/star/demo/makefile.mk2
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/makefile.mk9
-rw-r--r--pyuno/source/loader/makefile.mk10
-rw-r--r--registry/util/makefile.mk2
-rw-r--r--remotebridges/source/factory/makefile.mk1
-rw-r--r--sal/test/makefile.mk6
-rw-r--r--stoc/test/excomp/makefile.mk1
-rw-r--r--stoc/test/javavm/testapplet/makefile.mk9
-rw-r--r--stoc/test/javavm/testcomponent/makefile.mk10
-rw-r--r--unoil/climaker/makefile.mk1
13 files changed, 12 insertions, 50 deletions
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk b/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk
index 2af2f29a02a3..74d156abbf75 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk
@@ -44,8 +44,6 @@ CHECKFORPIC=
.IF "$(COM)" == "C52" && "$(CPU)"=="S"
-#CFLAGS += -O5 -xO5
-
.IF "$(cppu_no_leak)" == ""
CFLAGS += -DLEAK_STATIC_DATA
.ENDIF
diff --git a/bridges/source/remote/context/makefile.mk b/bridges/source/remote/context/makefile.mk
index cc2a52355d25..a192f81d3eed 100644
--- a/bridges/source/remote/context/makefile.mk
+++ b/bridges/source/remote/context/makefile.mk
@@ -57,8 +57,6 @@ SHL1RPATH=URELIB
SHL1VERSIONMAP= $(TARGET).map
DEF1NAME= $(SHL1TARGET)
-#DEF1EXPORTFILE= exports.dxp
-
# --- Targets ------------------------------------------------------
diff --git a/cppuhelper/test/loader/makefile.mk b/cppuhelper/test/loader/makefile.mk
index dc1b5662bd43..4816dcb47e36 100644
--- a/cppuhelper/test/loader/makefile.mk
+++ b/cppuhelper/test/loader/makefile.mk
@@ -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)
diff --git a/jurt/demo/com/sun/star/demo/makefile.mk b/jurt/demo/com/sun/star/demo/makefile.mk
index 6bc3e1ae9da7..c009a2afa183 100644
--- a/jurt/demo/com/sun/star/demo/makefile.mk
+++ b/jurt/demo/com/sun/star/demo/makefile.mk
@@ -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
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
index 25ff106973ec..4fdb1ba92567 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
+++ b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
@@ -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
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk
index 6f8648ce598e..c706a7700dba 100644
--- a/pyuno/source/loader/makefile.mk
+++ b/pyuno/source/loader/makefile.mk
@@ -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 \
diff --git a/registry/util/makefile.mk b/registry/util/makefile.mk
index 1fb4cdc0fe38..0b6be7e6e7f5 100644
--- a/registry/util/makefile.mk
+++ b/registry/util/makefile.mk
@@ -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 \
diff --git a/remotebridges/source/factory/makefile.mk b/remotebridges/source/factory/makefile.mk
index 7cd3875bcfb3..11e19e125acb 100644
--- a/remotebridges/source/factory/makefile.mk
+++ b/remotebridges/source/factory/makefile.mk
@@ -51,7 +51,6 @@ SHL1STDLIBS= \
$(CPPUHELPERLIB) \
$(RMCXTLIB)
-#SHL1DEPN=
SHL1IMPLIB= i$(TARGET)
SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/test/makefile.mk b/sal/test/makefile.mk
index 6edba90ce6b9..1f4b339a1692 100644
--- a/sal/test/makefile.mk
+++ b/sal/test/makefile.mk
@@ -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: $@
diff --git a/stoc/test/excomp/makefile.mk b/stoc/test/excomp/makefile.mk
index b41acb372620..01ffb65a5fcc 100644
--- a/stoc/test/excomp/makefile.mk
+++ b/stoc/test/excomp/makefile.mk
@@ -31,7 +31,6 @@ TARGET= excomp
TARGET1= excomp1
TARGET2= excomp2
TARGETTYPE=CUI
-#LIBTARGET=NO
ENABLE_EXCEPTIONS=TRUE
USE_DEFFILE= TRUE
NO_BSYMBOLIC= TRUE
diff --git a/stoc/test/javavm/testapplet/makefile.mk b/stoc/test/javavm/testapplet/makefile.mk
index 4ddadebd9aa2..31872c5386df 100644
--- a/stoc/test/javavm/testapplet/makefile.mk
+++ b/stoc/test/javavm/testapplet/makefile.mk
@@ -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
-
diff --git a/stoc/test/javavm/testcomponent/makefile.mk b/stoc/test/javavm/testcomponent/makefile.mk
index a2f8eb16fe4d..9d77ebfb9bdf 100644
--- a/stoc/test/javavm/testcomponent/makefile.mk
+++ b/stoc/test/javavm/testcomponent/makefile.mk
@@ -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
-
diff --git a/unoil/climaker/makefile.mk b/unoil/climaker/makefile.mk
index 36de0bf117ca..d820e72d082e 100644
--- a/unoil/climaker/makefile.mk
+++ b/unoil/climaker/makefile.mk
@@ -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
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-20 11:23:22 +0000