Clean up makefiles

6 files changed, 1 insertions, 82 deletions

diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
index abe8ef71a9c5..9ef291f8094e 100644
--- a/extensions/source/nsplugin/source/makefile.mk
+++ b/extensions/source/nsplugin/source/makefile.mk
@@ -72,9 +72,6 @@ SHL1OBJS=	$(SLO)$/npshell.obj \
 .IF "$(GUI)"=="UNX"
 STDLIBS+=$(SOLARLIBDIR)$/npunix.o
 SHL1STDLIBS+=$(SOLARLIBDIR)$/npunix.o
-#.IF "$(OS)"!="FREEBSD"
-#SHL1STDLIBS+= -ldl -lnsl
-#.ENDIF #FREEBSD
 .ENDIF #UNX
 .IF "$(GUI)"=="WNT"
 SHL1OBJS+=$(SOLARLIBDIR)$/pathutils-slo.obj
diff --git a/extensions/source/plugin/aqua/makefile.mk b/extensions/source/plugin/aqua/makefile.mk
index c0d3a2eed949..8d1aaa484d28 100644
--- a/extensions/source/plugin/aqua/makefile.mk
+++ b/extensions/source/plugin/aqua/makefile.mk
@@ -28,8 +28,6 @@ PRJ=..$/..$/..
 
 PRJNAME=extensions
 TARGET=plaqua
-#ENABLE_EXCEPTIONS=TRUE
-#TARGETTYPE=CUI
 
 .INCLUDE :  ..$/util$/makefile.pmk
 
@@ -58,15 +56,6 @@ SLOFILES=\
     $(SLO)$/macmgr.obj      \
     $(SLO)$/sysplug.obj
 
-#APP1TARGET=pluginapp.bin
-#APP1OBJS=$(OBJFILES)
-#APP1STDLIBS=\
-#	$(TOOLSLIB) 				\
-#	$(SALLIB)
-
-#APP1DEF=	$(MISC)$/$(TARGET).def
-
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
diff --git a/extensions/source/plugin/win/makefile.mk b/extensions/source/plugin/win/makefile.mk
index 3167c22d135d..7f676ac16748 100644
--- a/extensions/source/plugin/win/makefile.mk
+++ b/extensions/source/plugin/win/makefile.mk
@@ -46,20 +46,13 @@ CDEFS+=-DOJI
 # --- Types -------------------------------------
 
 .IF "$(WITH_MOZILLA)" != "NO"
-
-#UNOUCROUT=$(OUT)$/inc$/$(PRJNAME)
-#INCPRE+=$(UNOUCROUT)
-
-# --- Types -------------------------------------
-
 SLOFILES =	$(SLO)$/winmgr.obj	\
             $(SLO)$/sysplug.obj
-
 .ENDIF # $(WITH_MOZILLA) != "NO"
+
 .ENDIF
 
 # ------------------------------------------------------------------
 
-
 .INCLUDE :  target.mk
 
diff --git a/extensions/source/update/tools/makefile.mk b/extensions/source/update/tools/makefile.mk
index d6baac98680a..110887bb102f 100644
--- a/extensions/source/update/tools/makefile.mk
+++ b/extensions/source/update/tools/makefile.mk
@@ -41,28 +41,4 @@ APP1TARGET = ztool
 APP1OBJS = $(OBJ)$/ztool.obj
 APP1STDLIBS = $(TOOLSLIB)
 
-#APP1TARGET = ztool
-#APP1OBJS = $(OBJ)$/ztool.obj
-#.IF "$(GUI)" == "UNX"
-#APP1STDLIBS = $(TOOLSLIB)
-#.ELSE
-#APP1LIBS = $(LB)$/itools.lib
-#.ENDIF
-
-#APP2TARGET = urltest
-#APP2OBJS = $(OBJ)$/urltest.obj
-#.IF "$(GUI)" == "UNX"
-#APP2STDLIBS = $(TOOLSLIB)  $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
-#.ELSE
-#APP2STDLIBS = $(LB)$/itools.lib isal.lib icppu.lib icppuhelper.lib
-#.ENDIF
-
-# APP3TARGET = tldem
-# APP3OBJS = $(OBJ)$/tldem.obj
-# .IF "$(GUI)" == "UNX"
-# APP3STDLIBS = $(TOOLSLIB)
-# .ELSE
-# APP3STDLIBS = $(LB)$/itools.lib
-# .ENDIF
-
 .INCLUDE: target.mk
diff --git a/extensions/test/ole/cpnt/makefile.mk b/extensions/test/ole/cpnt/makefile.mk
index 53d3cc321c49..dc1835e956d4 100644
--- a/extensions/test/ole/cpnt/makefile.mk
+++ b/extensions/test/ole/cpnt/makefile.mk
@@ -35,20 +35,6 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 # --- Files --------------------------------------------------------
-#UNOUCRDEP=    $(SOLARBINDIR)$/types.rdb $(BIN)$/oletest.rdb
-#UNOUCRRDB=    $(SOLARBINDIR)$/types.rdb $(BIN)$/oletest.rdb
-
-#UNOUCROUT=    $(OUT)$/inc
-
-#UNOTYPES= oletest.XTestSequence \
-#    oletest.XTestStruct     \
-#    oletest.XTestOther      \
-#    oletest.XTestInterfaces \
-#    oletest.XSimple         \
-#    oletest.XSimple2        \
-#    oletest.XSimple3        \
-#    oletest.XTestInParameters       \
-#    oletest.XIdentity       
 
 INCPRE+= -I$(ATL_INCLUDE)
 
@@ -62,10 +48,6 @@ SHL1STDLIBS= \
         $(CPPULIB) 	\
         $(CPPUHELPERLIB)
 
-#.IF "$(COMEX)"=="8" || "$(COMEX)"=="10"
-#	SHL1STDLIBS+= $(COMPATH)$/atlmfc$/lib$/atls.lib
-#.ENDIF
-
 .IF "$(COMEX)"=="8" || "$(COMEX)"=="10"
 .IF "$(USE_STLP_DEBUG)" != ""
     SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
diff --git a/extensions/workben/makefile.mk b/extensions/workben/makefile.mk
index ca25cfa51312..d62100ac26c5 100644
--- a/extensions/workben/makefile.mk
+++ b/extensions/workben/makefile.mk
@@ -32,11 +32,6 @@ TARGET=workben
 LIBTARGET=NO
 
 TESTAPP=testpgp
-#TESTAPP=testcomponent
-#TESTAPP=pythontest
-#TESTAPP=pythonautotest
-#TESTAPP=testresource
-#TESTAPP=testframecontrol
 
 .IF "$(TESTAPP)" == "testresource" || "$(TESTAPP)" == "testframecontrol"
 TARGETTYPE=GUI
@@ -106,27 +101,14 @@ APP2STDLIBS = \
 # test python.
 #
 .IF "$(TESTAPP)" == "phytontest"
-
 OBJFILES=	$(OBJ)$/pythontest.obj
-
-#APP4TARGET=	pythontest
-#APP4OBJS=	$(OBJ)$/pythontest.obj 
-#APP4STDLIBS=$(TOOLSLIB)
-#
-
 .ENDIF # phytontest
 
 #
 # python auto test
 #
 .IF "$(TESTAPP)" == "phytonautotest"
-
 OBJFILES=	$(OBJ)$/pythonautotest.obj
-
-#APP5TARGET= pythonautotest
-#APP5OBJS = $(OBJ)$/pythonautotest.obj
-#APP5STDLIBS=$(TOOLSLIB)
-
 .ENDIF # phytonautotest
 
 #