Changeset 15 for trunk

Timestamp:

Nov 17, 2005, 4:35:17 PM (20 years ago)

Author:

dmik

Message:

Solved some 4OS2 incompatibility issues

File:

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

trunk/Makefile.os2-g++

@@ -1 +1 @@
 # -*- makefile -*-
+#
+# :mode=makefile:tabSize=4:indentSize=4:noTabs=false:
+# :folding=explicit:collapseFolds=1:
 #
 # Main Makefile for building the Qt library, examples and tutorial.
@@ -9 +12 @@
 CONTINUEONERROR=-i
 
+HAVE_4OS2 := $(shell echo %@eval[2 + 2])
+ifneq (4,$(HAVE_4OS2))
+HAVE_4OS2 :=
+endif
+
+ECHO_EMPTY := $(if $(HAVE_4OS2),@echo .,@echo.)
+
 .PHONY: private_headers
 
 all: symlinks src-qmake src-moc sub-src sub-tutorial sub-tools sub-examples
-        @echo.
+        $(ECHO_EMPTY)
         @echo The Qt library is now built in lib
         @echo The Qt examples are built in the directories in examples
         @echo The Qt tutorials are built in the directories in tutorial
-        @echo.
+        $(ECHO_EMPTY)
         @echo Note: be sure to set the environment variable QTDIR to point
         @echo       to here or to wherever you move these directories.
-        @echo.
+        $(ECHO_EMPTY)
         @echo Enjoy!   - the Trolltech team
-        @echo.
+        $(ECHO_EMPTY)
 
 symlinks: .qmake.cache private_headers
@@ -29 +39 @@
         $(MAKE) -C qmake
 
-src-moc: src-qmake $(FORCEDEP)
-        if not exist src\moc\Makefile cd src\moc & qmake
+src-moc: src-qmake src\moc\Makefile $(FORCEDEP)
         $(MAKE) -C src\moc
 
-sub-src: src-qmake src-moc .qmake.cache $(FORCEDEP)
-        if not exist src\Makefile cd src & qmake
+src\moc\Makefile:
+        cd src\moc & qmake      
+        
+sub-src: src-qmake src-moc .qmake.cache src\Makefile $(FORCEDEP)
         $(MAKE) -C src
 
-sub-tutorial: sub-src $(FORCEDEP)
-        if not exist tutorial\Makefile cd tutorial & qmake
+src\Makefile:
+        cd src & qmake  
+        
+sub-tutorial: sub-src tutorial\Makefile $(FORCEDEP)
         $(MAKE) -C tutorial $(CONTINUEONERROR)
 
-sub-examples: sub-src sub-tools $(FORCEDEP)
-        if not exist examples\Makefile cd examples & qmake
+tutorial\Makefile:
+        cd tutorial & qmake     
+        
+sub-examples: sub-src sub-tools examples\Makefile $(FORCEDEP)
         $(MAKE) -C examples $(CONTINUEONERROR)
 
+examples\Makefile:
+        cd examples & qmake     
+        
 #@@TODO(dmik):
 #sub-extensions: sub-src $(FORCEDEP)
@@ -54 +72 @@
 #sub-tools: sub-plugins $(FORCEDEP)
 #       $(MAKE) -C tools
-sub-tools: $(FORCEDEP)
-        if not exist tools\Makefile cd tools & qmake
+sub-tools: tools\Makefile $(FORCEDEP)
         $(MAKE) -C tools
 
+tools\Makefile:
+        cd tools & qmake        
+        
 clean:
         @if exist qmake\Makefile $(MAKE) -C qmake $(CONTINUEONERROR) clean
@@ -73 +93 @@
 
 .qmake.cache:
-        @echo.
+        $(ECHO_EMPTY)
         @echo   Qt must first be configured using the "configure" script.
-        @echo.
+        $(ECHO_EMPTY)
 
 FORCE: