Clean up makefiles

83734eea · Thomas Arnhold · c36e6bad · 83734eea · 83734eea · 83734eea
Kaydet (Commit) 83734eea authored Şub 02, 2011 tarafından Thomas Arnhold
20 changed files
--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -25,7 +25,6 @@
 #
 # ************************************************************************/

-
 PRJ = ..$/..
 PRJNAME = cli_ure


--- a/cli_ure/version/makefile.mk
+++ b/cli_ure/version/makefile.mk
@@ -40,21 +40,7 @@ TARGET = cliureversion.mk
 ALLTAR : \
    $(BIN)$/cliureversion.mk 

-#	INCVERSION
-
 #always deliver a cliureversion.mk. It is needed for the packing process even for all other
 #platforms. Therefore BUILD_FOR_CLI is not used here 
 $(BIN)$/cliureversion.mk: version.txt 
    $(GNUCOPY) $< $@
-
-
-#disabled because of #67482
-#Create the config file that is used with the policy assembly 
-#only if new published types have been added, the cliureversion.mk is written.
-#INCVERSION .PHONY: version.txt incversions.txt  
-#	$(PERL) $(PRJ)$/source$/scripts$/increment_version.pl \
-#	$< $(BIN)$/cliureversion.mk $(SOLARBINDIR)$/unotype_statistics.txt
-
-
-
-
--- a/cppuhelper/test/testlib/makefile.mk
+++ b/cppuhelper/test/testlib/makefile.mk
@@ -24,6 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+
 LINKFLAGSDEFS=""

 PRJ=..$/..
@@ -56,9 +57,6 @@ LIB!:=$(LIB);$(PERLLIBS)

 # --- Files --------------------------------------------------------

-#CFLAGS +=   -DVERSION=\"0.01\" -DXS_VERSION=\"0.01\" -fPIC -I/develop6/update/dev/solenv/unxlngi3/lib/perl5/5.6.0/i686-linux/CORE/
-#CFLAGS += -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DVERSION=\"0.01\" -DXS_VERSION=\"0.01\" -KPIC -I/develop6/update/dev/solenv/unxsols2/lib/perl5/5.6.0/sun4-solaris/CORE  
-
 SLOFILES= $(SLO)$/defbootstrap_lib.obj

 SHL1TARGET=$(TARGET)

--- a/jvmfwk/source/makefile.mk
+++ b/jvmfwk/source/makefile.mk
@@ -51,15 +51,12 @@ SLOFILES = \
    $(SLO)$/fwkbase.obj


-#LIB1TARGET=$(SLB)$/$(FRAMEWORKLIB).lib
-
 .IF "$(UNIXVERSIONNAMES)" == ""
 SHL1TARGET = $(FRAMEWORKLIB)$(UDK_MAJOR)
 .ELSE # UNIXVERSIONNAMES
 SHL1TARGET = $(FRAMEWORKLIB)
 .ENDIF # UNIXVERSIONNAMES

-#SHL1TARGET=$(FRAMEWORKLIB)
 SHL1DEPN=
 SHL1IMPLIB = i$(FRAMEWORKLIB)
 SHL1LIBS = $(SLB)$/$(TARGET).lib

--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -31,12 +31,12 @@ PRJPCH=
 PRJNAME=offapi
 TARGET=offapi_db

-
 # --- Settings -----------------------------------------------------

 .INCLUDE :  makefile.pmk

 # ------------------------------------------------------------------
+
 UNOIDLDBFILES= \
    $(UCR)$/cssauth.db \
    $(UCR)$/cssawt.db \

--- a/pyuno/demo/makefile.mk
+++ b/pyuno/demo/makefile.mk
@@ -42,188 +42,3 @@ $(ROOT)$/samples$/% : %
 $(ROOT)$/% : ..$/doc$/%
    -rm -f $@
    cat $? > $@
