Clean up makefiles

13 files changed, 1 insertions, 41 deletions

diff --git a/wizards/com/sun/star/wizards/agenda/makefile.mk b/wizards/com/sun/star/wizards/agenda/makefile.mk
index 314dcf3b7da9..10c89c88aef6 100644
--- a/wizards/com/sun/star/wizards/agenda/makefile.mk
+++ b/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 \
diff --git a/wizards/com/sun/star/wizards/fax/makefile.mk b/wizards/com/sun/star/wizards/fax/makefile.mk
index 247aaf063529..0fef6de23674 100644
--- a/wizards/com/sun/star/wizards/fax/makefile.mk
+++ b/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
 
diff --git a/wizards/com/sun/star/wizards/form/makefile.mk b/wizards/com/sun/star/wizards/form/makefile.mk
index 092135289fc9..0a229c96ce5e 100644
--- a/wizards/com/sun/star/wizards/form/makefile.mk
+++ b/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 	\
diff --git a/wizards/com/sun/star/wizards/letter/makefile.mk b/wizards/com/sun/star/wizards/letter/makefile.mk
index 700d0b72dfb7..45af4a1de37f 100644
--- a/wizards/com/sun/star/wizards/letter/makefile.mk
+++ b/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
 
diff --git a/wizards/com/sun/star/wizards/makefile.mk b/wizards/com/sun/star/wizards/makefile.mk
index fb9c3e18558d..8f3b45538c21 100644
--- a/wizards/com/sun/star/wizards/makefile.mk
+++ b/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
diff --git a/wizards/com/sun/star/wizards/query/makefile.mk b/wizards/com/sun/star/wizards/query/makefile.mk
index af5056ba5221..b80e19e3a781 100644
--- a/wizards/com/sun/star/wizards/query/makefile.mk
+++ b/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 \
diff --git a/wizards/com/sun/star/wizards/report/makefile.mk b/wizards/com/sun/star/wizards/report/makefile.mk
index b31639d21a46..0507e10a30d1 100644
--- a/wizards/com/sun/star/wizards/report/makefile.mk
+++ b/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
 
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk b/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk
index 1af9e7c53862..3781f4246acd 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk
+++ b/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=                     \
diff --git a/wizards/com/sun/star/wizards/reportbuilder/makefile.mk b/wizards/com/sun/star/wizards/reportbuilder/makefile.mk
index d9a1a7447fe8..41e4d3cd9c79 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/makefile.mk
+++ b/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
diff --git a/wizards/com/sun/star/wizards/table/makefile.mk b/wizards/com/sun/star/wizards/table/makefile.mk
index c0d62baa7cac..90bb7167c0f4 100644
--- a/wizards/com/sun/star/wizards/table/makefile.mk
+++ b/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 	\
diff --git a/wizards/com/sun/star/wizards/web/data/makefile.mk b/wizards/com/sun/star/wizards/web/data/makefile.mk
index 1bfc02cf8351..17a78f063246 100644
--- a/wizards/com/sun/star/wizards/web/data/makefile.mk
+++ b/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=			\
diff --git a/wizards/com/sun/star/wizards/web/export/makefile.mk b/wizards/com/sun/star/wizards/web/export/makefile.mk
index 46cd65044e81..c898fdfce964 100644
--- a/wizards/com/sun/star/wizards/web/export/makefile.mk
+++ b/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=			\
diff --git a/wizards/com/sun/star/wizards/web/makefile.mk b/wizards/com/sun/star/wizards/web/makefile.mk
index 9cc97e1b88ab..3601b2eb622c 100644
--- a/wizards/com/sun/star/wizards/web/makefile.mk
+++ b/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"