Clean up makefiles

berkeleydb/makefile.mk

@@ -86,10 +86,6 @@ LDFLAGSVERSION:= -Wl,--version-script=../db_4_7_gcc4.map
 .EXPORT: LDFLAGSVERSION
 .ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
 .IF "$(OS)$(COM)"=="SOLARISC52"
-#.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
-#CC:=$(COMPATH)$/bin$/cc
-#CXX:=$(COMPATH)$/bin$/CC
-#.ENDIF          # "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
 LDFLAGS:=$(ARCH_FLAGS) -R\''$$$$ORIGIN'\'
 .EXPORT: LDFLAGS
 .ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
@@ -167,9 +163,6 @@ BUILD_DIR=
 BUILD_ACTION=dmake
 
 BUILD_DIR_OUT=build_windows
-#OUT2LIB= \
-#	$(BUILD_DIR_OUT)$/Release$/libdb42.lib
-#OUT2BIN=$(BUILD_DIR_OUT)$/Release$/libdb42.dll
 OUT2INC= \
     $(BUILD_DIR_OUT)$/db.h
 .ENDIF

graphite/makefile.mk

@@ -60,12 +60,6 @@ CONVERTFILES=\
     engine/makefile.vc8 \
     engine/test/RegressionTest/RtTextSrc.h
 
-#.IF "$(OS)"=="WNT" && "$(COM)"!="GCC"
-#CONFIGURE_DIR=win32
-#.ELSE
-#CONFIGURE_DIR=engine
-#.ENDIF
-
 CONFIGURE_DIR=engine
 
 .IF "$(COM)"=="MSC"
@@ -128,7 +122,6 @@ CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEF
 BUILD_DIR=$(CONFIGURE_DIR)
 
 .IF "$(OS)"=="WNT" && "$(COM)"!="GCC"
-#OUT2LIB=win32$/bin.msvc$/*.lib
 .IF "$(debug)"!=""
 OUT2LIB=engine$/debug$/*.lib
 .ELSE
@@ -146,18 +139,11 @@ BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 OUT2LIB+=src$/.libs$/libgraphite.*.dylib
 .ELSE
 .IF "$(OS)"=="WNT" && "$(COM)"!="GCC"
-#OUT2LIB+=engine$/src$/.libs$/libgraphite*.dll
 .IF "$(debug)"!=""
-OUT2BIN= \
-#    engine$/debug$/*.dll \
-    engine$/debug$/*.pdb
+OUT2BIN=engine$/debug$/*.pdb
 .ELSE
 OUT2BIN=
-#    engine$/release$/*.dll
-#    engine$/release$/*.pdb
 .ENDIF
-.ELSE
-#OUT2LIB+=engine$/src$/.libs$/libgraphite.so.*.*.*
 .ENDIF
 .ENDIF
 
@@ -172,8 +158,8 @@ OUT2INC=wrappers$/win32$/WinFont.h
 dddd:
     @echo Nothing to do
 .ENDIF
-# --- Targets ------------------------------------------------------
 
+# --- Targets ------------------------------------------------------
 
 .INCLUDE :	set_ext.mk
 .INCLUDE :	target.mk

icu/makefile.mk

@@ -50,15 +50,7 @@ PATCH_FILES=\
     ${TARFILE_NAME}.patch \
     icu4c-aix.patch
 
-# ADDITIONAL_FILES=
-
 .IF "$(GUI)"=="UNX"
-.IF "$(COMNAME)"=="sunpro5"
-#.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
-#CC:=$(COMPATH)$/bin$/cc
-#CXX:=$(COMPATH)$/bin$/CC
-#.ENDIF          # "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
-.ENDIF          # "$(COMNAME)"=="sunpro5"
 
 .IF "$(SYSBASE)"!=""
 icu_CFLAGS+=-I$(SYSBASE)$/usr$/include
@@ -114,7 +106,6 @@ CONFIGURE_DIR=source
 
 CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
 
-#CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no
 CONFIGURE_FLAGS=
 
 # Use of
@@ -168,7 +159,6 @@ icu_LIBS+=-lstdc++_s
 icu_LDFLAGS+=-Wl,--enable-runtime-pseudo-reloc-v2
 CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
 
-#CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no
 CONFIGURE_FLAGS=
 
 # Use of

moz/makefile.mk

@@ -35,6 +35,7 @@ TARGET=ooo_mozab
 .INCLUDE :	settings.mk
 
 # --- Files --------------------------------------------------------
+
 # ----- pkg-config start -------
 .INCLUDE .IGNORE : pkgroot.mk
 .IF "$(PKGCONFIG_ROOT)"!=""
@@ -144,10 +145,6 @@ MOZILLA_CONFIGURE_FLAGS +=  --disable-tests \
                 --disable-pango \
                 --enable-extensions="pref"
 
-#.IF "$(GUI)"!="WNT"
-#MOZILLA_CONFIGURE_FLAGS += --enable-system-cairo
-#.ENDIF
-
 #disable profilelocking to share profile with mozilla
 #disable activex and activex-scripting to remove the dependence of Microsoft_SDK\src\mfc\atlbase.h
 #disable gnomevfs to remove the needed of gnome develop files

python/makefile.mk

@@ -41,10 +41,8 @@ all:
     @echo "Therefore the version provided here does not need to be built in addition."
 .ENDIF
 
-
 # --- Files --------------------------------------------------------
 
-
 TARFILE_NAME=Python-$(PYVERSION)
 TARFILE_MD5=e81c2f0953aa60f8062c05a4673f2be0
 PATCH_FILES=\
@@ -106,19 +104,6 @@ python_LDFLAGS+=-shared-libgcc -Wl,--enable-runtime-pseudo-reloc-v2
 CONFIGURE_ACTION=./configure --prefix=$(MYCWD)/python-inst --enable-shared CC="$(CC:s/guw.exe //)" CXX="$(CXX:s/guw.exe //)" MACHDEP=MINGW32 LN="cp -p" CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)"
 BUILD_ACTION=$(ENV_BUILD) make && make install
 .ELSE
-#PYTHONPATH:=..$/Lib
-#.EXPORT : PYTHONPATH
-
-#.IF "$(CCNUMVER)" <= "001400000000"
-#EXFLAGS="/GX /YX"
-#.ELSE
-#.IF "$(WINDOWS_VISTA_PSDK)"!=""
-#EXFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE""
-#ADDITIONALLIBS=ws2_32.lib
-#.ELSE  #"$(WINDOWS_VISTA_PSDK)"!=""
-#EXFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE""
-#.ENDIF #"$(WINDOWS_VISTA_PSDK)"!=""
-#.ENDIF
 
 .IF "$(CCNUMVER)" >= "001600000000"
 PATCH_FILES+=Python-$(PYVERSION)-vc10.patch