Changeset 894 for trunk/src

Timestamp:

Dec 13, 2003, 6:33:06 PM (22 years ago)

Author:

bird

Message:

Converted to make 3.80+, no need to generate makefiles.

Location:

trunk/src/emx

Files:

• Makefile (modified) (4 diffs, 1 prop)
• common.smak (modified) (1 diff, 1 prop)
• mkdll.smak (modified) (1 diff, 1 prop)
• mkexe.smak (modified) (1 diff, 1 prop)
• mkimplib.smak (modified) (2 diffs, 1 prop)
• mklib.smak (modified) (1 diff, 1 prop)
• templates.smak (added)
• version.smak (modified) (2 diffs, 1 prop)

trunk/src/emx/Makefile

@@ -39 +39 @@
 ifndef MAKEFILE
 MAKEFILE = Makefile     
-endif
-# name of the generated makefile
-ifndef GENRULES
-GENRULES = $.genrules.smak
 endif
 
@@ -269 +265 @@
 endif
 
+# include template rules
+include templates.smak
+
 # Include all submakefiles
 -include $(SUBMAK)
@@ -321 +320 @@
 # bird: add rule for forcibly re-generating the rules.
 rules:
-        @$(call RM,$(GENRULES))
-        $(MAKE) -f $(MAKEFILE) $(GENRULES)
-
-$(GENRULES): $(SUBMAK) # $(MAKEFILE) $(wildcard *.smak)
-        @$(call MKDIR,$.)
-        @$(call ECHO,Please wait, rebuilding make rules ...)
-        @$(call RM,$@)
-        @$(call FECHO,$@,# Autogenerated file -- DO NOT EDIT!)
-        @$(subst _@,$@,$(RULES))
+        @$(call ECHO,smak don't generate rules anylonger!)
 
 # The general a.out -> OMF conversion rule for object files
@@ -339 +330 @@
         $(call DO.EMXOMF)
 
--include $(GENRULES)

trunk/src/emx/common.smak

@@ -86 +86 @@
 
 # Generate compilation rules for C files
-RULES += $(foreach x,$(filter %.c,$(.TSRC)),\
-        $(call FECHO,_@,$$.$(call OBJFILE,$x): $x)$(NL)\
-        $(call FECHO,_@,        $$(call DO.COMPILE.c,$(.TCF) $(.TCF.$x)))$(NL)\
-)
+$(foreach x,$(filter %.c,$(.TSRC)), $(eval $(call def_compile_c,$(x))))
 
 # Generate compilation rules for S files
-RULES += $(foreach x,$(filter %.s,$(.TSRC)),\
-        $(call FECHO,_@,$$.$(call OBJFILE,$x): $x)$(NL)\
-        $(call FECHO,_@,        $$(call DO.COMPILE.s,$(.TSF) $(.TSF.$x)))$(NL)\
-)
+$(foreach x,$(filter %.s,$(.TSRC)), $(eval $(call def_compile_S,$(x))))
 
 # Generate compilation rules for asm files
-RULES += $(foreach x,$(filter %.asm,$(.TSRC)),\
-        $(call FECHO,_@,$$.$(call OBJFILE,$x): $x)$(NL)\
-        $(call FECHO,_@,        $$(call DO.COMPILE.asm,$(.TAF) $(.TAF.$x)))$(NL)\
-)
+$(foreach x,$(filter %.asm,$(.TSRC)), $(eval $(call def_compile_asm,$(x))))
 
 endif # def .TSRC

trunk/src/emx/mkdll.smak

@@ -8 +8 @@
 
 # Linking rule
-RULES += \
-        $(call FECHO,_@,$$.$(.TARG): $(.OBJS) $(.DEPS) $(.TDEF))$(NL)\
-        $(call FECHO,_@,        $$(call DO.LINK.dll,$(.TLDF)))$(NL)
+$(eval $(call def_link_dll))
 
 # Add unstripped copy.                                  

trunk/src/emx/mkexe.smak

@@ -8 +8 @@
 
 # Linking rule
-RULES += \
-        $(call FECHO,_@,$$.$(.TARG): $(.OBJS) $(.DEPS))$(NL)\
-        $(call FECHO,_@,        $$(call DO.LINK.exe,$(.TLDF)))$(NL)
+$(eval $(call def_link_exe))
 
 # Add unstripped copy.                                  

trunk/src/emx/mkimplib.smak

@@ -12 +12 @@
 #endif
 #endif
-                   
+                
 include common.smak
 
 libs: $(.MODULE)
 
-# The rule for building an archive
-RULES += \
-        $(call FECHO,_@,$$.$(.TARG): $(.IMPS) $(.OBJS) $(.DEPS))$(NL) \
-        $(call FECHO,_@,        $$(call DO.IMPLIB))$(NL)
+# The rule for building an archive with imports
+$(eval $(call def_implib))
 
 ## Rule for stripping debug info.
@@ -33 +31 @@
 #       $(call CP,$<,$@)
 #endif  
-                                                                   
+                                                                
 include mkomflib.smak
 include comend.smak
-.NOINST := 
+.NOINST :=

trunk/src/emx/mklib.smak

@@ -17 +17 @@
 
 # The rule for building an archive
-RULES += \
-        $(call FECHO,_@,$$.$(.TARG): $(.OBJS) $(.DEPS))$(NL)\
-        $(call FECHO,_@,        $$(DO.LIBRARY))$(NL)
+$(eval $(call def_lib))
 
 # Rule for stripping debug info.

trunk/src/emx/version.smak

@@ -15 +15 @@
 
 # The flag for C compiler to pass the VERSION macro to preprocessor
-CFLAGS.DEF.VERSION = -DVERSION=\\\"$(VERSION)\\\"
+CFLAGS.DEF.VERSION = -DVERSION=\"$(VERSION)\"
 
 # INNOTEK_VERSION is normally defined in the environment by a toplevel makefile.
@@ -21 +21 @@
 export INNOTEK_VERSION        ?= (Innotek Build $(shell date '+%Y-%m-%d %H:%M'))
 endif
-CFLAGS.DEF.VERSION += '-DINNOTEK_VERSION=\" $(INNOTEK_VERSION)\"'
+CFLAGS.DEF.VERSION += '-DINNOTEK_VERSION=" $(INNOTEK_VERSION)"'
 
 # Copyright