Changeset 48784 in webkit

Timestamp:

Sep 25, 2009 9:32:58 PM (15 years ago)

Author:

ddkilzer@apple.com

Message:

Part 1 of 2: <​http://webkit.org/b/29753> DerivedSources.make broken for non-Mac targets

Reviewed by Darin Adler.

• DerivedSources.make: Move tests for ENABLE_CONTEXT_MENUS, ENABLE_DRAG_SUPPORT and ENABLE_INSPECTOR into Mac-only section.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• DerivedSources.make (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-25  David Kilzer  <ddkilzer@apple.com>
+
+        Part 1 of 2: <http://webkit.org/b/29753> DerivedSources.make broken for non-Mac targets
+
+        Reviewed by Darin Adler.
+
+        * DerivedSources.make: Move tests for ENABLE_CONTEXT_MENUS,
+        ENABLE_DRAG_SUPPORT and ENABLE_INSPECTOR into Mac-only section.
+
 2009-09-25  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/DerivedSources.make

@@ -468 +468 @@
 endif
 
-ifeq ($(shell gcc -E -P -dM $(FRAMEWORK_FLAGS) WebCore/ForwardingHeaders/wtf/Platform.h | grep ENABLE_CONTEXT_MENUS | cut -d' ' -f3), 1)
-    ENABLE_CONTEXT_MENUS = 1
-else
-    ENABLE_CONTEXT_MENUS = 0
-endif
-
-ifeq ($(shell gcc -E -P -dM $(FRAMEWORK_FLAGS) WebCore/ForwardingHeaders/wtf/Platform.h | grep ENABLE_DRAG_SUPPORT | cut -d' ' -f3), 1)
-    ENABLE_DRAG_SUPPORT = 1
-else
-    ENABLE_DRAG_SUPPORT = 0
-endif
-
-ifeq ($(shell gcc -E -P -dM $(FRAMEWORK_FLAGS) WebCore/ForwardingHeaders/wtf/Platform.h | grep ENABLE_INSPECTOR | cut -d' ' -f3), 1)
-    ENABLE_INSPECTOR = 1
-else
-    ENABLE_INSPECTOR = 0
-endif
-
 ifeq ($(shell gcc -E -P -dM $(FRAMEWORK_FLAGS) WebCore/ForwardingHeaders/wtf/Platform.h | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)
     ENABLE_ORIENTATION_EVENTS = 1
@@ -814 +796 @@
 endif
 
-ifeq ($(ENABLE_CONTEXT_MENUS), 1)
+ifeq ($(shell gcc -E -P -dM $(FRAMEWORK_FLAGS) WebCore/ForwardingHeaders/wtf/Platform.h | grep ENABLE_CONTEXT_MENUS | cut -d' ' -f3), 1)
     WEBCORE_EXPORT_DEPENDENCIES := $(WEBCORE_EXPORT_DEPENDENCIES) WebCore.ContextMenus.exp
 endif
@@ -822 +804 @@
 endif
 
-ifeq ($(ENABLE_DRAG_SUPPORT), 1)
+ifeq ($(shell gcc -E -P -dM $(FRAMEWORK_FLAGS) WebCore/ForwardingHeaders/wtf/Platform.h | grep ENABLE_DRAG_SUPPORT | cut -d' ' -f3), 1)
     WEBCORE_EXPORT_DEPENDENCIES := $(WEBCORE_EXPORT_DEPENDENCIES) WebCore.DragSupport.exp
 endif
 
-ifeq ($(ENABLE_INSPECTOR), 1)
+ifeq ($(shell gcc -E -P -dM $(FRAMEWORK_FLAGS) WebCore/ForwardingHeaders/wtf/Platform.h | grep ENABLE_INSPECTOR | cut -d' ' -f3), 1)
     WEBCORE_EXPORT_DEPENDENCIES := $(WEBCORE_EXPORT_DEPENDENCIES) WebCore.Inspector.exp
 endif