Changeset 1074 for trunk/qmake/Makefile.os2-g++

Timestamp:

Sep 10, 2011, 2:57:13 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Makefile.os2-g++: Handle dependencies properly.

This supersedes r1066. We need this to properly rebuild qmake
w/o make clean if some include file changes.

File:

• trunk/qmake/Makefile.os2-g++ (modified) (2 diffs)

trunk/qmake/Makefile.os2-g++

@@ -154 +154 @@
         @echo "Out of date, please rerun configure"
 
-define DEL_ONE
+define DEL_OBJ
 clean::
-        -del $(1) >nul 2>&1
+        -del $(1) $(1).d >nul 2>&1
 endef
 
-$(foreach file,$(OBJECTS) $(ADDCLEAN),$(eval $(call DEL_ONE,$(file))))
+$(foreach file,$(OBJECTS) $(ADDCLEAN),$(eval $(call DEL_OBJ,$(file))))
 
 distclean:: clean
@@ -166 +166 @@
 .SUFFIXES: .cpp .c
 
+-include $(addsuffix .d,$(OBJECTS))
+
 .c.obj:
         $(CXX) -c $(CFLAGS) -o $@ $<
+        $(CXX) -MM $(CXXFLAGS) -MT $@ $< -MF $@.d
 
 .cpp.obj:
         $(CXX) -c $(CXXFLAGS) -o $@ $<
+        $(CXX) -MM $(CXXFLAGS) -MT $@ $< -MF $@.d
 
 define SRC_TO_OBJ_RULE
 $(call SRC_TO_OBJ,$(1)): $(1)
         $(CXX) -c $(CXXFLAGS) -o $$@ $$<
+        $(CXX) -MM $(CXXFLAGS) -MT $$@ $$< -MF $$@.d
 endef
 
 $(foreach src,$(SOURCES),$(eval $(call SRC_TO_OBJ_RULE,$(src))))
-
-# individual dependencies
-$(OBJECTS_DIR)\qlibraryinfo.obj: $(BUILD_PATH)\src\corelib\global\qconfig.cpp