Clean up makefiles

UnoControls/source/base/makefile.mk

@@ -29,40 +29,18 @@ PRJ=..$/..
 PRJNAME=UnoControls
 TARGET=base
 ENABLE_EXCEPTIONS=TRUE
-#LIBTARGET=NO
-#USE_LDUMP2=TRUE
-#USE_DEFFILE=TRUE
 
 # --- Settings -----------------------------------------------------
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
 
+.INCLUDE :	$(PRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
+
 SLOFILES=		$(SLO)$/multiplexer.obj				\
                 $(SLO)$/basecontrol.obj				\
                 $(SLO)$/basecontainercontrol.obj	\
                 $(SLO)$/registercontrols.obj
 
-#LIB1TARGET= 	$(SLB)$/$(TARGET).lib
-#LIB1OBJFILES=	$(SLOFILES)
-
-#SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-#SHL1STDLIBS=\
-#		$(ONELIB)	 \
-#		$(USRLIB)	 \
-#		$(UNOLIB)	 \
-#		$(OSLLIB) 	 \
-#		$(TOOLSLIB) 	 \
-#		$(RTLLIB)
-
-#SHL1DEPN=		makefile.mk
-#SHL1LIBS=		$(LIB1TARGET)
-#SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-#DEF1NAME=		$(SHL1TARGET)
-#DEF1EXPORTFILE=	exports.dxp
-
 # --- Targets ------------------------------------------------------
+
 .INCLUDE :	target.mk
-#.INCLUDE :	$(PRJ)$/util$/target.pmk

bean/native/win32/makefile.mk

@@ -21,7 +21,6 @@ SLOFILES = \
 
 SHL1TARGET=$(TARGET)
 SHL1LIBS=	$(SLB)$/$(TARGET).lib
-#SHL1IMPLIB=	i$(TARGET)
 SHL1STDLIBS=$(AWTLIB) $(SALLIB)
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def

crashrep/source/win32/makefile.mk

@@ -61,8 +61,6 @@ APP1NOSAL=TRUE
 APP1TARGET=$(TARGET)
 APP1RPATH=BRAND
 
-#SHL1STDLIBS=$(SALLIB)
-
 STDLIB1=\
     $(SALLIB)\
     $(GDI32LIB)\

embedserv/source/embed/makefile.mk

@@ -25,8 +25,6 @@
 #
 #*************************************************************************
 
-#MKDEPENDSOLVER=YES
-
 PRJ=..$/..
 
 PRJNAME=embedserv
@@ -36,7 +34,6 @@ TARGET=emser
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 .IF "$(DISABLE_ATL)"==""
 
@@ -75,6 +72,7 @@ EXCEPTIONSFILES= \
         $(SLO)$/tracker.obj
 
 .ENDIF
+
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk

extensions/test/pgp/makefile.mk

@@ -25,23 +25,18 @@
 #
 #*************************************************************************
 
-
-
 PRJ=..$/..
 
 PRJNAME := extensions
-#PACKAGE := com$/sun$/star$/pgp
 PACKAGE := 
 TARGET  := test_com_sun_star_pgp
 
-
 # --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
 
+.INCLUDE :  settings.mk
 
 # Files --------------------------------------------------------
 
-
 APPLICATRDB := $(SOLARBINDIR)$/applicat.rdb
 RDB := $(APPLICATRDB)
 
@@ -52,51 +47,6 @@ GENJAVACLASSFILES= \
     $(CLASSDIR)$/com$/sun$/star$/beans$/PropertyState.class				\
     $(CLASSDIR)$/com$/sun$/star$/container$/XSet.class				\
 
-
-#$(CLASSDIR)$/com$/sun$/star$/awt$/FocusEvent.class
-
-#	$(CLASSDIR)$/com$/sun$/star$/awt$/InputEvent.class					\
-#	$(CLASSDIR)$/com$/sun$/star$/awt$/KeyEvent.class					\
-#	$(CLASSDIR)$/com$/sun$/star$/awt$/MouseEvent.class					\
-#	$(CLASSDIR)$/com$/sun$/star$/awt$/WindowEvent.class					\
-#	$(CLASSDIR)$/com$/sun$/star$/awt$/PaintEvent.class					\
-#	$(CLASSDIR)$/com$/sun$/star$/awt$/Rectangle.class					\
-#	$(CLASSDIR)$/com$/sun$/star$/awt$/XFocusListener.class				\
-#	$(CLASSDIR)$/com$/sun$/star$/awt$/XKeyListener.class				\
-#	$(CLASSDIR)$/com$/sun$/star$/awt$/XMouseListener.class				\
-#	$(CLASSDIR)$/com$/sun$/star$/awt$/XMouseMotionListener.class		\
-#	$(CLASSDIR)$/com$/sun$/star$/awt$/XWindow.class						\
-#	$(CLASSDIR)$/com$/sun$/star$/awt$/XWindowListener.class				\
-#	$(CLASSDIR)$/com$/sun$/star$/awt$/XPaintListener.class				\
-#	$(CLASSDIR)$/com$/sun$/star$/bridge$/XBridge.class					\
-#	$(CLASSDIR)$/com$/sun$/star$/container$/XIndexAccess.class			\
-#	$(CLASSDIR)$/com$/sun$/star$/frame$/FrameAction.class				\
-#	$(CLASSDIR)$/com$/sun$/star$/frame$/FrameActionEvent.class			\
-#	$(CLASSDIR)$/com$/sun$/star$/frame$/XComponentLoader.class			\
-#	$(CLASSDIR)$/com$/sun$/star$/frame$/XController.class				\
-#	$(CLASSDIR)$/com$/sun$/star$/frame$/XFrame.class					\
-#	$(CLASSDIR)$/com$/sun$/star$/frame$/XFrameActionListener.class		\
-#	$(CLASSDIR)$/com$/sun$/star$/frame$/XFrames.class					\
-#	$(CLASSDIR)$/com$/sun$/star$/frame$/XFramesSupplier.class			\
-#	$(CLASSDIR)$/com$/sun$/star$/frame$/XModel.class					\
-#	$(CLASSDIR)$/com$/sun$/star$/io$/BufferSizeExceededException.class	\
-#	$(CLASSDIR)$/com$/sun$/star$/io$/NotConnectedException.class		\
-#	$(CLASSDIR)$/com$/sun$/star$/io$/XInputStream.class					\
-#	$(CLASSDIR)$/com$/sun$/star$/io$/XOutputStream.class				\
-#	$(CLASSDIR)$/com$/sun$/star$/lang$/IndexOutOfBoundsException.class	\
-#	$(CLASSDIR)$/com$/sun$/star$/lang$/XComponent.class					\
-#	$(CLASSDIR)$/com$/sun$/star$/lang$/XMultiServiceFactory.class		\
-#	$(CLASSDIR)$/com$/sun$/star$/lang$/XServiceInfo.class				\
-#	$(CLASSDIR)$/com$/sun$/star$/text$/XSimpleText.class				\
-#	$(CLASSDIR)$/com$/sun$/star$/text$/XText.class						\
-#	$(CLASSDIR)$/com$/sun$/star$/text$/XTextContent.class				\
-#	$(CLASSDIR)$/com$/sun$/star$/text$/XTextCursor.class				\
-#	$(CLASSDIR)$/com$/sun$/star$/text$/XTextDocument.class				\
-#	$(CLASSDIR)$/com$/sun$/star$/text$/XTextRange.class					\
-#	$(CLASSDIR)$/com$/sun$/star$/uno$/XNamingService.class		\
-#	$(CLASSDIR)$/com$/sun$/star$/uno$/Enum.class
-
-
 JAVACLASSFILES= \
     $(CLASSDIR)$/$(PACKAGE)$/TestPGP.class
 
@@ -105,10 +55,8 @@ TYPES={$(subst,.class, $(subst,$/,.  $(subst,$(CLASSDIR)$/,-T  $(GENJAVACLASSFIL
 GENJAVAFILES = {$(subst,.class,.java $(subst,$/class, $(GENJAVACLASSFILES)))}
 JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) $(GENJAVAFILES) 
 
-
 # --- Targets ------------------------------------------------------
 
-
 .IF "$(depend)" == ""
 ALL : $(GENJAVAFILES) ALLTAR 
 .ELSE
@@ -118,7 +66,6 @@ ALL: ALLDEP
 .INCLUDE :  target.mk
 
 $(GENJAVAFILES) : $(RDB)
-#	javamaker -BUCR -O$(OUT) $(TYPES) $(RDB)
     javamaker @$(mktmp -BUCR -O$(OUT) $(TYPES) $(RDB))
 
 $(JAVACLASSFILES) : $(GENJAVAFILES)

forms/qa/makefile.mk

@@ -43,7 +43,6 @@ JAVACLASSFILES	:= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(i:d)$/$(i:b).class)
 
 MAXLINELENGTH = 100000
 
-#JARCLASSDIRS    =
 JARTARGET       = $(TARGET).jar
 JARCOMPRESS 	= TRUE
 

forms/source/misc/makefile.mk

@@ -31,7 +31,6 @@ PRJNAME=forms
 TARGET=common
 
 ENABLE_EXCEPTIONS=TRUE
-#TARGETTYPE=GUI
 
 # --- Settings ----------------------------------
 

package/source/zipapi/makefile.mk

@@ -37,7 +37,6 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 .IF "$(L10N_framework)"==""
-#CFLAGS+=/Ob0 /Od
 .IF "$(SYSTEM_ZLIB)" == "YES"
 CFLAGS+=-DSYSTEM_ZLIB
 .ENDIF

package/source/zippackage/makefile.mk

@@ -36,11 +36,9 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE : settings.mk
 
-.IF "$(L10N_framework)"==""
-
 # --- Files --------------------------------------------------------
-# the following flag un-inlines function calls and disables optimisations
-#CFLAGS+=/Ob0 /Od
+
+.IF "$(L10N_framework)"==""
 
 SLOFILES= \
         $(SLO)$/ZipPackage.obj			\
@@ -53,9 +51,6 @@ SLOFILES= \
         $(SLO)$/wrapstreamforshare.obj	\
         $(SLO)$/zipfileaccess.obj
 
-#		$(SLO)$/InteractionRequest.obj  \
-#		$(SLO)$/InteractionContinuation.obj
-
 .ENDIF # L10N_framework
 
 # --- Targets ------------------------------------------------------

setup_native/source/win32/customactions/regpatchactivex/makefile.mk

@@ -34,19 +34,16 @@ USE_DEFFILE=TRUE
 
 # --- Settings -----------------------------------------------------
 
-# NO_DEFAULT_STL=TRUE
 ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE : settings.mk
 
 STDSHL=
-# SOLARINC!:=$(SOLARINC:s/stl//)
 
 # --- Files --------------------------------------------------------
 
 INCPRE+=.\Include
 .DIRCACHE=NO
-# CFLAGS+=-E
 
 SLOFILES =	$(SLO)$/regpatchactivex.obj
 
@@ -72,7 +69,6 @@ SHL1STDLIBS+=	libcmt.lib
 
 SHL1LIBS = $(SLB)$/$(TARGET).lib 
 
-#SHL1TARGET = $(TARGET)$(DLLPOSTFIX)
 SHL1TARGET = $(TARGET)
 SHL1IMPLIB = i$(TARGET)
 

setup_native/source/win32/customactions/tools/makefile.mk

@@ -62,8 +62,6 @@ STDSHL+=	\
 STDSHL+=$(LIBSTLPORTST)								
 .ENDIF
 
-#SHL1LIBS = $(SLB)$/$(TARGET).lib 
-
 SHL1TARGET = $(TARGET)
 SHL1IMPLIB = i$(TARGET)
 

setup_native/source/win32/stwrapper/makefile.mk

@@ -6,7 +6,6 @@ LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 TARGETTYPE=GUI
 USE_DEFFILE=TRUE
-#DYNAMIC_CRT:=
 NO_DEFAULT_STL=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -46,5 +45,3 @@ DLLPRE =
 .INCLUDE :	target.mk
 
 $(OBJ)$/stwrapper.obj: $(INCCOM)$/_version.h
-
-#$(RCFILES) : resource.rc

wizards/com/sun/star/wizards/agenda/makefile.mk

@@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/agenda
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar \
     jurt.jar \

wizards/com/sun/star/wizards/fax/makefile.mk

@@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/fax
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar
 

wizards/com/sun/star/wizards/form/makefile.mk

@@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/form
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar
 CUSTOMMANIFESTFILE= MANIFEST.MF
@@ -43,10 +42,6 @@ JARTARGET		= $(TARGET).jar
 JARCLASSPATH = commonwizards.jar
 
 # --- Files --------------------------------------------------------
-#SRS2NAME =              dbwizres
-#SRC2FILES=		dbwizres.src
-#RESLIB2SRSFILES= $(SRS)$/dbwizres.srs
-#RESLIB2NAME=	dbw
 
 JAVAFILES=	\
         CallFormWizard.java 	\

wizards/com/sun/star/wizards/letter/makefile.mk

@@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/letter
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar
 

wizards/com/sun/star/wizards/makefile.mk

@@ -32,7 +32,6 @@ PACKAGE = com$/sun$/star$/wizards
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge 
 
@@ -141,9 +140,6 @@ JAVAFILES=							\
     text$/TextTableHandler.java				\
     text$/ViewHandler.java
 
-
-#JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java/.class/))
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk

wizards/com/sun/star/wizards/query/makefile.mk

@@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/query
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar commonwizards.jar
 CUSTOMMANIFESTFILE= MANIFEST.MF
@@ -43,10 +42,6 @@ JARTARGET		= $(TARGET).jar
 JARCLASSPATH = commonwizards.jar
 
 # --- Files --------------------------------------------------------
-#SRS2NAME =              dbwizres
-#SRC2FILES=		dbwizres.src
-#RESLIB2SRSFILES= $(SRS)$/dbwizres.srs
-#RESLIB2NAME=	dbw
 
 JAVAFILES=	\
         CallQueryWizard.java \

wizards/com/sun/star/wizards/report/makefile.mk

@@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/report
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar
 

wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk

@@ -33,19 +33,13 @@ PACKAGE = com$/sun$/star$/wizards$/reportbuilder$/layout
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar report.jar
 
-# CUSTOMMANIFESTFILE= MANIFEST.MF
-
 JARCLASSDIRS	= \
     com$/sun$/star$/wizards$/reportbuilder$/layout \
     com$/sun$/star$/wizards$/report
 
-# JARTARGET	= $(TARGET).jar
-# JARCLASSPATH = commonwizards.jar report.jar
-
 # --- Files --------------------------------------------------------
 
 JAVAFILES=                     \

wizards/com/sun/star/wizards/reportbuilder/makefile.mk

@@ -33,12 +33,9 @@ PACKAGE = com$/sun$/star$/wizards$/reportbuilder
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar report.jar
 
-# CUSTOMMANIFESTFILE= Manifest.mf
-
 JARCLASSDIRS	= com$/sun$/star$/wizards$/reportbuilder
 JARTARGET	= $(TARGET).jar
 JARCLASSPATH = commonwizards.jar report.jar

wizards/com/sun/star/wizards/table/makefile.mk

@@ -32,7 +32,6 @@ PACKAGE = com$/sun$/star$/wizards$/table
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar
 CUSTOMMANIFESTFILE= MANIFEST.MF
@@ -42,10 +41,6 @@ JARTARGET		= $(TARGET).jar
 JARCLASSPATH = commonwizards.jar
 
 # --- Files --------------------------------------------------------
-#SRS2NAME =              dbwizres
-#SRC2FILES=		dbwizres.src
-#RESLIB2SRSFILES= $(SRS)$/dbwizres.srs
-#RESLIB2NAME=	dbw
 
 JAVAFILES=	\
         CallTableWizard.java 	\

wizards/com/sun/star/wizards/web/data/makefile.mk

@@ -34,7 +34,6 @@ PACKAGE = com$/sun$/star$/wizards$/web$/data
 
 .INCLUDE : settings.mk
 
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar 
 
 .IF "$(SYSTEM_SAXON)" == "YES"
@@ -43,9 +42,6 @@ EXTRAJARFILES = $(SAXON_JAR)
 JARFILES += saxon9.jar
 .ENDIF
 
-#JARCLASSDIRS	= com$/sun$/star$/wizards$/web
-#JARTARGET		= $(TARGET).jar
-
 # --- Files --------------------------------------------------------
 
 JAVAFILES=			\

wizards/com/sun/star/wizards/web/export/makefile.mk

@@ -34,7 +34,6 @@ PACKAGE = com$/sun$/star$/wizards$/web$/export
 
 .INCLUDE : settings.mk
 
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar 
 
 .IF "$(SYSTEM_SAXON)" == "YES"
@@ -43,9 +42,6 @@ EXTRAJARFILES = $(SAXON_JAR)
 JARFILES += saxon9.jar
 .ENDIF
 
-#JARCLASSDIRS	= com$/sun$/star$/wizards$/web
-#JARTARGET		= $(TARGET).jar
-
 # --- Files --------------------------------------------------------
 
 JAVAFILES=			\

wizards/com/sun/star/wizards/web/makefile.mk

@@ -33,7 +33,7 @@ PACKAGE = com$/sun$/star$/wizards$/web
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar 
 
 .IF "$(SYSTEM_SAXON)" == "YES"

xmlsecurity/util/makefile.mk

@@ -30,8 +30,6 @@ PRJ=..
 PRJNAME=xmlsecurity
 TARGET=xmlsecurity
 
-# Disable '-z defs' due to broken libxpcom.
-#LINKFLAGSDEFS=$(0)
 USE_DEFFILE=TRUE
 
 # --- Settings -----------------------------------------------------

xmlsecurity/util/target.pmk

@@ -26,7 +26,6 @@
 #*************************************************************************
 .IF "$(GUI)" == "WNT"
 CRYPTO_ENGINE = mscrypto
-#CRYPTO_ENGINE = nss
 .ELSE
 CRYPTO_ENGINE = nss
 .ENDIF