-
-#VERSION=0.9.4
-#PYDIRNAME=python-$(PYVERSION)
-#.IF "$(GUI)"=="WNT"
-#INISUFFIX=.ini
-#BATCHSUFFIX=.bat
-#ENVSUFFIX=.bat
-#PLATFORM=win32
-#EXESUFFIX=.exe
-#PACKSUFFIX=.zip
-#MYCOPY=copy
-#DOLLAR_SIGN=$$
-#.ELSE
-#DOLLAR_SIGN=\$$
-#PACKSUFFIX=.tar.gz
-#MYCOPY=cp
-#BATCHSUFFIX=.sh
-#ENVSUFFIX=.tcsh
-#INISUFFIX=rc
-#PYUNOMODULE=$(DESTROOT)$/program$/pyuno$(DLLPOST)
-#PYTHONLIBRARY=$(DESTROOT)$/program$/$(DLLPRE)python$(DLLPOST).$(PYVERSION)
-#PYRUNTIMELINK=$(DESTROOT)$/program$/python
-#PYRUNTIMELIBLINK1=$(DESTROOT)$/program$/libpython.so.2
-#PYRUNTIMELIBLINK2=$(DESTROOT)$/program$/libpython.so
-#
-#.IF "$(OS)$(CPU)"=="SOLARISS"
-#PLATFORM=solaris-sparc
-#.ELIF "$(OS)$(CPU)"=="SOLARISI"
-#PLATFORM=solaris-x86
-#.ELIF "$(OS)$(CPU)"=="LINUXI"
-#PLATFORM=linux-x86
-#.ELIF "$(OS)$(CPU)"=="LINUXP"
-#PLATFORM=linux-ppc
-#.ELSE
-#error please add your platform
-#.ENDIF
-#
-#.ENDIF
-#
-#DESTROOT=$(BIN)$/root
-#
-#FINDDIRS=$(subst,/,$/ $(shell +cd $(SOLARLIBDIR)$/python && $(FIND) . -type d))
-#FINDLIBFILES=$(subst,/,$/ $(shell +cd $(SOLARLIBDIR)$/python && $(FIND) . -type f))
-#
-#PYRUNTIME_DIRS=\
-#	$(DESTROOT)				\
-#	$(DESTROOT)$/program			\
-#	$(DESTROOT)$/program/pydemo		\
-#	$(DESTROOT)$/program$/$(PYDIRNAME) 	\
-#	$(DESTROOT)$/program$/$(PYDIRNAME)$/bin 	\
-#	$(DESTROOT)$/program$/$(PYDIRNAME)$/lib 	\
-#	$(foreach,i,$(FINDDIRS) $(DESTROOT)$/program$/$(PYDIRNAME)$/lib$/$(i))
-#
-#
-#FILES=\
-#	$(DESTROOT)$/program$/$(DLLPRE)pyuno$(DLLPOST) 		\
-#	$(DESTROOT)$/program$/pythonloader.uno$(DLLPOST)	\
-#	$(DESTROOT)$/program$/pyuno$(INISUFFIX)			\
-#	$(DESTROOT)$/program$/uno.py				\
-#	$(DESTROOT)$/program$/unohelper.py			\
-#	$(DESTROOT)$/program$/pythonloader.py			\
-#	$(DESTROOT)$/program$/pyuno_setup$(BATCHSUFFIX)		\
-#	$(DESTROOT)$/program$/regcomp$(EXESUFFIX)		\
-#	$(DESTROOT)$/program$/pyunoenv$(ENVSUFFIX)		\
-#	$(DESTROOT)$/program$/pydemo$/biblioaccess.py		\
-#	$(DESTROOT)$/program$/pydemo$/ooextract.py		\
-#	$(DESTROOT)$/program$/pydemo$/swriter.py		\
-#	$(DESTROOT)$/program$/pydemo$/swritercomp.py		\
-#	$(DESTROOT)$/program$/pydemo$/swritercompclient.py	\
-#	$(DESTROOT)$/program$/pydemo$/swritercompclient.py	\
-#	$(DESTROOT)$/program$/pydemo$/python-bridge.html	\
-#	$(PYUNOMODULE)						\
-#	$(PYTHONLIBRARY)					\
-#	$(DESTROOT)$/program$/$(PYDIRNAME)$/bin$/python$(EXESUFFIX)	\
-#	$(foreach,i,$(FINDLIBFILES) $(DESTROOT)$/program$/$(PYDIRNAME)$/lib$/$(i)) \
-#	$(PYRUNTIMELINK)					\
-#	$(PYRUNTIMELIBLINK1)					\
-#	$(PYRUNTIMELIBLINK2)
-#
-#
-#
-#$(BIN)$/pyuno-$(PLATFORM)-$(PYVERSION)$(PACKSUFFIX) : makefile.mk dirs $(FILES)
-#	-rm $@
-#.IF "$(GUI)"=="WNT"
-#	+cd $(DESTROOT) && zip -r ..$/pyuno-$(PLATFORM)-$(VERSION)$(PACKSUFFIX) program
-#.ELSE
-#	$(FIND) $(DESTROOT) -name '*.so' | xargs strip
-#	cd $(DESTROOT) && tar -cO program | gzip - > ..$/pyuno-$(PLATFORM)-$(VERSION)$(PACKSUFFIX)
-#.ENDIF
-#
-#
-#dirs .PHONY:
-#	-mkdir $(PYRUNTIME_DIRS) 
-#
-## Some symbolic links for unix  
-#.IF "$(GUI)" == "UNX"
-#$(PYRUNTIMELINK) : makefile.mk
-#	-rm -f $@
-#	cd $(DESTROOT)$/program && ln -s $(PYDIRNAME) python
-#
-#$(PYRUNTIMELIBLINK1) : makefile.mk
-#	-rm -f $@
-#	cd $(DESTROOT)$/program && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST).$(PYMAJOR)
-#
-#$(PYRUNTIMELIBLINK2) : makefile.mk
-#	-rm -f $@
-#	cd $(DESTROOT)$/program && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST)
-#.ENDIF
-#
-#$(DESTROOT)$/program$/regcomp$(EXESUFFIX) : $(SOLARBINDIR)$/regcomp$(EXESUFFIX)
-#	cp $? $@
-#.IF "$(GUI)" == "UNX"
-#	strip $@
-#	chmod +x $@
-#.ENDIF
-#
-#
-#$(DESTROOT)$/program$/pyunoenv$(ENVSUFFIX) : pyunoenv$(ENVSUFFIX)
-#	-rm -f $@
-#	cat $? > $@
-#
-#$(DESTROOT)$/program$/$(DLLPRE)pyuno$(DLLPOST) : $(DLLDEST)$/$(DLLPRE)pyuno$(DLLPOST)
-#	cp $? $@
-#
-#$(DESTROOT)$/program$/pyuno_setup$(BATCHSUFFIX) : makefile.mk
-#	-rm -f $@
-#.IF "$(GUI)"!="WNT"
-#	echo #\!/bin/sh >> $@
-#	chmod +x $@
-#.ENDIF
-#	echo regcomp -register -r services.rdb -c pythonloader.uno >>$@
-##	echo "$(MYCOPY) applicat.rdb pydemo$/applicat.rdb" >> $@
-#	echo regcomp -register -br types.rdb -br services.rdb -r services.rdb -c vnd.openoffice.pymodule:swritercomp -l com.sun.star.loader.Python >>$@
-#
-#$(DESTROOT)$/program$/$(DLLPRE)python$(DLLPOST).$(PYVERSION) : $(SOLARLIBDIR)$/$(DLLPRE)python$(DLLPOST).$(PYVERSION)
-#	cp $? $@
-#
-#$(DESTROOT)$/program$/pythonloader.uno$(DLLPOST) : $(DLLDEST)$/pythonloader.uno$(DLLPOST)
-#	cp $? $@
-#
-#$(DESTROOT)$/program$/%.py : $(DLLDEST)$/%.py
-#	cp $? $@
-#
-#.IF "$(GUI)" == "UNX"
-#$(DESTROOT)$/program$/pyuno$(DLLPOST) : $(DLLDEST)$/pyuno$(DLLPOST)
-#	cp $? $@
-#.ENDIF
-#
-#$(DESTROOT)$/program$/pydemo$/%.py : %.py
-#	-rm -f $@
-#	cat $? > $@
-#
-#$(DESTROOT)$/program$/pyuno$(INISUFFIX) : makefile.mk
-#	-rm -f $@ $(DESTROOT)$/program$/pyuno.tmp
-#	echo UNO_TYPES=$(DOLLAR_SIGN)PYUNOLIBDIR/types.rdb > $(DESTROOT)$/program$/pyuno.tmp
-#	echo UNO_SERVICES=$(DOLLAR_SIGN)PYUNOLIBDIR/services.rdb >> $(DESTROOT)$/program$/pyuno.tmp
-#	mv $(DESTROOT)$/program$/pyuno.tmp $@
-#
-#$(DESTROOT)$/program$/pydemo$/python-bridge.html : ..$/doc$/python-bridge.html
-#	-rm -f $@
-#	cat $? > $@
-#
-#
-# $(DESTROOT)$/program$/$(PYDIRNAME)$/lib$/%.so : $(SOLARLIBDIR)$/python$/%.so
-# 	-rm -f $@
-# 	cat $? > $@
-# 	strip $@
-#
-#$(DESTROOT)$/program$/$(PYDIRNAME)$/lib$/% : $(SOLARLIBDIR)$/python$/%
-#	-rm -f $@
-#	cat $? > $@
-#
-#
-#$(DESTROOT)$/program$/$(PYDIRNAME)$/bin$/python$(EXESUFFIX) : $(SOLARBINDIR)$/python$(EXESUFFIX)
-#	-rm -f $@
-#	cat $? > $@
-#.IF "$(GUI)" == "UNX"
-#	strip $@
-#	chmod +x $@
-#.ENDIF
-#
-#
-#
-#
-#
\ No newline at end of file
--- a/sal/osl/all/makefile.mk
+++ b/sal/osl/all/makefile.mk
@@ -57,20 +57,12 @@ SLOFILES=	\
            $(SLO)$/debugbase.obj\
            $(SLO)$/loadmodulerelative.obj

