Changeset 236 for trunk/src/emx/Makefile

Timestamp:

May 26, 2003, 4:43:12 PM (22 years ago)

Author:

zap

Message:

See ChangeLog.

File:

• trunk/src/emx/Makefile (modified) (9 diffs, 1 prop)

trunk/src/emx/Makefile

@@ -47 +47 @@
 
 # The C compiler
-CC = gcc -c
+CC = gcc -c -Zmt
 # The C compiler flags
 CFLAGS.INC = -Iinclude -Isrc/include
-CFLAGS = -Wall -mstack-arg-probe -Zmt $(CFLAGS.INC) $(CFLAGS.$(MODE)) $(CFLAGS.KIND)
+CFLAGS = -Wall -mstack-arg-probe $(CFLAGS.INC) $(CFLAGS.$(MODE)) $(CFLAGS.KIND)
 # The additional C compiler flags for different build modes
 CFLAGS.opt = -s -O3
-CFLAGS.dbg = -g
+CFLAGS.dbg = -g -DDEBUG
 CFLAGS.aout =
 CFLAGS.omf = -Zomf
@@ -65 +65 @@
 
 # The linker
-LD = gcc
+LD = gcc -Zmt
 # Linker flags
-LDFLAGS = -Zmt $(LDFLAGS.$(MODE)) $(LDFLAGS.KIND)
+LDFLAGS = $(LDFLAGS.$(MODE)) $(LDFLAGS.KIND)
 LDFLAGS.DLL = $(LDFLAGS) -Zdll
 # Linker flags for different build modes
@@ -126 +126 @@
 MAKEDEPFLAGS = $(CFLAGS.INC)
 DO.DEPS = $(MAKEDEP) $(MAKEDEPFLAGS) \
-  -I$(subst $(SPACE), -I,$(sort $(dir $^))) -p$(@D)/ -c -S -f$@ $^
+  -I$(subst $(SPACE), -I,$(sort $(dir $^))) -I$. -p$(@D)/ -c -S -f$@ $^
 
 # How to convert an a.out file to the OMF format
@@ -166 +166 @@
 # Miscelaneous tools
 MKDIR = mkdir.exe -p $1
+# How to update a file only if it has been changed
+UPDATE = (cmp -s $1 $2 || mv -f $1 $2) && rm -f $1
+# How to touch a file
+TOUCH = touch $1
 # Re-build the original string including the ',' between args. Also escape
 # dollars since otherwise ash would expand them.
@@ -186 +190 @@
 DO.HELP.VARS := $(call ECHO,    MODE={dbg|opt} - choose between debug and optimized build modes.)$(NL)
 DO.HELP.VARS += $(call ECHO,    OBJF={omf|aout} - build object files in omf or a.out format.)$(NL)
-# The commands to install everything we have built
-DO.INSTALL :=
-# The list of install directories
-INSDIRS :=
 # The list of work directories needeed for building all targets
 TARGDIRS :=
@@ -196 +196 @@
 # The list of dependency files
 TARGDEPEND :=
-
-.PHONY: default help all tools clean install cleandep cleandepend dep depend depdone
+# The list of installed files
+INS.FILES :=
+
+.PHONY: default help all libs tools clean install install cleandep \
+  cleandepend dep depend depdone
 .SUFFIXES:
 .SUFFIXES: .c .cpp .asm .s .o .exe .dll .a .lib .obj
@@ -210 +213 @@
 -include $(SUBMAK)
 
-# Sort and remove duplicate install directories
+# Sort and remove duplicate directories
 TARGDIRS := $(sort $(TARGDIRS))
-INSDIRS := $(sort $(INSDIRS))
+# Find out which directories are needed for installation
+INSDIRS := $(sort $(dir $(INS.FILES)))
 
 #------------ Global targets ------------
@@ -223 +227 @@
         @$(call ECHO,    {module-name} - build just a particular module)
         @$(call ECHO,    tools - build just the tools)
+        @$(call ECHO,    libs - build all libraries)
         @$(call ECHO,    clean - remove all generated files (remove all built files))
         @$(call ECHO,    install - generate a installation tree in $(INS))
@@ -250 +255 @@
         @$(call ECHO,Dependency files succesfully updated)
 
-install: all $(INSDIRS)
-        $(DO.INSTALL)
+install: all $(INSDIRS) $(INS.FILES)
 
 $. $(INSDIRS) $(TARGDIRS):