Changeset 1133 for trunk/makefile

Timestamp:

Aug 30, 2008, 6:27:29 AM (17 years ago)

Author:

Steven Levine

Message:

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

File:

• trunk/makefile (modified) (4 diffs)

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 ..