-#			$(SLO)$/readline.obj\
-
-#.IF "$(UPDATER)"=="YES"
 OBJFILES=	\
            $(OBJ)$/utility.obj\
            $(OBJ)$/filepath.obj\
            $(OBJ)$/debugbase.obj\
            $(OBJ)$/loadmodulerelative.obj

-#			$(OBJ)$/readline.obj\
-#.ENDIF
-
 # --- Targets ------------------------------------------------------

 .INCLUDE :  target.mk
-
-
--- a/sal/osl/unx/makefile.mk
+++ b/sal/osl/unx/makefile.mk
@@ -41,7 +41,6 @@ PROJECTPCHSOURCE=cont_pch

 TARGETTYPE=CUI

-
 # --- Settings -----------------------------------------------------

 .INCLUDE :  settings.mk
@@ -81,8 +80,6 @@ SLOFILES= \
            $(SLO)$/process_impl.obj\
            $(SLO)$/salinit.obj

-
-#.IF "$(UPDATER)"=="YES"
 OBJFILES=   $(OBJ)$/conditn.obj  \
            $(OBJ)$/diagnose.obj \
            $(OBJ)$/semaphor.obj \
@@ -112,7 +109,6 @@ OBJFILES=   $(OBJ)$/conditn.obj  \
            $(OBJ)$/process_impl.obj\
            $(OBJ)$/salinit.obj
            
