Changeset 1133

Timestamp:

08/30/08 06:27:29 (3 months ago)

Author:

stevenhl

Message:

Optimize makefiles
Change from dllsyms to syms target for consistency
Avoid extra work for wmake -a dist
Pass FORTIFY options to subordinate makefiles

Location:

trunk

Files:

• dll/makefile (modified) (5 diffs)
• makefile (modified) (4 diffs)
• makefile_pre.mk (modified) (3 diffs)

trunk/dll/makefile

@@ -28 +28 @@
 # 03 Jul 07 SHL Change DEBUG semantics to ifdef/ifndef
 # 04 Jul 07 SHL Pass DEBUG settings to sub-make
-# 04 Jul 07 SHL Add missing .AUTODEPEND
+# 04 Jul 07 SHL Add missing .autodepend
 # 06 Aug 07 SHL Tweak CFLAGS for DEBUG builds
 # 26 Aug 07 SHL Clean *.lrf
@@ -40 +40 @@
 # 05 May 08 SHL Add FORTIFY support
 # 26 May 08 SHL Update WARNALL to warn about more
+# 22 Jul 08 SHL Change from dllsyms to syms target for consistency
 
 # Environment:
@@ -163 +164 @@
 
 !ifndef MAKERES
-.c.obj: .AUTODEPEND
+.c.obj: .autodepend
   $(CC) $(CFLAGS) $*.c
 !else
@@ -202 +203 @@
      fm3res.str
 
-dllsyms: $(SYMS) .symbolic
+syms: $(SYMS) .symbolic
 
 $(BASE).dll $(BASE).lib: $(OBJS) $(BASE).def $(BASE).lrf
@@ -253 +254 @@
   cd..
 
-$(BASERES).obj: $(BASERES).c .AUTODEPEND
+$(BASERES).obj: $(BASERES).c .autodepend
   $(CC) $(CFLAGSR) $(BASERES).c
 

trunk/makefile

@@ -19 +19 @@
 # 21 Jan 08 SHL Add *.lrf to clean target
 # 22 Feb 08 JBS Suppress lxlite processing when DEBUG=1
+# 08 Jul 08 SHL Avoid extra work for wmake -a dist
+# 22 Jul 08 SHL Change from dll\dllsyms to dll\syms target for consistency
+# 22 Jul 08 SHL Pass FORTIFY options to subordinate makefiles
 
 # Environment - see makefile_pre.mk
@@ -42 +45 @@
 !include makefile_pre.mk
 
-
 all: dll $(BASE) allexe .symbolic
 
 syms: exesyms dllsyms .symbolic
 
-dist: all syms lxlite wpi .symbolic
+dist: lxlitedll $(BASE) lxliteexe syms wpi .symbolic
 
 # Only update resources
@@ -58 +60 @@
 dll: .symbolic
   cd dll
-  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT)
+  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT)
   cd ..
 
 dllsyms: .symbolic
   cd dll
-  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) dllsyms
+  $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) syms
   cd ..
 
 $(BASE): $(BASE).exe $(BASE).res .symbolic
 
-$(BASE).res: $(BASE).rc  icons\$(BASE).ico bitmaps\*.bmp
+$(BASE).res: $(BASE).rc  icons\$(BASE).ico bitmaps\*.bmp  .autodepend
 
-$(BASE).obj: $(BASE).c dll\version.h
+$(BASE).obj: $(BASE).c dll\version.h .autodepend
 
 # make EXE compenents
 
 allexe: *.mak .symbolic
-   @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT)
+   @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT)
 
 # make SYM files
 
 exesyms: *.mak .symbolic
-   @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) sym
+   @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) sym
 
 # make WPI files
@@ -89 +91 @@
    cd ..
 
+lxlite:: lxlitedll lxliteexe .symbolic
+
 # makefile_post.mk contains lxlite target for $(BASE).exe
 # Apply to each *.mak for other exes
-lxlite:: *.mak .symbolic
+lxliteexe: *.mak .symbolic
 !ifdef DEBUG
 !  ifeq DEBUG 0
-     @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) lxlite
+     @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
 !  endif
 !else
-     @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) lxlite
+     @for %f in ($<) do $(MAKE) -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
 !endif
 
 # Apply to dlls
-lxlite:: .symbolic
+lxlitedll: .symbolic
   cd dll
 !ifdef DEBUG
 !  ifeq DEBUG 0
-#      $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) lxlite
-     $(MAKE) $(DEBUG_OPT) lxlite
+      $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
+#     $(MAKE) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
 !  endif
 !else
-#   $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) lxlite
-  $(MAKE) $(DEBUG_OPT) lxlite
+   $(MAKE) $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
+#  $(MAKE) $(DEBUG_OPT) $(FORTIFY_OPT) lxlite
 !endif
   cd ..

trunk/makefile_pre.mk

@@ -13 +13 @@
 # 23 Jan 08 JBS Add support for building SYM files (Ticket 226)
 # 27 May 08 SHL Add WARNALL and FORTIFY support
+# 22 Jul 08 SHL Pass FORTIFY to subordinate makefiles
 
 CC = wcc386
@@ -45 +46 @@
 !endif
 
-!ifdef %FORTIFY                 # if defined in environment
-FORTIFY = $(%FORTIFY)           # use value from environment
+!ifdef FORTIFY                          # if defined on wmake command line
+FORTIFY_OPT = FORTIFY=$(FORTIFY)        # set in case needed by sub-make
+!else
+!ifdef %FORTIFY                         # if defined in environment
+FORTIFY = $(%FORTIFY)                   # use value from environment
+FORTIFY_OPT = FORTIFY=$(FORTIFY)        # set in case needed by sub-make
+!endif
 !endif
 
@@ -81 +87 @@
 # -wcd=309      unprototyped function called indirectly
 
-# We always compile with debug info to avoid needed a full rebuild just to debug
+# We always compile with debug info to avoid needing a full rebuild just to debug
 CFLAGS = -bt=os2 -mf -bm -d2 -olirs   -s -j -wx -zfp -zgp -zp4 -zq -hd