Changeset 324

Timestamp:

Feb 16, 2012, 7:21:56 PM (13 years ago)

Author:

dmik

Message:

hotspot: Generate dependencies.

Location:

trunk/openjdk/hotspot/make/os2/makefiles

Files:

• compile.make (modified) (1 diff)
• launcher.make (modified) (2 diffs)
• vm.make (modified) (2 diffs)

trunk/openjdk/hotspot/make/os2/makefiles/compile.make

@@ -73 +73 @@
 CPP_FLAGS += -DTARGET_OS_FAMILY_os2
 
+# Generate dependencies
+CPP_FLAGS += -MMD -MP -MF $(@:%=%.d)
+SUFFIXES += .d
+
 # Generic linker settings
 LINK = g++

trunk/openjdk/hotspot/make/os2/makefiles/launcher.make

@@ -47 +47 @@
 LAUNCHER_OUT = launcher
 
-SUFFIXES += .d
-
 OBJS := $(LAUNCHER_OUT)/java.obj $(LAUNCHER_OUT)/java_md.obj $(LAUNCHER_OUT)/jli_util.obj
 
-DEPFILES := $(patsubst %.obj,%.d,$(OBJS))
--include $(DEPFILES)
+# Include dependencies
+-include $(LAUNCHER_OUT)/*.d
 
 launcher-out:
@@ -58 +56 @@
 
 $(LAUNCHER_OUT)/%.obj: $(LAUNCHERDIR_SHARE)/%.c | launcher-out
-        $(QUIETLY) $(CXX) $(CXX_FLAGS) -g -o $@ -c $< -MMD $(LAUNCHER_FLAGS)
+        $(QUIETLY) $(CXX) $(CXX_FLAGS) -g -o $@ -c $< $(LAUNCHER_FLAGS)
 
 $(LAUNCHER_OUT)/%.obj: $(LAUNCHERDIR)/%.c | launcher-out
-        $(QUIETLY) $(CXX) $(CXX_FLAGS) -g -o $@ -c $< -MMD $(LAUNCHER_FLAGS)
+        $(QUIETLY) $(CXX) $(CXX_FLAGS) -g -o $@ -c $< $(LAUNCHER_FLAGS)
 
 launcher: $(OBJS)

trunk/openjdk/hotspot/make/os2/makefiles/vm.make

@@ -22 +22 @@
 #
 #
+
+# Include dependencies
+-include *.d
 
 include ../generated/objfiles.make
@@ -84 +87 @@
 
 Def_File = vm.def
-$(Def_File): $(MAKEFILE_LIST)
+$(Def_File): $(MAKEFILE)
         @echo -e 'LIBRARY jvm INITINSTANCE TERMINSTANCE \n \
 EXPORTS \n \