-#.ENDIF

 .IF "$(OS)"=="MACOSX"
 SLOFILES += $(SLO)$/osxlocale.obj

--- a/sal/qa/osl/process/makefile.mk
+++ b/sal/qa/osl/process/makefile.mk
@@ -55,17 +55,12 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)

 SHL1IMPLIB= i$(SHL1TARGET)

-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
 DEF1NAME    =$(SHL1TARGET)

-# DEF1EXPORTFILE= export.exp
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map

 # END ------------------------------------------------------------------

-#.IF "$(GUI)" == "WNT"
-
 SHL2OBJS=$(SLO)$/osl_process.obj
 SHL2TARGET=osl_process
 SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
@@ -80,17 +75,8 @@ DEF2EXPORTFILE=export.exp
 OBJ3FILES=$(OBJ)$/osl_process_child.obj
 APP3TARGET=osl_process_child
 APP3OBJS=$(OBJ3FILES)
-
-# .IF "$(GUI)" == "UNX"
-# APP3STDLIBS=$(LB)$/libsal.so
-# .ENDIF
-# .IF "$(GUI)" == "WNT"
-# APP3STDLIBS=$(KERNEL32LIB) $(LB)$/isal.lib
-# .ENDIF
 APP3STDLIBS=$(SALLIB)

-#.ENDIF # "$(GUI)" == "WNT"
-
 #------------------------------- All object files -------------------------------
 # do this here, so we get right dependencies


--- a/sal/qa/rtl/bootstrap/makefile.mk
+++ b/sal/qa/rtl/bootstrap/makefile.mk
@@ -38,11 +38,9 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk

 .IF "$(GUI)"=="WNT"
-#BOOTSTRAPSCRIPT=bootstrap.bat
 BOOTSTRAPINI=testshl2.ini
 MY_SCRIPTCAT=cat
 .ELSE
-#BOOTSTRAPSCRIPT=bootstrap
 BOOTSTRAPINI=testshl2rc
 MY_SCRIPTCAT=tr -d "\015" <
 .ENDIF
@@ -61,27 +59,15 @@ SHL1TARGET= rtl_Bootstrap
 SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)

 SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def

 DEF1NAME    =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------

 OBJ2FILES=$(OBJ)$/bootstrap_process.obj
 APP2TARGET=bootstrap_process
 APP2OBJS=$(OBJ2FILES)
