Changeset 234

Timestamp:

Jan 10, 2011, 1:56:01 PM (15 years ago)

Author:

dmik

Message:

jdk/make: We don't need a manual make.depend for GCC as we already generate .dep files.

Location:

trunk/openjdk/jdk/make/sun/awt

Files:

• Makefile (modified) (12 diffs)
• make.depend.gmk (deleted)

trunk/openjdk/jdk/make/sun/awt/Makefile

@@ -129 +129 @@
       # If on Solaris 11 (or dlfcn.h has unknown_control_flow pragmas in it)
       #   we trigger a SS11 bug that causes the compiler to crash (bug 6343678)
-      #   Here we check to see if we need this workaround and change the opt 
+      #   Here we check to see if we need this workaround and change the opt
       #   settings for this one file.
       USE_WORKAROUND:=$(shell $(GREP) unknown_control_flow /usr/include/dlfcn.h)
@@ -157 +157 @@
 
 # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX
-endif # PLATFORM 
+endif # PLATFORM
 
 # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS-SPARC
@@ -167 +167 @@
   INLINE_VIS = $(PLATFORM_SRC)/native/sun/awt/medialib/vis_$(ARCH_DATA_MODEL).il
   CFLAGS_sparcv9 = -DMLIB_OS64BIT
-  
+
   CFLAGS += $(CFLAGS_$(ARCH)) -DMLIB_ADD_SUFF $(INLINE_VIS) \
             -I$(SHARE_SRC)/native/sun/awt/medialib \
@@ -214 +214 @@
 #
 # If make.depend is not working correctly, then it can be omitted
-# if you always build from a clean workspace. 
+# if you always build from a clean workspace.
 
 include make.depend
@@ -221 +221 @@
 
 # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS
-endif # PLATFORM
-
-ifeq ($(PLATFORM), os2)
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv OS/2
-#
-# Additional dependencies.
-#
-# If make.depend is not working correctly, then it can be omitted
-# if you always build from a clean workspace. 
-
-include make.depend.gmk
-
-# required additional rules:
-
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ OS/2
 endif # PLATFORM
 
@@ -250 +235 @@
 
 ifndef OPENJDK
-clobber clean:: dgalib.clean 
+clobber clean:: dgalib.clean
 endif
 
@@ -313 +298 @@
 clean:: awt.clean
 
-awt.clean: 
-        $(RM) $(TEMPDIR)/awt.ico 
-        $(RM) $(TEMPDIR)/awt.res 
-        $(RM) $(TEMPDIR)/hand.cur 
+awt.clean:
+        $(RM) $(TEMPDIR)/awt.ico
+        $(RM) $(TEMPDIR)/awt.res
+        $(RM) $(TEMPDIR)/hand.cur
         $(RM) $(TEMPDIR)/check.bmp
 # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS
@@ -334 +319 @@
 clean:: awt.clean
 
-awt.clean: 
-        $(RM) $(TEMPDIR)/awt.ico 
-        $(RM) $(TEMPDIR)/awt.res 
-        $(RM) $(TEMPDIR)/hand.cur 
+awt.clean:
+        $(RM) $(TEMPDIR)/awt.ico
+        $(RM) $(TEMPDIR)/awt.res
+        $(RM) $(TEMPDIR)/hand.cur
         $(RM) $(TEMPDIR)/check.bmp
 # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ OS/2
@@ -435 +420 @@
 _FONTCONFIGS = \
         fontconfig.properties \
-        fontconfig.98.properties 
+        fontconfig.98.properties
 
 FONTCONFIGS_SRC_PREFIX =
@@ -544 +529 @@
 
 # FIXME: awt shouldn't have to see the VM's private headers.
-# FIXME: if you re-order this list, the build breaks, possibly because 
+# FIXME: if you re-order this list, the build breaks, possibly because
 #        of filename collision. Such a collision, if present, is pure
 #        evil. Need to investigate this.
@@ -598 +583 @@
 
 # FIXME: awt shouldn't have to see the VM's private headers.
-# FIXME: if you re-order this list, the build breaks, possibly because 
+# FIXME: if you re-order this list, the build breaks, possibly because
 #        of filename collision. Such a collision, if present, is pure
 #        evil. Need to investigate this.
@@ -652 +637 @@
             -I$(OPENWIN_HOME)/include \
             -I$(OPENWIN_HOME)/include/X11/extensions \
-            -I$(PLATFORM_SRC)/native/$(PKGDIR)/font 
+            -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
 endif
 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \