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

Timestamp:

Dec 10, 2009, 12:56:17 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Build qmake second time after building all DLLs using its .pro and link it to Qt DLLs on OS/2 (this became possible after the fix in #405). This greatly reduces its size and finally fixes the national characters in the date printed in the generarted Makefile headers.

File:

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

trunk/qmake/Makefile.os2-g++

@@ -38 +38 @@
 endif
 
-OBJECTS_DIR = release-shared
+OBJECTS_DIR = release-
 
 # qmake code
@@ -152 +152 @@
 OBJECTS     = $(foreach src,$(SOURCES),$(call SRC_TO_OBJ,$(src)))
 
-$(BUILD_PATH)\bin\qmake.exe: $(OBJECTS)
+ $(OBJECTS)
         $(LINK) -o $@ $(OBJECTS) $(LIBS)
+
+
+
+
+
+
+
 
 Makefile: Makefile.os2-g++
@@ -166 +173 @@
 
 distclean:: clean
-        -del $(BUILD_PATH)\bin\qmake.exe >nul 2>&1
+        -del qmake.exe >nul 2>&1
 
 .SUFFIXES: .cpp .c
@@ -178 +185 @@
 define SRC_TO_OBJ_RULE
 $(call SRC_TO_OBJ,$(1)): $(1)
-        @if not exist $(OBJECTS_DIR) mkdir $(OBJECTS_DIR)
         $(CXX) -c $(CXXFLAGS) -o $$@ $$<
 endef