-
-# .IF "$(GUI)" == "UNX"
-# APP2STDLIBS=$(LB)$/libsal.so
-# .ENDIF
-# .IF "$(GUI)" == "WNT"
-# APP2STDLIBS=$(KERNEL32LIB) $(LB)$/isal.lib
-# .ENDIF
 APP2STDLIBS=$(SALLIB)
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)

 # --- Targets ------------------------------------------------------


--- a/sal/qa/rtl/process/makefile.mk
+++ b/sal/qa/rtl/process/makefile.mk
@@ -51,35 +51,19 @@ SHL1TARGET= rtl_Process
 SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)

 SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def

 DEF1NAME    =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------

 OBJ3FILES=$(OBJ)$/child_process.obj
 APP3TARGET=child_process
 APP3OBJS=$(OBJ3FILES)
-
-#.IF "$(GUI)" == "UNX"
-#APP3STDLIBS=$(LB)$/libsal.so
-#.ENDIF
-#.IF "$(GUI)" == "WNT"
-#APP3STDLIBS=$(KERNEL32LIB) $(LB)$/isal.lib
-#.ENDIF
 APP3STDLIBS=$(SALLIB)

 OBJ4FILES=$(OBJ)$/child_process_id.obj
 APP4TARGET=child_process_id
 APP4OBJS=$(OBJ4FILES)
-
-# .IF "$(GUI)" == "UNX"
-# APP4STDLIBS=$(LB)$/libsal.so
-# .ENDIF
-# .IF "$(GUI)" == "WNT"
-# APP4STDLIBS=$(KERNEL32LIB) $(LB)$/isal.lib
-# .ENDIF
 APP4STDLIBS=$(SALLIB)

 #------------------------------- All object files -------------------------------
@@ -90,4 +74,3 @@ SLOFILES=$(SHL1OBJS)

 .INCLUDE :  target.mk
 .INCLUDE : _cppunit.mk
-
--- a/sal/rtl/source/makefile.mk
+++ b/sal/rtl/source/makefile.mk
@@ -102,7 +102,6 @@ SLOFILES+=$(SLO)$/memory_fini.obj
 .ENDIF


-#.IF "$(UPDATER)"=="YES"
 OBJFILES=   \
            $(OBJ)$/memory.obj      \
            $(OBJ)$/cipher.obj      \

--- a/sal/systools/win32/onlineupdate/makefile.mk
+++ b/sal/systools/win32/onlineupdate/makefile.mk
@@ -66,9 +66,6 @@ DEF1DEPN=\

 SHL1OBJS=$(SLOFILES)

-#No default libraries
-#STDSHL=
-
 SHL1STDLIBS=\
        $(KERNEL32LIB)\
        $(LIBCMT)\

--- a/sal/systools/win32/uwinapi/makefile.mk
+++ b/sal/systools/win32/uwinapi/makefile.mk
@@ -121,7 +121,6 @@ DEF1DEPN=\
        $(DEF1EXPORTFILE)\
        makefile.mk

-#SHL1VERINFO=$(SHL1TARGET).rc
 SHL1OBJS=$(SLOFILES)

 #No default libraries

--- a/sal/test/unloading/makefile.mk
+++ b/sal/test/unloading/makefile.mk
@@ -30,7 +30,6 @@ PRJNAME=	sal
 TARGET=		unloading
 TARGET1=samplelib1
 TARGET2=samplelib2
-#LIBTARGET=NO
 TARGETTYPE=CUI
 COMP1TYPELIST=$(TARGET1)

@@ -65,10 +64,6 @@ INCPRE+=	$(OUT)$/inc$/light
 .ENDIF


-#SLOFILES=	\
-#		$(SLO)$/samplelib1.obj	\
-#		$(SLO)$/samplelib2.obj
-
 LIB1TARGET=$(SLB)$/$(TARGET1).lib
 LIB1OBJFILES= \
        $(SLO)$/samplelib1.obj
@@ -80,14 +75,12 @@ SHL1STDLIBS= \
        $(CPPUHELPERLIB)	\
        $(SALLIB)

-
-
 SHL1DEPN=
-#SHL1IMPLIB=	i$(TARGET1)
 SHL1LIBS=	$(SLB)$/$(TARGET1).lib
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1EXPORTFILE=	exports.dxp
 DEF1NAME=	$(SHL1TARGET)
+
 #-------------------------------------------------------

 LIB2TARGET=$(SLB)$/$(TARGET2).lib

--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -66,11 +66,6 @@ LIB1FILES=	\
    $(SLB)$/cpprtl.lib	\
    $(SLB)$/textenc.lib 

-#.IF "$(GUI)"=="UNX"
-#LIB1FILES+=$(SLB)$/systoolsunx.lib
-#.ENDIF # UNX
-
-
 LIB3TARGET=$(LB)$/a$(TARGET).lib
 LIB3ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
 LIB3FILES=	\
@@ -79,9 +74,6 @@ LIB3FILES=	\
    $(LB)$/cpprtl.lib	\
    $(LB)$/textenc.lib

-#.IF "$(GUI)"=="UNX"
-#LIB3FILES+=$(LB)$/systoolsunx.lib
-#.ENDIF # UNX

 .IF "$(GUI)" == "WNT" || "$(GUI)"=="OS2"
 SHL1TARGET= $(TARGET)

--- a/salhelper/test/Symbols/makefile.mk
+++ b/salhelper/test/Symbols/makefile.mk
@@ -72,8 +72,6 @@ DEF1NAME=	$(SHL1TARGET)
 DEFLIB1NAME=	$(TARGET1)
 DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt

-#DEF1EXPORTFILE=	exports.dxp
-
 # ------------------------------------------------------------------------------

 OBJFILES=	$(OBJ)$/loader.obj

--- a/salhelper/test/dynamicloader/makefile.mk
+++ b/salhelper/test/dynamicloader/makefile.mk
@@ -43,14 +43,11 @@ BOOTSTRAP_SERVICE=FALSE

 # --- Files ---

-
 #RTTI on
 .IF "$(OS)" == "WNT"
 CFLAGS+= -GR
 .ENDIF

-
-# UNOTYPES= com.sun.star.lang.XInitialization \
 #---------------------------------------------------------------------------
 # Build the test library which is loaded by the 
 # RealDynamicLoader
@@ -79,8 +76,6 @@ DEF1NAME=	$(SHL1TARGET)
 DEFLIB1NAME =$(TARGET1)
 DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt

-#DEF1EXPORTFILE=	exports.dxp
-
 # ------------------------------------------------------------------------------

 APP1NOSAL=TRUE
@@ -94,8 +89,6 @@ APP1STDLIBS= \
    $(CPPUHELPERLIB) \
    $(CPPULIB)

-#APP1LIBS=	$(LB)$/isalhelper.lib
-
 .IF "$(OS)" == "WNT"
 APP1STDLIBS+=   $(LB)$/isalhelper.lib
 .ELSE
@@ -114,4 +107,3 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
    @echo Making: $@
    @echo __CT>>$@

-
--- a/stoc/test/javavm/makefile.mk
+++ b/stoc/test/javavm/makefile.mk
@@ -35,14 +35,11 @@ NO_BSYMBOLIC=	TRUE

 UNOUCRDEP=	$(SOLARBINDIR)$/udkapi.rdb
 UNOUCRRDB=	$(SOLARBINDIR)$/udkapi.rdb
-#UNOUCROUT=	$(OUT)$/inc$/test
 UNOUCROUT=	$(OUT)$/inc$
-#INCPRE+=	$(OUT)$/inc$/test
 INCPRE+=	$(OUT)$/inc$

-
-
 # --- Settings -----------------------------------------------------
+
 .INCLUDE :  settings.mk

 # --- Application 6 - testjavavm ------------------------------------
@@ -65,7 +62,6 @@ APP6STDLIBS= \
        $(CPPUHELPERLIB) 	\
        $(SALHELPERLIB) 	\
        $(SALLIB)	
-#		$(UNOLIB)

 # --- Target ------------------------------------------------


--- a/stoc/test/makefile.mk
+++ b/stoc/test/makefile.mk
@@ -24,6 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+
 PRJ=..

 PRJNAME=stoc
@@ -38,7 +39,7 @@ TARGET7=testconv
 TARGET8=testproxyfac
 TARGET9=testsmgr2
 TARGETTYPE=CUI
-#LIBTARGET=NO
+
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE

@@ -59,7 +60,6 @@ SHL1STDLIBS= \
 SHL1TARGET=testsmgr_component
 SHL1DEPN=
 SHL1IMPLIB=i$(SHL1TARGET)
-#SHL1LIBS=$(SLB)$/$(SHL1TARGET).lib
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 SHL1VERSIONMAP=testsmgr_cpnt.map