summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-10-27 12:22:00 +0100
committerKristian Monsen <kristianm@google.com>2010-10-27 13:03:01 +0100
commit026dcf071380a81f0213473bab11c7db9f367bce (patch)
treeb84adea832bd39c0b2a01d828929cb61dc00236f
parent33e712930d7cc5e45e5d8db87bfb3508cf773a6b (diff)
downloadexternal_chromium-026dcf071380a81f0213473bab11c7db9f367bce.zip
external_chromium-026dcf071380a81f0213473bab11c7db9f367bce.tar.gz
external_chromium-026dcf071380a81f0213473bab11c7db9f367bce.tar.bz2
Removing unused Makefiles that does not exist upstream from build/
Change-Id: I647b011d88564087e2c9b99c72e4f4238c793f64
-rw-r--r--build/All.target.mk18
-rw-r--r--build/all.Makefile6
-rw-r--r--build/linux/dbus-glib.target.mk5
-rw-r--r--build/linux/fontconfig.target.mk5
-rw-r--r--build/linux/freetype2.target.mk5
-rw-r--r--build/linux/gconf.target.mk5
-rw-r--r--build/linux/gdk.target.mk5
-rw-r--r--build/linux/gnome-keyring.target.mk5
-rw-r--r--build/linux/gtk.target.mk5
-rw-r--r--build/linux/gtkprint.target.mk5
-rw-r--r--build/linux/libresolv.target.mk5
-rw-r--r--build/linux/nss.target.mk5
-rw-r--r--build/linux/openssl.target.mk5
-rw-r--r--build/linux/selinux.target.mk5
-rw-r--r--build/linux/system.Makefile6
-rw-r--r--build/linux/x11.target.mk5
-rw-r--r--build/linux/xext.target.mk5
-rw-r--r--build/temp_gyp/googleurl.Makefile6
-rw-r--r--build/temp_gyp/googleurl.target.mk172
-rw-r--r--build/temp_gyp/googleurl_unittests.target.mk171
-rw-r--r--build/util/build_util.Makefile6
-rw-r--r--build/util/lastchange.target.mk112
22 files changed, 0 insertions, 567 deletions
diff --git a/build/All.target.mk b/build/All.target.mk
deleted file mode 100644
index c7b452d..0000000
--- a/build/All.target.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := All
-### Rules for final target.
-$(obj).target/build/All.stamp: TOOLSET := $(TOOLSET)
-$(obj).target/build/All.stamp: app_unittests $(obj).target/app/app_strings.stamp $(obj).target/app/app_resources.stamp $(obj).target/app/libapp_base.a $(obj).target/app/app_unittest_strings.stamp $(obj).target/base/libbase_i18n.a base_unittests $(obj).target/base/libtest_support_base.a $(obj).target/base/libtest_support_perf.a $(obj).target/base/libbase.a $(obj).target/base/libsymbolize.a $(obj).target/base/libxdg_mime.a sync_listen_notifications $(obj).target/chrome/chrome_resources.stamp $(obj).target/chrome/chrome_strings.stamp $(obj).target/chrome/theme_resources.stamp $(obj).target/chrome/platform_locale_settings.stamp $(obj).target/chrome/chrome_extra_resources.stamp $(obj).target/chrome/default_extensions.stamp $(obj).target/chrome/libdebugger.a $(obj).target/chrome/libplugin.a $(obj).target/chrome/libutility.a $(obj).target/chrome/libprofile_import.a $(obj).target/chrome/libchrome_gpu.a $(obj).target/chrome/libworker.a $(obj).target/chrome/libsyncapi.a $(obj).target/chrome/libsync.a $(obj).target/chrome/libsync_notifier.a $(obj).target/chrome/libservice.a $(obj).target/chrome/libbrowser.a $(obj).target/chrome/component_extensions.stamp $(obj).target/chrome/userfeedback_proto.stamp $(obj).target/chrome/libcommon.a $(obj).target/chrome/libcommon_net.a chrome $(obj).target/chrome/librenderer.a $(obj).target/chrome/safe_browsing_proto.stamp interactive_ui_tests $(obj).target/chrome/libtest_support_common.a $(obj).target/chrome/libtest_support_ui.a $(obj).target/chrome/libtest_support_unit.a automated_ui_tests ui_tests chromedriver libnacl_security_tests.so nacl_sandbox_tests nacl_ui_tests unit_tests browser_tests safe_browsing_tests startup_tests reliability_tests page_cycler_tests tab_switching_test memory_test url_fetch_test sync_unit_tests sync_integration_tests plugin_tests $(obj).target/chrome/libcommon_constants.a $(obj).target/chrome/libnacl.a convert_dict $(obj).target/chrome/libconvert_dict.a flush_cache $(obj).target/chrome/packed_extra_resources.stamp $(obj).target/chrome/linux_symbols.stamp $(obj).target/chrome/policy_templates.stamp $(obj).target/chrome/packed_resources.stamp $(obj).target/chrome/libinstaller_util.a perf_tests gfx_unittests $(obj).target/gfx/libgfx.a $(obj).target/gfx/gfx_resources.stamp $(obj).target/gpu/libcommand_buffer_common.a $(obj).target/gpu/libgles2_cmd_helper.a $(obj).target/gpu/libgles2_implementation.a $(obj).target/gpu/libgles2_lib.a $(obj).target/gpu/libgles2_c_lib.a $(obj).target/gpu/libcommand_buffer_client.a $(obj).target/gpu/libcommand_buffer_service.a $(obj).target/gpu/libgpu_plugin.a gpu_unittests $(obj).target/gpu/libgles2_demo_lib.a $(obj).target/gpu/libpgl.a $(obj).target/gpu/demos/libgpu_demo_framework.a $(obj).target/gpu/demos/libgpu_demo_framework_exe.a $(obj).target/gpu/demos/libgpu_demo_framework_ppapi.a hello_triangle_exe mip_map_2d_exe simple_texture_2d_exe simple_texture_cubemap_exe simple_vertex_shader_exe stencil_test_exe texture_wrap_exe ipc_tests $(obj).target/ipc/libipc.a $(obj).target/jingle/libnotifier.a notifier_unit_tests $(obj).target/media/libmedia.a ffmpeg_unittests media_unittests $(obj).target/media/libmedia_test_support.a media_bench scaler_bench ffmpeg_tests wav_ola_test qt_faststart omx_test omx_unittests $(obj).target/media/libomx_wrapper.a player_x11 $(obj).target/net/libnet_base.a $(obj).target/net/libnet.a net_unittests net_perftests stress_cache tld_cleanup crash_cache run_testserver $(obj).target/net/libnet_test_support.a $(obj).target/net/net_resources.stamp fetch_client fetch_server $(obj).target/net/libhttp_listen_socket.a hresolv dnssec_chain_verify $(obj).target/net/third_party/nss/libssl.a $(obj).target/printing/libprinting.a printing_unittests $(obj).target/sdch/libsdch.a $(obj).target/skia/libskia.a $(obj).target/skia/libskia_opts.a $(obj).target/testing/libgmock.a $(obj).target/testing/libgmockmain.a $(obj).target/testing/libgtest.a $(obj).target/testing/libgtestmain.a $(obj).target/third_party/cacheinvalidation/cacheinvalidation_proto.stamp $(obj).target/third_party/cacheinvalidation/libcacheinvalidation.a cacheinvalidation_unittests $(obj).target/third_party/cld/libcld.a codesighs maptsvdifftool nm2tsv $(obj).target/third_party/ffmpeg/libffmpeg.a libffmpegsumo.so $(obj).target/third_party/ffmpeg/assemble_ffmpeg_asm.stamp $(obj).target/third_party/ffmpeg/make_ffmpeg_asm_lib.stamp ffmpegsumo_nolink $(obj).target/third_party/icu/libicudata.a $(obj).target/third_party/icu/libicui18n.a $(obj).target/third_party/icu/libicuuc.a $(obj).target/third_party/libxml/libxml2.a $(obj).target/third_party/libxslt/libxslt.a $(obj).target/third_party/lzma_sdk/liblzma_sdk.a $(obj).target/third_party/mesa/libmesa.a libosmesa.so $(obj).target/third_party/modp_b64/libmodp_b64.a $(obj).target/third_party/npapi/npapi.stamp $(obj).target/third_party/ppapi/ppapi_c.stamp $(obj).target/third_party/ppapi/libppapi_cpp_objects.a $(obj).target/third_party/ppapi/libppapi_cpp.a libppapi_example.so libppapi_tests.so $(obj).target/third_party/ots/libots.a $(obj).target/third_party/sqlite/libsqlite3.a sqlite_shell $(obj).target/third_party/WebKit/WebKit/chromium/libwebkit.a $(obj).target/third_party/WebKit/WebKit/chromium/inspector_resources.stamp $(obj).target/third_party/WebKit/WebKit/chromium/devtools_html.stamp $(obj).target/third_party/WebKit/WebKit/chromium/concatenated_devtools_js.stamp webkit_unit_tests ImageDiff DumpRenderTree $(obj).target/third_party/zlib/libzlib.a $(obj).target/webkit/support/libappcache.a $(obj).target/webkit/support/libblob.a $(obj).target/webkit/support/libfileapi.a $(obj).target/webkit/support/libdatabase.a $(obj).target/webkit/support/webkit_resources.stamp $(obj).target/webkit/support/webkit_strings.stamp $(obj).target/webkit/support/libwebkit_user_agent.a $(obj).target/webkit/support/libglue.a libnpapi_layout_test_plugin.so $(obj).target/webkit/support/copy_npapi_layout_test_plugin.stamp $(obj).target/webkit/support/libwebkit_support.a $(obj).target/webkit/pull_in_webkit_unit_tests.stamp $(obj).target/webkit/pull_in_DumpRenderTree.stamp $(obj).target/webkit/libtest_shell_common.a $(obj).target/webkit/test_shell_pak.stamp test_shell test_shell_tests $(obj).target/webkit/test_shell_resources.stamp $(obj).target/build/util/lastchange.stamp $(obj).target/build/temp_gyp/libgoogleurl.a googleurl_unittests $(obj).target/v8/tools/gyp/v8.stamp $(obj).target/v8/tools/gyp/libv8_snapshot.a $(obj).target/v8/tools/gyp/libv8_nosnapshot.a $(obj).target/v8/tools/gyp/libv8_base.a v8_shell yasm $(obj).host/third_party/yasm/config_sources.stamp $(obj).host/third_party/yasm/generate_files.stamp $(obj).host/third_party/yasm/libgenperf_libs.a genstring genperf genmacro genversion re2c genmodule $(obj).target/breakpad/libbreakpad_client.a $(obj).target/breakpad/libbreakpad_processor_support.a breakpad_unittests generate_test_dump minidump-2-core $(obj).target/courgette/libcourgette_lib.a courgette courgette_minimal_tool courgette_unittests courgette_fuzz chrome_sandbox $(obj).target/sandbox/libsandbox.a gtk_clipboard_dump xdisplaycheck $(obj).target/third_party/libevent/libevent.a $(obj).target/remoting/libchromoting_plugin.a $(obj).target/remoting/libchromoting_base.a $(obj).target/remoting/libchromoting_host.a $(obj).target/remoting/libchromoting_client.a chromoting_simple_host chromoting_host_keygen $(obj).target/remoting/libchromoting_jingle_glue.a chromoting_jingle_test_client $(obj).target/remoting/libchromoting_protocol.a chromotocol_test_client remoting_unittests chromoting_client_test_webserver chromoting_x11_client $(obj).target/chrome/libnacl_security_tests.so $(obj).target/third_party/ffmpeg/libffmpegsumo.so $(obj).target/third_party/ppapi/libppapi_example.so FORCE_DO_CMD
- $(call do_cmd,touch)
-
-all_deps += $(obj).target/build/All.stamp
-# Add target alias
-.PHONY: All
-All: $(obj).target/build/All.stamp
-
-# Add target alias to "all" target.
-.PHONY: all
-all: All
-
diff --git a/build/all.Makefile b/build/all.Makefile
deleted file mode 100644
index f74a5f1..0000000
--- a/build/all.Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-export builddir_name ?= /usr/local/google/src/chromium-merge/src/build/out
-.PHONY: all
-all:
- $(MAKE) -C .. All
diff --git a/build/linux/dbus-glib.target.mk b/build/linux/dbus-glib.target.mk
deleted file mode 100644
index e9add6b..0000000
--- a/build/linux/dbus-glib.target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := dbus-glib
-### Rules for final target.
diff --git a/build/linux/fontconfig.target.mk b/build/linux/fontconfig.target.mk
deleted file mode 100644
index a5e6271..0000000
--- a/build/linux/fontconfig.target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := fontconfig
-### Rules for final target.
diff --git a/build/linux/freetype2.target.mk b/build/linux/freetype2.target.mk
deleted file mode 100644
index 297b743..0000000
--- a/build/linux/freetype2.target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := freetype2
-### Rules for final target.
diff --git a/build/linux/gconf.target.mk b/build/linux/gconf.target.mk
deleted file mode 100644
index b7aa300..0000000
--- a/build/linux/gconf.target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := gconf
-### Rules for final target.
diff --git a/build/linux/gdk.target.mk b/build/linux/gdk.target.mk
deleted file mode 100644
index 03279bb..0000000
--- a/build/linux/gdk.target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := gdk
-### Rules for final target.
diff --git a/build/linux/gnome-keyring.target.mk b/build/linux/gnome-keyring.target.mk
deleted file mode 100644
index cd773ef..0000000
--- a/build/linux/gnome-keyring.target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := gnome-keyring
-### Rules for final target.
diff --git a/build/linux/gtk.target.mk b/build/linux/gtk.target.mk
deleted file mode 100644
index 227d712..0000000
--- a/build/linux/gtk.target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := gtk
-### Rules for final target.
diff --git a/build/linux/gtkprint.target.mk b/build/linux/gtkprint.target.mk
deleted file mode 100644
index c4fc89d..0000000
--- a/build/linux/gtkprint.target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := gtkprint
-### Rules for final target.
diff --git a/build/linux/libresolv.target.mk b/build/linux/libresolv.target.mk
deleted file mode 100644
index 7393294..0000000
--- a/build/linux/libresolv.target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := libresolv
-### Rules for final target.
diff --git a/build/linux/nss.target.mk b/build/linux/nss.target.mk
deleted file mode 100644
index 877adf8..0000000
--- a/build/linux/nss.target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := nss
-### Rules for final target.
diff --git a/build/linux/openssl.target.mk b/build/linux/openssl.target.mk
deleted file mode 100644
index 22fec66..0000000
--- a/build/linux/openssl.target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := openssl
-### Rules for final target.
diff --git a/build/linux/selinux.target.mk b/build/linux/selinux.target.mk
deleted file mode 100644
index 32b144b..0000000
--- a/build/linux/selinux.target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := selinux
-### Rules for final target.
diff --git a/build/linux/system.Makefile b/build/linux/system.Makefile
deleted file mode 100644
index b93aff2..0000000
--- a/build/linux/system.Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-export builddir_name ?= /usr/local/google/src/chromium-merge/src/build/linux/out
-.PHONY: all
-all:
- $(MAKE) -C ../.. libresolv freetype2 xext dbus-glib gtkprint gtk fontconfig gdk gconf gnome-keyring x11 nss
diff --git a/build/linux/x11.target.mk b/build/linux/x11.target.mk
deleted file mode 100644
index d722300..0000000
--- a/build/linux/x11.target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := x11
-### Rules for final target.
diff --git a/build/linux/xext.target.mk b/build/linux/xext.target.mk
deleted file mode 100644
index 5829922..0000000
--- a/build/linux/xext.target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := xext
-### Rules for final target.
diff --git a/build/temp_gyp/googleurl.Makefile b/build/temp_gyp/googleurl.Makefile
deleted file mode 100644
index 6c8a6d6..0000000
--- a/build/temp_gyp/googleurl.Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-export builddir_name ?= /usr/local/google/src/chromium-merge/src/build/temp_gyp/out
-.PHONY: all
-all:
- $(MAKE) -C ../.. googleurl googleurl_unittests
diff --git a/build/temp_gyp/googleurl.target.mk b/build/temp_gyp/googleurl.target.mk
deleted file mode 100644
index 75d4bb1..0000000
--- a/build/temp_gyp/googleurl.target.mk
+++ /dev/null
@@ -1,172 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := googleurl
-DEFS_Debug := '-DNO_HEAPCHECKER' \
- '-DCHROMIUM_BUILD' \
- '-DENABLE_REMOTING=1' \
- '-DENABLE_GPU=1' \
- '-DU_STATIC_IMPLEMENTATION' \
- '-D__STDC_FORMAT_MACROS' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
- '-D_DEBUG'
-
-# Flags passed to both C and C++ files.
-CFLAGS_Debug := -Werror \
- -pthread \
- -fno-exceptions \
- -Wall \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -D_FILE_OFFSET_BITS=64 \
- -fvisibility=hidden \
- -pipe \
- -fno-strict-aliasing \
- -pthread \
- -D_REENTRANT \
- -I/usr/include/gtk-2.0 \
- -I/usr/lib/gtk-2.0/include \
- -I/usr/include/atk-1.0 \
- -I/usr/include/cairo \
- -I/usr/include/pango-1.0 \
- -I/usr/include/gio-unix-2.0/ \
- -I/usr/include/glib-2.0 \
- -I/usr/lib/glib-2.0/include \
- -I/usr/include/pixman-1 \
- -I/usr/include/freetype2 \
- -I/usr/include/directfb \
- -I/usr/include/libpng12 \
- -O0 \
- -g
-
-# Flags passed to only C (and not C++) files.
-CFLAGS_C_Debug :=
-
-# Flags passed to only C++ (and not C) files.
-CFLAGS_CC_Debug := -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden
-
-INCS_Debug := -Ithird_party/icu/public/common \
- -Ithird_party/icu/public/i18n \
- -I.
-
-DEFS_Release := '-DNO_HEAPCHECKER' \
- '-DCHROMIUM_BUILD' \
- '-DENABLE_REMOTING=1' \
- '-DENABLE_GPU=1' \
- '-DU_STATIC_IMPLEMENTATION' \
- '-D__STDC_FORMAT_MACROS' \
- '-DNDEBUG' \
- '-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-# Flags passed to both C and C++ files.
-CFLAGS_Release := -Werror \
- -pthread \
- -fno-exceptions \
- -Wall \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -D_FILE_OFFSET_BITS=64 \
- -fvisibility=hidden \
- -pipe \
- -fno-strict-aliasing \
- -pthread \
- -D_REENTRANT \
- -I/usr/include/gtk-2.0 \
- -I/usr/lib/gtk-2.0/include \
- -I/usr/include/atk-1.0 \
- -I/usr/include/cairo \
- -I/usr/include/pango-1.0 \
- -I/usr/include/gio-unix-2.0/ \
- -I/usr/include/glib-2.0 \
- -I/usr/lib/glib-2.0/include \
- -I/usr/include/pixman-1 \
- -I/usr/include/freetype2 \
- -I/usr/include/directfb \
- -I/usr/include/libpng12 \
- -O2 \
- -fno-ident \
- -fdata-sections \
- -ffunction-sections
-
-# Flags passed to only C (and not C++) files.
-CFLAGS_C_Release :=
-
-# Flags passed to only C++ (and not C) files.
-CFLAGS_CC_Release := -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden
-
-INCS_Release := -Ithird_party/icu/public/common \
- -Ithird_party/icu/public/i18n \
- -I.
-
-OBJS := $(obj).target/$(TARGET)/googleurl/src/gurl.o \
- $(obj).target/$(TARGET)/googleurl/src/url_canon_etc.o \
- $(obj).target/$(TARGET)/googleurl/src/url_canon_fileurl.o \
- $(obj).target/$(TARGET)/googleurl/src/url_canon_host.o \
- $(obj).target/$(TARGET)/googleurl/src/url_canon_icu.o \
- $(obj).target/$(TARGET)/googleurl/src/url_canon_internal.o \
- $(obj).target/$(TARGET)/googleurl/src/url_canon_ip.o \
- $(obj).target/$(TARGET)/googleurl/src/url_canon_mailtourl.o \
- $(obj).target/$(TARGET)/googleurl/src/url_canon_path.o \
- $(obj).target/$(TARGET)/googleurl/src/url_canon_pathurl.o \
- $(obj).target/$(TARGET)/googleurl/src/url_canon_query.o \
- $(obj).target/$(TARGET)/googleurl/src/url_canon_relative.o \
- $(obj).target/$(TARGET)/googleurl/src/url_canon_stdurl.o \
- $(obj).target/$(TARGET)/googleurl/src/url_parse.o \
- $(obj).target/$(TARGET)/googleurl/src/url_parse_file.o \
- $(obj).target/$(TARGET)/googleurl/src/url_util.o
-
-# Add to the list of files we specially track dependencies for.
-all_deps += $(OBJS)
-
-# CFLAGS et al overrides must be target-local.
-# See "Target-specific Variable Values" in the GNU Make manual.
-$(OBJS): TOOLSET := $(TOOLSET)
-$(OBJS): GYP_CFLAGS := $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE)) $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))
-$(OBJS): GYP_CXXFLAGS := $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE)) $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))
-
-# Suffix rules, putting all outputs into $(obj).
-
-$(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.cc FORCE_DO_CMD
- @$(call do_cmd,cxx,1)
-
-# Try building from generated source, too.
-
-$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.cc FORCE_DO_CMD
- @$(call do_cmd,cxx,1)
-
-$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.cc FORCE_DO_CMD
- @$(call do_cmd,cxx,1)
-
-# End of this set of suffix rules
-### Rules for final target.
-LDFLAGS_Debug := -pthread \
- -Wl,-z,noexecstack
-
-LDFLAGS_Release := -pthread \
- -Wl,-z,noexecstack \
- -Wl,-O1 \
- -Wl,--as-needed \
- -Wl,--gc-sections
-
-LIBS :=
-
-$(obj).target/build/temp_gyp/libgoogleurl.a: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
-$(obj).target/build/temp_gyp/libgoogleurl.a: LIBS := $(LIBS)
-$(obj).target/build/temp_gyp/libgoogleurl.a: TOOLSET := $(TOOLSET)
-$(obj).target/build/temp_gyp/libgoogleurl.a: $(OBJS) FORCE_DO_CMD
- $(call do_cmd,alink)
-
-all_deps += $(obj).target/build/temp_gyp/libgoogleurl.a
-# Add target alias
-.PHONY: googleurl
-googleurl: $(obj).target/build/temp_gyp/libgoogleurl.a
-
-# Add target alias to "all" target.
-.PHONY: all
-all: googleurl
-
diff --git a/build/temp_gyp/googleurl_unittests.target.mk b/build/temp_gyp/googleurl_unittests.target.mk
deleted file mode 100644
index e5dfba1..0000000
--- a/build/temp_gyp/googleurl_unittests.target.mk
+++ /dev/null
@@ -1,171 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := googleurl_unittests
-DEFS_Debug := '-DNO_HEAPCHECKER' \
- '-DCHROMIUM_BUILD' \
- '-DENABLE_REMOTING=1' \
- '-DENABLE_GPU=1' \
- '-DUNIT_TEST' \
- '-DGTEST_HAS_RTTI=0' \
- '-DU_STATIC_IMPLEMENTATION' \
- '-D__STDC_FORMAT_MACROS' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
- '-D_DEBUG'
-
-# Flags passed to both C and C++ files.
-CFLAGS_Debug := -Werror \
- -pthread \
- -fno-exceptions \
- -Wall \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -D_FILE_OFFSET_BITS=64 \
- -fvisibility=hidden \
- -pipe \
- -fno-strict-aliasing \
- -O0 \
- -g
-
-# Flags passed to only C (and not C++) files.
-CFLAGS_C_Debug :=
-
-# Flags passed to only C++ (and not C) files.
-CFLAGS_CC_Debug := -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden
-
-INCS_Debug := -Ithird_party/icu/public/common \
- -I. \
- -Itesting/gtest/include
-
-DEFS_Release := '-DNO_HEAPCHECKER' \
- '-DCHROMIUM_BUILD' \
- '-DENABLE_REMOTING=1' \
- '-DENABLE_GPU=1' \
- '-DUNIT_TEST' \
- '-DGTEST_HAS_RTTI=0' \
- '-DU_STATIC_IMPLEMENTATION' \
- '-D__STDC_FORMAT_MACROS' \
- '-DNDEBUG' \
- '-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-# Flags passed to both C and C++ files.
-CFLAGS_Release := -Werror \
- -pthread \
- -fno-exceptions \
- -Wall \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -D_FILE_OFFSET_BITS=64 \
- -fvisibility=hidden \
- -pipe \
- -fno-strict-aliasing \
- -O2 \
- -fno-ident \
- -fdata-sections \
- -ffunction-sections
-
-# Flags passed to only C (and not C++) files.
-CFLAGS_C_Release :=
-
-# Flags passed to only C++ (and not C) files.
-CFLAGS_CC_Release := -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden
-
-INCS_Release := -Ithird_party/icu/public/common \
- -I. \
- -Itesting/gtest/include
-
-OBJS := $(obj).target/$(TARGET)/googleurl/src/gurl_unittest.o \
- $(obj).target/$(TARGET)/googleurl/src/url_canon_unittest.o \
- $(obj).target/$(TARGET)/googleurl/src/url_parse_unittest.o \
- $(obj).target/$(TARGET)/googleurl/src/url_util_unittest.o \
- $(obj).target/$(TARGET)/googleurl/src/gurl_test_main.o
-
-# Add to the list of files we specially track dependencies for.
-all_deps += $(OBJS)
-
-# Make sure our dependencies are built before any of us.
-$(OBJS): | $(obj).target/build/temp_gyp/libgoogleurl.a $(obj).target/testing/libgtest.a $(obj).target/third_party/icu/libicuuc.a $(obj).target/base/allocator/liballocator.a $(obj).target/base/libbase.a $(obj).target/third_party/modp_b64/libmodp_b64.a $(obj).target/base/third_party/dynamic_annotations/libdynamic_annotations.a $(obj).target/base/libsymbolize.a $(obj).target/net/third_party/nss/libssl.a $(obj).target/third_party/zlib/libzlib.a $(obj).target/base/libxdg_mime.a $(obj).target/third_party/libevent/libevent.a $(obj).target/third_party/icu/libicudata.a $(obj).target/third_party/icu/libicui18n.a
-
-# CFLAGS et al overrides must be target-local.
-# See "Target-specific Variable Values" in the GNU Make manual.
-$(OBJS): TOOLSET := $(TOOLSET)
-$(OBJS): GYP_CFLAGS := $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE)) $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))
-$(OBJS): GYP_CXXFLAGS := $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE)) $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))
-
-# Suffix rules, putting all outputs into $(obj).
-
-$(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.cc FORCE_DO_CMD
- @$(call do_cmd,cxx,1)
-
-# Try building from generated source, too.
-
-$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.cc FORCE_DO_CMD
- @$(call do_cmd,cxx,1)
-
-$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.cc FORCE_DO_CMD
- @$(call do_cmd,cxx,1)
-
-# End of this set of suffix rules
-### Rules for final target.
-LDFLAGS_Debug := -pthread \
- -Wl,-z,noexecstack \
- -Wl,-uIsHeapProfilerRunning,-uProfilerStart \
- -Wl,-u_Z21InitialMallocHook_NewPKvj,-u_Z22InitialMallocHook_MMapPKvS0_jiiix,-u_Z22InitialMallocHook_SbrkPKvi \
- -Wl,-u_Z21InitialMallocHook_NewPKvm,-u_Z22InitialMallocHook_MMapPKvS0_miiil,-u_Z22InitialMallocHook_SbrkPKvl
-
-LDFLAGS_Release := -pthread \
- -Wl,-z,noexecstack \
- -Wl,-uIsHeapProfilerRunning,-uProfilerStart \
- -Wl,-u_Z21InitialMallocHook_NewPKvj,-u_Z22InitialMallocHook_MMapPKvS0_jiiix,-u_Z22InitialMallocHook_SbrkPKvi \
- -Wl,-u_Z21InitialMallocHook_NewPKvm,-u_Z22InitialMallocHook_MMapPKvS0_miiil,-u_Z22InitialMallocHook_SbrkPKvl \
- -Wl,-O1 \
- -Wl,--as-needed \
- -Wl,--gc-sections
-
-LIBS := -lrt \
- -ldl \
- -lgtk-x11-2.0 \
- -lgdk-x11-2.0 \
- -latk-1.0 \
- -lgio-2.0 \
- -lpangoft2-1.0 \
- -lgdk_pixbuf-2.0 \
- -lm \
- -lpangocairo-1.0 \
- -lcairo \
- -lpango-1.0 \
- -lfreetype \
- -lfontconfig \
- -lgobject-2.0 \
- -lgmodule-2.0 \
- -lgthread-2.0 \
- -lglib-2.0 \
- -lnss3 \
- -lnssutil3 \
- -lsmime3 \
- -lplds4 \
- -lplc4 \
- -lnspr4 \
- -lpthread \
- -lz
-
-$(builddir)/googleurl_unittests: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
-$(builddir)/googleurl_unittests: LIBS := $(LIBS)
-$(builddir)/googleurl_unittests: TOOLSET := $(TOOLSET)
-$(builddir)/googleurl_unittests: $(OBJS) $(obj).target/build/temp_gyp/libgoogleurl.a $(obj).target/testing/libgtest.a $(obj).target/third_party/icu/libicuuc.a $(obj).target/base/allocator/liballocator.a $(obj).target/base/libbase.a $(obj).target/third_party/modp_b64/libmodp_b64.a $(obj).target/base/third_party/dynamic_annotations/libdynamic_annotations.a $(obj).target/base/libsymbolize.a $(obj).target/net/third_party/nss/libssl.a $(obj).target/third_party/zlib/libzlib.a $(obj).target/base/libxdg_mime.a $(obj).target/third_party/libevent/libevent.a $(obj).target/third_party/icu/libicudata.a $(obj).target/third_party/icu/libicui18n.a FORCE_DO_CMD
- $(call do_cmd,link)
-
-all_deps += $(builddir)/googleurl_unittests
-# Add target alias
-.PHONY: googleurl_unittests
-googleurl_unittests: $(builddir)/googleurl_unittests
-
-# Add executable to "all" target.
-.PHONY: all
-all: $(builddir)/googleurl_unittests
-
diff --git a/build/util/build_util.Makefile b/build/util/build_util.Makefile
deleted file mode 100644
index ea46b78..0000000
--- a/build/util/build_util.Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-export builddir_name ?= /usr/local/google/src/chromium-merge/src/build/util/out
-.PHONY: all
-all:
- $(MAKE) -C ../.. lastchange
diff --git a/build/util/lastchange.target.mk b/build/util/lastchange.target.mk
deleted file mode 100644
index 5aed5d9..0000000
--- a/build/util/lastchange.target.mk
+++ /dev/null
@@ -1,112 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-TOOLSET := target
-TARGET := lastchange
-### Rules for action "lastchange":
-quiet_cmd_lastchange_lastchange = ACTION Extracting last change to $(obj)/gen/build/LASTCHANGE $@
-cmd_lastchange_lastchange = export LD_LIBRARY_PATH=$(builddir)/lib.host:$(builddir)/lib.target:$$LD_LIBRARY_PATH; cd build/util; mkdir -p $(obj)/gen/build; python ./lastchange.py -o "$(obj)/gen/build/LASTCHANGE" -d ../LASTCHANGE.in
-
-$(obj)/gen/build/LASTCHANGE.always: obj := $(abs_obj)
-
-$(obj)/gen/build/LASTCHANGE.always: builddir := $(abs_builddir)
-
-$(obj)/gen/build/LASTCHANGE.always: TOOLSET := $(TOOLSET)
-$(obj)/gen/build/LASTCHANGE.always: build/util/lastchange.py FORCE_DO_CMD
- $(call do_cmd,lastchange_lastchange)
-$(obj)/gen/build/LASTCHANGE: $(obj)/gen/build/LASTCHANGE.always
-$(obj)/gen/build/LASTCHANGE: ;
-
-all_deps += $(obj)/gen/build/LASTCHANGE.always $(obj)/gen/build/LASTCHANGE
-action_lastchange_lastchange_outputs := $(obj)/gen/build/LASTCHANGE.always $(obj)/gen/build/LASTCHANGE
-
-
-DEFS_Debug := '-DNO_HEAPCHECKER' \
- '-DCHROMIUM_BUILD' \
- '-DENABLE_REMOTING=1' \
- '-DENABLE_GPU=1' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
- '-D_DEBUG'
-
-# Flags passed to both C and C++ files.
-CFLAGS_Debug := -pthread \
- -fno-exceptions \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -D_FILE_OFFSET_BITS=64 \
- -fvisibility=hidden \
- -pipe \
- -fno-strict-aliasing \
- -O0 \
- -g
-
-# Flags passed to only C (and not C++) files.
-CFLAGS_C_Debug :=
-
-# Flags passed to only C++ (and not C) files.
-CFLAGS_CC_Debug := -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden
-
-INCS_Debug :=
-
-DEFS_Release := '-DNO_HEAPCHECKER' \
- '-DCHROMIUM_BUILD' \
- '-DENABLE_REMOTING=1' \
- '-DENABLE_GPU=1' \
- '-DNDEBUG' \
- '-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-# Flags passed to both C and C++ files.
-CFLAGS_Release := -pthread \
- -fno-exceptions \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -D_FILE_OFFSET_BITS=64 \
- -fvisibility=hidden \
- -pipe \
- -fno-strict-aliasing \
- -O2 \
- -fno-ident \
- -fdata-sections \
- -ffunction-sections
-
-# Flags passed to only C (and not C++) files.
-CFLAGS_C_Release :=
-
-# Flags passed to only C++ (and not C) files.
-CFLAGS_CC_Release := -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden
-
-INCS_Release :=
-
-OBJS :=
-
-# Add to the list of files we specially track dependencies for.
-all_deps += $(OBJS)
-
-# Make sure our actions/rules run before any of us.
-$(OBJS): | $(action_lastchange_lastchange_outputs)
-
-
-### Rules for final target.
-# Build our special outputs first.
-$(obj).target/build/util/lastchange.stamp: | $(action_lastchange_lastchange_outputs)
-
-# Preserve order dependency of special output on deps.
-$(action_lastchange_lastchange_outputs): |
-
-$(obj).target/build/util/lastchange.stamp: TOOLSET := $(TOOLSET)
-$(obj).target/build/util/lastchange.stamp: FORCE_DO_CMD
- $(call do_cmd,touch)
-
-all_deps += $(obj).target/build/util/lastchange.stamp
-# Add target alias
-.PHONY: lastchange
-lastchange: $(obj).target/build/util/lastchange.stamp
-
-# Add target alias to "all" target.
-.PHONY: all
-all: lastchange
-