Changeset 7994 for trunk/makefile

Timestamp:

Feb 24, 2002, 12:13:08 AM (24 years ago)

Author:

bird

Message:

Corrected problemous odin_library rules.

File:

• trunk/makefile (modified) (4 diffs)

trunk/makefile

@@ -1 @@
-# $Id: makefile,v 1.18 2001-11-30 18:30:51 phaller Exp $
+# $Id: makefile,v 1.19 2002-02-23 23:13:08 bird Exp $
 
 #
@@ -15 +15 @@
 #            nodebuginfosmp: Change to an SMP debug build without debug info in binaries
 #            profile: Change to a debug build with profiling hooks
+#            profilesmp: Change to an SMP debug build with profiling hooks
 #            release: Change to a release build.
 #            releasesmp: Change to an SMP release build.
@@ -70 +71 @@
 # Special build mode rules.
 #
-debug:          odin_libraries  needed
+debug:          odin_libraries_debug   needed
     @$(DODIRS) "$(BLDDIRS)"     $(MAKE_CMD) DEBUG=1 all
 
-debugsmp:       odin_libraries  needed
+debugsmp:       odin_libraries_debug   needed
     @$(DODIRS) "src"            $(MAKE_CMD) DEBUG=1 smp
     @$(DODIRS) "tools\install"  $(MAKE_CMD) DEBUG=1 all
 
-nodebuginfo:    odin_libraries  needed
+nodebuginfo:    odin_libraries_debug   needed
     @$(DODIRS) "$(BLDDIRS)"     $(MAKE_CMD) DEBUG=1 NODEBUGINFO=1 all
 
-nodebuginfosmp: odin_libraries  needed
+nodebuginfosmp: odin_libraries_debug   needed
     @$(DODIRS) "src"            $(MAKE_CMD) DEBUG=1 NODEBUGINFO=1 smp
     @$(DODIRS) "tools\install"  $(MAKE_CMD) DEBUG=1 NODEBUGINFO=1 all
 
-profile:        odin_libraries  needed
+profile:        odin_libraries_profile needed
     SET PROFILEHOOKS=1
     @$(DODIRS) "$(BLDDIRS)"     $(MAKE_CMD) DEBUG=1 PROFILE=1 all
+    SET PROFILEHOOKS=
 
-profilesmp:     odin_libraries  needed
+profilesmp:     odin_libraries_profile needed
+    SET PROFILEHOOKS=1
     @$(DODIRS) "src"            $(MAKE_CMD) DEBUG=1 PROFILE=1 smp
     @$(DODIRS) "tools\install"  $(MAKE_CMD) DEBUG=1 PROFILE=1 all
+    SET PROFILEHOOKS=
 
-release:        odin_libraries  needed
+release:        odin_libraries_release needed
     SET DEBUG=
     @$(DODIRS) "$(BLDDIRS)"     $(MAKE_CMD) all
 
-releasesmp:     odin_libraries  needed
+releasesmp:     odin_libraries_release needed
     SET DEBUG=
     @$(DODIRS) "src"            $(MAKE_CMD) smp
@@ -108 +112 @@
     @$(DODIRS) "lib"            $(MAKE_CMD)
 
+odin_libraries_debug:
+    @$(DODIRS) "lib"            $(MAKE_CMD) DEBUG=1
+
+odin_libraries_profile:
+    @$(DODIRS) "lib"            $(MAKE_CMD) PROFILE=1
+
+odin_libraries_release:
+    SET DEBUG=
+    @$(DODIRS) "lib"            $(MAKE_CMD)
+
 needed_tools: needed
 needed: