Changeset 1281 for trunk/makefile

Timestamp:

Nov 18, 2008, 6:19:46 PM (17 years ago)

Author:

John Small

Message:

Ticket 297: Various build improvements/corrections

File:

• trunk/makefile (modified) (10 diffs)

trunk/makefile

@@ -23 +23 @@
 # 22 Jul 08 SHL Pass FORTIFY options to subordinate makefiles
 # 25 Oct 08 SHL Sanitize DEBUG usage
+# 18 Nov 08 JBS Ticket 297: Various build improvements/corrections
 
 # Environment - see makefile_pre.mk and dll\makefile
@@ -50 +51 @@
 syms: exesyms dllsyms .symbolic
 
-dist: lxlitedll $(BASE) lxliteexe syms wpi .symbolic
+dist: all syms lxlite wpi .symbolic
 
 # Only update resources
 res: .symbolic
   @echo Updating resources only
-  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) MAKERES=1
+  $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) MAKERES=1
 
 # make DLL components
@@ -61 +62 @@
 dll: .symbolic
   cd dll
-  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT)
+  $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT)
   cd ..
 
 dllsyms: .symbolic
   cd dll
-  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) syms
+  $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) syms
   cd ..
 
@@ -78 +79 @@
 
 allexe: *.mak .symbolic
-  @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT)
+  @for %f in ($<) do $(MAKE) -h -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT)
 
 # make SYM files
 
 exesyms: *.mak .symbolic
-  @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) sym
+  @for %f in ($<) do $(MAKE) -h -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) sym
 
 # make WPI files
@@ -89 +90 @@
 wpi: .symbolic
   cd warpin
-  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) $(WARPIN_OPTS)
+  $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(WARPIN_OPTS)
   cd ..
 
@@ -98 +99 @@
 lxliteexe: *.mak .symbolic
 !ifndef DEBUG
-  @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
+  @for %f in ($<) do $(MAKE) -h -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
 !endif
 
@@ -105 +106 @@
 !ifndef DEBUG
   cd dll
-  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
+  $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
   cd ..
 !endif
@@ -111 +112 @@
 cleanobj: .symbolic
   cd dll
-  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) cleanobj
+  $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) cleanobj
   cd ..
   -del *.obj
@@ -117 +118 @@
 clean:: .symbolic
   cd dll
-  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) clean
+  $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) clean
   cd ..
   -del *.exe
@@ -129 +130 @@
 distclean: clean .symbolic
   cd warpin
-  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) distclean
+  $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) distclean
   cd ..