Changeset 224372 in webkit

Timestamp:

Nov 2, 2017 7:50:59 PM (6 years ago)

Author:

timothy_horton@apple.com

Message:

Reduce duplication in the toplevel Makefile
​https://bugs.webkit.org/show_bug.cgi?id=179204

Unreviewed build fix.

• Source/Makefile:

Take three. An empty SDKROOT should be like Mac (and build all the things).

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/Makefile (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2017-11-02  Tim Horton  <timothy_horton@apple.com>
+
+        Reduce duplication in the toplevel Makefile
+        https://bugs.webkit.org/show_bug.cgi?id=179204
+
+        Unreviewed build fix.
+
+        * Source/Makefile:
+        Take three. An empty SDKROOT should be like Mac (and build all the things).
+
 2017-11-02  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/Makefile

@@ -1 @@
-MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE 
+LIBWEBRTC_MODULE = 
+WEBINSPECTORUI_MODULE =
 
 ifneq (,$(SDKROOT))
         ifneq (,$(findstring iphone,$(SDKROOT)))
-                MODULES += ThirdParty/libwebrtc
+                LIBWEBRTC_MODULE = ThirdParty/libwebrtc
         endif
         ifneq (,$(findstring macosx,$(SDKROOT)))
-                MODULES += ThirdParty/libwebrtc
+                LIBWEBRTC_MODULE = ThirdParty/libwebrtc
+                WEBINSPECTORUI_MODULE = WebInspectorUI
         endif
+else
+        LIBWEBRTC_MODULE = ThirdParty/libwebrtc
+        WEBINSPECTORUI_MODULE = WebInspectorUI
 endif
 
-MODULES += WebCore 
-
-ifneq (,$(SDKROOT))
-        ifneq (,$(findstring macosx,$(SDKROOT)))
-                MODULES += WebInspectorUI
-        endif
-endif
-
-MODULES += WebKitLegacy WebKit
+MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE $(LIBWEBRTC_MODULE) WebCore $(WEBINSPECTORUI_MODULE) WebKitLegacy WebKit
 
 all: