Hello noel,
I'd like you to do a code review. Please execute
g4 diff -c 10831187
or point your web browser to
http://mondrian/10831187
to review the following code:
Change 10831187 by nigel...@nigeltao-srcgears5 on 2009/04/16 15:38:30 *pending*
Remove the beta.image and beta.imageloader modules, since they have
not been launched, and are superseded by the beta.canvas module.
Deleting third_party/libgd from the Gears tree will be a separate CL.
PRESUBMIT=passed
R=noel
[email protected]
DELTA=1012 (0 added, 993 deleted, 19 changed)
OCL=10831187
Affected files ...
... //depot/googleclient/gears/opensource/gears/Makefile#243 edit
... //depot/googleclient/gears/opensource/gears/factory/factory_impl.cc#30 edit
... //depot/googleclient/gears/opensource/gears/factory/factory_utils.cc#8 edit
... //depot/googleclient/gears/opensource/gears/image/backing_image.cc#2 delete
... //depot/googleclient/gears/opensource/gears/image/backing_image.h#2 delete
... //depot/googleclient/gears/opensource/gears/image/image.cc#5 delete
... //depot/googleclient/gears/opensource/gears/image/image.h#4 delete
... //depot/googleclient/gears/opensource/gears/image/image_loader.cc#5 delete
... //depot/googleclient/gears/opensource/gears/image/image_loader.h#2 delete
... //depot/googleclient/gears/opensource/gears/tools/config.mk#107 edit
... //depot/googleclient/gears/opensource/gears/tools/rules.mk#107 edit
1012 delta lines: 0 added, 993 deleted, 19 changed
Also consider running:
g4 lint -c 10831187
which verifies that the changelist doesn't introduce new style violations.
If you can't do the review, please let me know as soon as possible. During
your review, please ensure that all new code has corresponding unit tests and
that existing unit tests are updated appropriately. Visit
http://www/eng/code_review.html for more information.
This is a semiautomated message from "g4 mail". Complaints or suggestions?
Mail [email protected].
Change 10831187 by nigel...@nigeltao-srcgears5 on 2009/04/16 15:38:30 *pending*
Remove the beta.image and beta.imageloader modules, since they have
not been launched, and are superseded by the beta.canvas module.
Deleting third_party/libgd from the Gears tree will be a separate CL.
Affected files ...
... //depot/googleclient/gears/opensource/gears/Makefile#243 edit
... //depot/googleclient/gears/opensource/gears/factory/factory_impl.cc#30 edit
... //depot/googleclient/gears/opensource/gears/factory/factory_utils.cc#8 edit
... //depot/googleclient/gears/opensource/gears/image/backing_image.cc#2 delete
... //depot/googleclient/gears/opensource/gears/image/backing_image.h#2 delete
... //depot/googleclient/gears/opensource/gears/image/image.cc#5 delete
... //depot/googleclient/gears/opensource/gears/image/image.h#4 delete
... //depot/googleclient/gears/opensource/gears/image/image_loader.cc#5 delete
... //depot/googleclient/gears/opensource/gears/image/image_loader.h#2 delete
... //depot/googleclient/gears/opensource/gears/tools/config.mk#107 edit
... //depot/googleclient/gears/opensource/gears/tools/rules.mk#107 edit
==== //depot/googleclient/gears/opensource/gears/Makefile#243 -
/home/nigeltao/srcgears5/googleclient/gears/opensource/gears/Makefile ====
# action=edit type=text
--- googleclient/gears/opensource/gears/Makefile 2009-04-16
15:38:37.000000000 +1000
+++ googleclient/gears/opensource/gears/Makefile 2009-04-16
14:44:36.000000000 +1000
@@ -209,50 +209,6 @@
json_value.cc \
json_writer.cc \
$(NULL)
-
-#-----------------------------------------------------------------------------
-# third_party/libgd
-
-ifeq ($(USING_LIBGD),1)
-ifneq ($(OFFICIAL_BUILD),1)
-ifneq ($(OS),wince)
-THIRD_PARTY_VPATH += \
- ../third_party/libgd \
- $(NULL)
-
-LIBGD_CSRCS += \
- gd.c \
- gdfx.c \
- gd_security.c \
- gd_gd.c \
- gd_gd2.c \
- gd_io.c \
- gd_io_dp.c \
- gd_gif_in.c \
- gd_gif_out.c \
- gd_io_file.c \
- gd_io_ss.c \
- gd_jpeg.c \
- gd_png.c \
- gd_ss.c \
- gd_topal.c \
- gd_wbmp.c \
- gdcache.c \
- gdfontg.c \
- gdfontl.c \
- gdfontmb.c \
- gdfonts.c \
- gdfontt.c \
- gdft.c \
- gdhelpers.c \
- gdkanji.c \
- gdtables.c \
- gdxpm.c \
- wbmp.c \
- $(NULL)
-endif # not wince
-endif # not OFFICIAL_BUILD
-endif # USING_LIBGD
#-----------------------------------------------------------------------------
# third_party/libjpeg
@@ -2105,25 +2061,6 @@
endif # not OFFICIAL_BUILD
#-----------------------------------------------------------------------------
-# image
-
-ifneq ($(OFFICIAL_BUILD),1)
-ifneq ($(OS),wince)
-ifneq ($(OS),android)
-$(BROWSER)_VPATH += \
- image \
- $(NULL)
-
-$(BROWSER)_CPPSRCS += \
- backing_image.cc \
- image.cc \
- image_loader.cc \
- $(NULL)
-endif # not android
-endif # not wince
-endif # not OFFICIAL_BUILD
-
-#-----------------------------------------------------------------------------
# factory/firefox
FF3_VPATH += \
==== //depot/googleclient/gears/opensource/gears/factory/factory_impl.cc#30 -
/home/nigeltao/srcgears5/googleclient/gears/opensource/gears/factory/factory_impl.cc
====
# action=edit type=text
--- googleclient/gears/opensource/gears/factory/factory_impl.cc 2009-04-16
15:38:37.000000000 +1000
+++ googleclient/gears/opensource/gears/factory/factory_impl.cc 2009-04-16
15:35:30.000000000 +1000
@@ -51,18 +51,17 @@
#include "third_party/scoped_ptr/scoped_ptr.h"
#ifdef OFFICIAL_BUILD
-// The Canvas, Console, Database2 and Image APIs have not
+// The Canvas, Console and Database2 APIs have not
// been finalized for official builds.
#else
#include "gears/database2/manager.h"
#include "gears/dummy/dummy_module.h"
#ifdef OS_WINCE
-// Furthermore, Canvas, Console and Image are unimplemented for all
+// Furthermore, Canvas and Console are unimplemented for all
// browsers on WinCE.
#else
#include "gears/canvas/canvas.h"
#include "gears/console/console.h"
-#include "gears/image/image_loader.h"
#endif // OS_WINCE
#endif // OFFICIAL_BUILD
@@ -205,7 +204,7 @@
CreateModule<GearsBlobBuilder>(module_environment_.get(),
context, &object);
#ifdef OFFICIAL_BUILD
- // The Canvas, Console, Database2 and Image APIs have not
+ // The Canvas, Console and Database2 APIs have not
// been finalized for official builds.
#else
} else if (module_name == STRING16(L"beta.databasemanager")) {
@@ -214,15 +213,13 @@
} else if (module_name == STRING16(L"beta.dummymodule")) {
CreateModule<GearsDummyModule>(module_environment_.get(), context,
&object);
#if defined(OS_WINCE) || defined(OS_ANDROID)
- // Furthermore, Canvas, Console and Image are unimplemented for all
+ // Furthermore, Canvas and Console are unimplemented for all
// browsers on WinCE and Android.
#else
} else if (module_name == STRING16(L"beta.canvas")) {
CreateModule<GearsCanvas>(module_environment_.get(), context, &object);
} else if (module_name == STRING16(L"beta.console")) {
CreateModule<GearsConsole>(module_environment_.get(), context, &object);
- } else if (module_name == STRING16(L"beta.imageloader")) {
- CreateModule<GearsImageLoader>(module_environment_.get(), context,
&object);
#endif // OS_WINCE
#endif // OFFICIAL_BUILD
} else if (module_name == STRING16(L"beta.test")) {
==== //depot/googleclient/gears/opensource/gears/factory/factory_utils.cc#8 -
/home/nigeltao/srcgears5/googleclient/gears/opensource/gears/factory/factory_utils.cc
====
# action=edit type=text
--- googleclient/gears/opensource/gears/factory/factory_utils.cc
2009-04-16 15:38:37.000000000 +1000
+++ googleclient/gears/opensource/gears/factory/factory_utils.cc
2009-04-16 15:05:22.000000000 +1000
@@ -188,7 +188,6 @@
module_name == STRING16(L"beta.console") ||
module_name == STRING16(L"beta.database") ||
module_name == STRING16(L"beta.databasemanager") ||
- module_name == STRING16(L"beta.imageloader") ||
module_name == STRING16(L"beta.localserver") ||
module_name == STRING16(L"beta.test") ||
module_name == STRING16(L"beta.workerpool");
==== //depot/googleclient/gears/opensource/gears/image/backing_image.cc#2 -
None ====
# action=delete type=text
==== //depot/googleclient/gears/opensource/gears/image/backing_image.h#2 - None
====
# action=delete type=text
==== //depot/googleclient/gears/opensource/gears/image/image.cc#5 - None ====
# action=delete type=text
==== //depot/googleclient/gears/opensource/gears/image/image.h#4 - None ====
# action=delete type=text
==== //depot/googleclient/gears/opensource/gears/image/image_loader.cc#5 - None
====
# action=delete type=text
==== //depot/googleclient/gears/opensource/gears/image/image_loader.h#2 - None
====
# action=delete type=text
==== //depot/googleclient/gears/opensource/gears/tools/config.mk#107 -
/home/nigeltao/srcgears5/googleclient/gears/opensource/gears/tools/config.mk
====
# action=edit type=text
--- googleclient/gears/opensource/gears/tools/config.mk 2009-04-16
15:38:39.000000000 +1000
+++ googleclient/gears/opensource/gears/tools/config.mk 2009-04-16
14:49:59.000000000 +1000
@@ -41,9 +41,6 @@
ifeq ($(USING_ICU),)
USING_ICU = 1
endif
-ifeq ($(USING_LIBGD),)
- USING_LIBGD = 1
-endif
ifeq ($(USING_LIBJPEG),)
USING_LIBJPEG = 1
endif
@@ -270,13 +267,6 @@
-DSQLITE_TRANSACTION_DEFAULT_IMMEDIATE=1 \
-DSQLITE_GEARS_DISABLE_SHELL_ICU \
-I../third_party/sqlite_google/src
-I../third_party/sqlite_google/preprocessed
-
-LIBGD_CFLAGS += -I../third_party/libjpeg -I../third_party/libpng
-DHAVE_CONFIG_H
-
-ifeq ($(USING_LIBGD),1)
-# libGD assumes it is in the include path
-CPPFLAGS += -I../third_party/libgd
-endif
GTEST_CPPFLAGS += -I../third_party/gtest/include -I../third_party/gtest
@@ -518,7 +508,6 @@
ec...@echo
CPPFLAGS += -DLINUX
-LIBGD_CFLAGS += -Wno-unused-variable -Wno-unused-function -Wno-unused-label
SQLITE_CFLAGS += -Wno-uninitialized -DHAVE_USLEEP=1
# for libjpeg:
THIRD_PARTY_CFLAGS = -Wno-main
@@ -611,8 +600,6 @@
# Needed for the Safari package installer.
M4FLAGS += -DGEARS_ENABLER_PATH='$(PWD)/$(SF_INPUTMANAGER_BUNDLE)'
-DGEARS_PLUGIN_PATH="$(PWD)/$(SF_PLUGIN_PROXY_BUNDLE)"
M4FLAGS += -DGEARS_INSTALLER_OUT_DIR='$(PWD)/$(INSTALLERS_OUTDIR)/Safari'
-
-LIBGD_CFLAGS += -Wno-unused-variable -Wno-unused-function -Wno-unused-label
# JS_THREADSAFE *MUST* be kept in sync wuith $(BROWSER)_CPPFLAGS.
MOZJS_CFLAGS += -DJS_THREADSAFE
@@ -816,15 +803,6 @@
$(CPPFLAGS_$(MODE))
endif
-LIBGD_CFLAGS += -DBGDWIN32
-
-# Disable some warnings when building third-party code, so we can enable /WX.
-# Examples:
-# warning C4244: conversion from 'type1' to 'type2', possible loss of data
-# warning C4018: signed/unsigned mismatch in comparison
-# warning C4003: not enough actual parameters for macro
-LIBGD_CFLAGS += /wd4244 /wd4996 /wd4005 /wd4142 /wd4018 /wd4133 /wd4102
-
SQLITE_CFLAGS += /wd4018 /wd4244
ifeq ($(OS),wince)
SQLITE_CFLAGS += /wd4146
==== //depot/googleclient/gears/opensource/gears/tools/rules.mk#107 -
/home/nigeltao/srcgears5/googleclient/gears/opensource/gears/tools/rules.mk ====
# action=edit type=text
--- googleclient/gears/opensource/gears/tools/rules.mk 2009-04-16
15:38:40.000000000 +1000
+++ googleclient/gears/opensource/gears/tools/rules.mk 2009-04-16
14:56:59.000000000 +1000
@@ -30,7 +30,7 @@
OUTDIR = bin-$(MODE)
-# LIBGD_OUTDIR, SQLITE_OUTDIR and THIRD_PARTY_OUTDIR are separate from
+# SQLITE_OUTDIR and THIRD_PARTY_OUTDIR are separate from
# COMMON_OUTDIR because we want different build flags for them, and flags are
# set per output directory.
#
@@ -59,7 +59,6 @@
VISTA_BROKER_OUTDIR = $(OUTDIR)/$(OS)-$(ARCH)/vista_broker
BREAKPAD_OUTDIR = $(COMMON_OUTDIR)/breakpad
-LIBGD_OUTDIR = $(COMMON_OUTDIR)/gd
SQLITE_OUTDIR = $(COMMON_OUTDIR)/sqlite
MOZJS_OUTDIR = $(COMMON_OUTDIR)/spidermonkey
THIRD_PARTY_OUTDIR = $(COMMON_OUTDIR)/third_party
@@ -95,7 +94,6 @@
SF_INPUTMANAGER_OBJS = $(call SUBSTITUTE_OBJ_SUFFIX, $(SF_OUTDIR),
$(SF_INPUTMANAGER_CPPSRCS))
SF_INSTALLER_PLUGIN_OBJS = $(call SUBSTITUTE_OBJ_SUFFIX,
$(SF_INSTALLER_PLUGIN_OUTDIR), $(SF_INSTALLER_PLUGIN_CPPSRCS))
SF_PROXY_DLL_OBJS = $(call SUBSTITUTE_OBJ_SUFFIX, $(SF_OUTDIR),
$(SF_PROXY_DLL_CPPSRCS))
-LIBGD_OBJS = $(call SUBSTITUTE_OBJ_SUFFIX, $(LIBGD_OUTDIR),
$(LIBGD_CSRCS))
MOZJS_OBJS = $(call SUBSTITUTE_OBJ_SUFFIX, $(MOZJS_OUTDIR),
$(MOZJS_CSRCS))
SQLITE_OBJS = $(call SUBSTITUTE_OBJ_SUFFIX, $(SQLITE_OUTDIR),
$(SQLITE_CSRCS))
PERF_TOOL_OBJS = $(call SUBSTITUTE_OBJ_SUFFIX, $(COMMON_OUTDIR),
$(PERF_TOOL_CPPSRCS))
@@ -152,7 +150,6 @@
$(PERF_TOOL_OBJS:$(OBJ_SUFFIX)=.pp) \
$(SF_INPUTMANAGER_OBJS:$(OBJ_SUFFIX)=.pp) \
$(VISTA_BROKER_OBJS:$(OBJ_SUFFIX)=.pp) \
- $(LIBGD_OBJS:$(OBJ_SUFFIX)=.pp) \
$(MOZJS_OBJS:$(OBJ_SUFFIX)=.pp) \
$(RUN_GEARS_DLL_OBJS:$(OBJ_SUFFIX)=.pp) \
$(SQLITE_OBJS:$(OBJ_SUFFIX)=.pp) \
@@ -422,7 +419,7 @@
# Cross-browser targets.
prereqs:: $($(BROWSER)_OUTDIR) $($(BROWSER)_OUTDIR)/genfiles
$($(BROWSER)_OUTDIRS_I18N) $($(BROWSER)_M4FILES) $($(BROWSER)_M4FILES_I18N)
$($(BROWSER)_HTML_M4FILES) $($(BROWSER)_STABFILES)
prereqs:: $(COMMON_OUTDIR) $(COMMON_OUTDIR)/genfiles
$(COMMON_OUTDIRS_I18N) $(COMMON_M4FILES) $(COMMON_M4FILES_I18N)
$(patsubst
%,$(COMMON_OUTDIR)/genfiles/%,$(COMMON_GEN_CPPSRCS))
-prereqs:: $(BREAKPAD_OUTDIR) $(INSTALLERS_OUTDIR) $(LIBGD_OUTDIR)
$(SQLITE_OUTDIR) $(THIRD_PARTY_OUTDIR)
+prereqs:: $(BREAKPAD_OUTDIR) $(INSTALLERS_OUTDIR) $(SQLITE_OUTDIR)
$(THIRD_PARTY_OUTDIR)
modules::
genheaders:: $($(BROWSER)_GEN_HEADERS)
@@ -588,8 +585,6 @@
"mkdir" -p $@
$(INSTALLERS_OUTDIR):
"mkdir" -p $@
-$(LIBGD_OUTDIR):
- "mkdir" -p $@
$(MOZJS_OUTDIR):
"mkdir" -p $@
$(OSX_LAUNCHURL_OUTDIR):
@@ -739,16 +734,12 @@
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $($(BROWSER)_CPPFLAGS)
$($(BROWSER)_CXXFLAGS) $<
-# Omit @$(MKDEP) for mozjs and libgd because they include files which
-# aren't in the same directory, but don't use explicit paths. All necessary -I
-# flags are in LIBGD_CFLAGS.
+# Omit @$(MKDEP) for mozjs because they include files which
+# aren't in the same directory, but don't use explicit paths.
$(MOZJS_OUTDIR)/%$(OBJ_SUFFIX): %.c
$(CC) $(CPPFLAGS) $(CFLAGS) $(MOZJS_CFLAGS) $<
$(MOZJS_OUTDIR)/%$(OBJ_SUFFIX): %.s
$(CC) $(CPPFLAGS) $(CFLAGS) $(MOZJS_CFLAGS) $<
-
-$(LIBGD_OUTDIR)/%$(OBJ_SUFFIX): %.c
- $(CC) $(CPPFLAGS) $(CFLAGS) $(LIBGD_CFLAGS) $<
# Java TARGETS (Android only)
@@ -920,32 +911,30 @@
# WARNING: Must keep the following two rules (FF2|FF3_MODULE_DLL) in sync!
# The only difference should be the rule name.
-$(FF2_MODULE_DLL): $(BREAKPAD_OBJS) $(COMMON_OBJS) $(LIBGD_OBJS)
$(SQLITE_OBJS) $(THIRD_PARTY_OBJS) $($(BROWSER)_OBJS) $($(BROWSER)_LINK_EXTRAS)
+$(FF2_MODULE_DLL): $(BREAKPAD_OBJS) $(COMMON_OBJS) $(SQLITE_OBJS)
$(THIRD_PARTY_OBJS) $($(BROWSER)_OBJS) $($(BROWSER)_LINK_EXTRAS)
ifeq ($(OS),linux)
# TODO(playmobil): Find equivalent of "@args_file" for ld on Linux.
- $(MKDLL) $(DLLFLAGS) $($(BROWSER)_DLLFLAGS) $($(BROWSER)_OBJS)
$(BREAKPAD_OBJS) $(COMMON_OBJS) $(LIBGD_OBJS) $(SQLITE_OBJS)
$(THIRD_PARTY_OBJS) $($(BROWSER)_LINK_EXTRAS) $($(BROWSER)_LIBS)
+ $(MKDLL) $(DLLFLAGS) $($(BROWSER)_DLLFLAGS) $($(BROWSER)_OBJS)
$(BREAKPAD_OBJS) $(COMMON_OBJS) $(SQLITE_OBJS) $(THIRD_PARTY_OBJS)
$($(BROWSER)_LINK_EXTRAS) $($(BROWSER)_LIBS)
else
$(ECHO) $($(BROWSER)_OBJS1) | $(TRANSLATE_LINKER_FILE_LIST) >
$(OUTDIR)/obj_list.temp
$(ECHO) $($(BROWSER)_OBJS2) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(BREAKPAD_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(COMMON_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
- $(ECHO) $(LIBGD_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(SQLITE_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(THIRD_PARTY_OBJS1) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(THIRD_PARTY_OBJS2) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(MKDLL) $(DLLFLAGS) $($(BROWSER)_DLLFLAGS) $($(BROWSER)_LINK_EXTRAS)
$($(BROWSER)_LIBS) $(EXT_LINKER_CMD_FLAG)$(OUTDIR)/obj_list.temp
rm $(OUTDIR)/obj_list.temp
endif
-$(FF3_MODULE_DLL): $(BREAKPAD_OBJS) $(COMMON_OBJS) $(LIBGD_OBJS)
$(SQLITE_OBJS) $(THIRD_PARTY_OBJS) $($(BROWSER)_OBJS) $($(BROWSER)_LINK_EXTRAS)
+$(FF3_MODULE_DLL): $(BREAKPAD_OBJS) $(COMMON_OBJS) $(SQLITE_OBJS)
$(THIRD_PARTY_OBJS) $($(BROWSER)_OBJS) $($(BROWSER)_LINK_EXTRAS)
ifeq ($(OS),linux)
# TODO(playmobil): Find equivalent of "@args_file" for ld on Linux.
- $(MKDLL) $(DLLFLAGS) $($(BROWSER)_DLLFLAGS) $($(BROWSER)_OBJS)
$(BREAKPAD_OBJS) $(COMMON_OBJS) $(LIBGD_OBJS) $(SQLITE_OBJS)
$(THIRD_PARTY_OBJS) $($(BROWSER)_LINK_EXTRAS) $($(BROWSER)_LIBS)
+ $(MKDLL) $(DLLFLAGS) $($(BROWSER)_DLLFLAGS) $($(BROWSER)_OBJS)
$(BREAKPAD_OBJS) $(COMMON_OBJS) $(SQLITE_OBJS) $(THIRD_PARTY_OBJS)
$($(BROWSER)_LINK_EXTRAS) $($(BROWSER)_LIBS)
else
$(ECHO) $($(BROWSER)_OBJS1) | $(TRANSLATE_LINKER_FILE_LIST) >
$(OUTDIR)/obj_list.temp
$(ECHO) $($(BROWSER)_OBJS2) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(BREAKPAD_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(COMMON_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
- $(ECHO) $(LIBGD_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(SQLITE_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(THIRD_PARTY_OBJS1) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(THIRD_PARTY_OBJS2) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
@@ -960,12 +949,11 @@
IE_OBJS1 = $(wordlist 1, 100, $(IE_OBJS))
IE_OBJS2 = $(wordlist 101, 999, $(IE_OBJS))
-$(IE_MODULE_DLL): $(BREAKPAD_OBJS) $(COMMON_OBJS) $(LIBGD_OBJS) $(SQLITE_OBJS)
$(THIRD_PARTY_OBJS) $(IE_OBJS) $(IE_LINK_EXTRAS)
+$(IE_MODULE_DLL): $(BREAKPAD_OBJS) $(COMMON_OBJS) $(SQLITE_OBJS)
$(THIRD_PARTY_OBJS) $(IE_OBJS) $(IE_LINK_EXTRAS)
$(ECHO) $(IE_OBJS1) | $(TRANSLATE_LINKER_FILE_LIST) >
$(OUTDIR)/obj_list.temp
$(ECHO) $(IE_OBJS2) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(BREAKPAD_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(COMMON_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
- $(ECHO) $(LIBGD_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(SQLITE_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(THIRD_PARTY_OBJS1) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(THIRD_PARTY_OBJS2) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
@@ -976,12 +964,11 @@
IEMOBILE_OBJS1 = $(wordlist 1, 100, $(IEMOBILE_OBJS))
IEMOBILE_OBJS2 = $(wordlist 101, 999, $(IEMOBILE_OBJS))
-$(IEMOBILE_MODULE_DLL): $(BREAKPAD_OBJS) $(COMMON_OBJS) $(LIBGD_OBJS)
$(SQLITE_OBJS) $(THIRD_PARTY_OBJS) $(IEMOBILE_OBJS) $(IEMOBILE_LINK_EXTRAS)
+$(IEMOBILE_MODULE_DLL): $(BREAKPAD_OBJS) $(COMMON_OBJS) $(SQLITE_OBJS)
$(THIRD_PARTY_OBJS) $(IEMOBILE_OBJS) $(IEMOBILE_LINK_EXTRAS)
$(ECHO) $(IEMOBILE_OBJS1) | $(TRANSLATE_LINKER_FILE_LIST) >
$(OUTDIR)/obj_list.temp
$(ECHO) $(IEMOBILE_OBJS2) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(BREAKPAD_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(COMMON_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
- $(ECHO) $(LIBGD_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(SQLITE_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(THIRD_PARTY_OBJS1) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(THIRD_PARTY_OBJS2) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
@@ -993,10 +980,10 @@
$(MKDLL) $(DLLFLAGS_NOPDB) $(IEMOBILE_WINCESETUP_LINK_EXTRAS)
$(IEMOBILE_LIBS) $(IEMOBILE_WINCESETUP_OBJS)
ifeq ($(OS),android)
-$(NPAPI_MODULE_DLL): $(COMMON_OBJS) $(SQLITE_OBJS) $(LIBGD_OBJS) $(MOZJS_OBJS)
$(THIRD_PARTY_OBJS) $(NPAPI_OBJS) $(NPAPI_LINK_EXTRAS)
+$(NPAPI_MODULE_DLL): $(COMMON_OBJS) $(SQLITE_OBJS) $(MOZJS_OBJS)
$(THIRD_PARTY_OBJS) $(NPAPI_OBJS) $(NPAPI_LINK_EXTRAS)
@echo " Linking $(notdir $@)"
@$(MKDLL) $(DLLFLAGS) $(NPAPI_DLLFLAGS) $(COMMON_OBJS) \
- $(SQLITE_OBJS) $(LIBGD_OBJS) \
+ $(SQLITE_OBJS) \
$(MOZJS_OBJS) \
$(THIRD_PARTY_OBJS) \
$(NPAPI_LINK_EXTRAS) \
@@ -1033,12 +1020,11 @@
# Split the list of OBJS to avoid "input line is too long" errors.
NPAPI_OBJS1 = $(wordlist 1, 100, $(NPAPI_OBJS))
NPAPI_OBJS2 = $(wordlist 101, 999, $(NPAPI_OBJS))
-$(NPAPI_MODULE_DLL): $(BREAKPAD_OBJS) $(COMMON_OBJS) $(LIBGD_OBJS)
$(SQLITE_OBJS) $(THIRD_PARTY_OBJS) $(NPAPI_OBJS) $(NPAPI_LINK_EXTRAS)
+$(NPAPI_MODULE_DLL): $(BREAKPAD_OBJS) $(COMMON_OBJS) $(SQLITE_OBJS)
$(THIRD_PARTY_OBJS) $(NPAPI_OBJS) $(NPAPI_LINK_EXTRAS)
$(ECHO) $(NPAPI_OBJS1) | $(TRANSLATE_LINKER_FILE_LIST) >
$(OUTDIR)/obj_list.temp
$(ECHO) $(NPAPI_OBJS2) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(BREAKPAD_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(COMMON_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
- $(ECHO) $(LIBGD_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(SQLITE_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(THIRD_PARTY_OBJS1) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(THIRD_PARTY_OBJS2) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
@@ -1049,13 +1035,12 @@
OPERA_OBJS1 = $(wordlist 1, 100, $(OPERA_OBJS))
OPERA_OBJS2 = $(wordlist 101, 999, $(OPERA_OBJS))
-$(OPERA_MODULE_DLL): $(BREAKPAD_OBJS) $(COMMON_OBJS) $(LIBGD_OBJS)
$(SQLITE_OBJS) $(THIRD_PARTY_OBJS) $(OPERA_OBJS) $(OPERA_LINK_EXTRAS)
+$(OPERA_MODULE_DLL): $(BREAKPAD_OBJS) $(COMMON_OBJS) $(SQLITE_OBJS)
$(THIRD_PARTY_OBJS) $(OPERA_OBJS) $(OPERA_LINK_EXTRAS)
$(ECHO) $(OPERA_CPPSRCS) > tmp
$(ECHO) $(OPERA_OBJS1) | $(TRANSLATE_LINKER_FILE_LIST) >
$(OUTDIR)/obj_list.temp
$(ECHO) $(OPERA_OBJS2) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(BREAKPAD_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(COMMON_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
- $(ECHO) $(LIBGD_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(SQLITE_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(THIRD_PARTY_OBJS1) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(THIRD_PARTY_OBJS2) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
@@ -1066,12 +1051,11 @@
$(OPERA_WINCESETUP_DLL): $(OPERA_WINCESETUP_OBJS)
$(OPERA_WINCESETUP_LINK_EXTRAS)
$(MKDLL) $(DLLFLAGS_NOPDB) $(OPERA_WINCESETUP_LINK_EXTRAS)
$(OPERA_LIBS) $(OPERA_WINCESETUP_OBJS)
-$(SF_MODULE_DLL): $(BREAKPAD_OBJS) $(COMMON_OBJS) $(LIBGD_OBJS) $(MOZJS_OBJS)
$(SQLITE_OBJS) $(THIRD_PARTY_OBJS) $($(BROWSER)_OBJS) $($(BROWSER)_LINK_EXTRAS)
+$(SF_MODULE_DLL): $(BREAKPAD_OBJS) $(COMMON_OBJS) $(MOZJS_OBJS) $(SQLITE_OBJS)
$(THIRD_PARTY_OBJS) $($(BROWSER)_OBJS) $($(BROWSER)_LINK_EXTRAS)
$(ECHO) $($(BROWSER)_OBJS1) | $(TRANSLATE_LINKER_FILE_LIST) >
$(OUTDIR)/obj_list.temp
$(ECHO) $($(BROWSER)_OBJS2) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(BREAKPAD_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(COMMON_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
- $(ECHO) $(LIBGD_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(MOZJS_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(SQLITE_OBJS) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
$(ECHO) $(THIRD_PARTY_OBJS1) | $(TRANSLATE_LINKER_FILE_LIST) >>
$(OUTDIR)/obj_list.temp
