Changeset 353 for trunk/kBuild/tools/MINGW32.kmk

Timestamp:

Dec 12, 2005, 4:36:07 AM (20 years ago)

Author:

bird

Message:

Use fixed lot's of those $$$$(PATH_<target>) thingies. Better target install, install pass and install target type. Generic passes. And more.

File:

• trunk/kBuild/tools/MINGW32.kmk (modified) (10 diffs)

trunk/kBuild/tools/MINGW32.kmk

@@ -4 +4 @@
 # kBuild Tool Config - MINGW32 GCC.
 #
-# Copyright (c) 2004 knut st. osmundsen <bird-srcspam@anduin.net>
+# Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net>
 #
 #
@@ -150 +150 @@
 ## Link library
 # @param    $(target)   Normalized main target name.
-# @param    $(lib)              Library name.
+# @param    $(lib)      Library name.
 # @param    $(objs)     Object files to put in the library.
 # @param    $(flags)    Flags.
 # @param    $(dirdep)   Directory creation dependency.
-# @param    $(deps)             Other dependencies.
+# @param    $(deps)     Other dependencies.
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
@@ -169 +169 @@
 ## Link program
 # @param    $(target)   Normalized main target name.
-# @param    $(exe)              Program name.
+# @param    $(out)      Program name.
 # @param    $(objs)     Object files to link together.
 # @param    $(libs)     Libraries to search.
@@ -175 +175 @@
 # @param    $(flags)    Flags.
 # @param    $(dirdep)   Directory creation dependency.
-# @param    $(deps)             Other dependencies.
-# @param    $(othersrc) Unhandled sources.
+# @param    $(deps)     Other dependencies.
+# @param    $(othersrc)     Unhandled sources.
 # @param    $(custom_pre)   Custom step invoked before linking.
 # @param    $(custom_post)  Custom step invoked after linking.
@@ -182 +182 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 define TOOL_MINGW32_LINK_PROGRAM
-#$ (warning dbg: TOOL_MINGW32_LINK_PROGRAM: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
-$(exe): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
+#$ (warning dbg: TOOL_MINGW32_LINK_PROGRAM: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
+$(out): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
         $(call MSG_L1,Creating Program $$@)
 ifneq ($(custom_pre),)
@@ -198 +198 @@
 
 
-## Link system module (windows aka driver, linux aka kernel module)
-# @param    $(target)   Normalized main target name.
-# @param    $(dll)              System module name.
+## Link DLL.
+# @param    $(target)   Normalized main target name.
+# @param    $(out)      DLL name.
 # @param    $(objs)     Object files to link together.
 # @param    $(libs)     Libraries to search.
@@ -206 +206 @@
 # @param    $(flags)    Flags.
 # @param    $(dirdep)   Directory creation dependency.
-# @param    $(deps)             Other dependencies.
-# @param    $(othersrc) Unhandled sources.
+# @param    $(deps)     Other dependencies.
+# @param    $(othersrc)     Unhandled sources.
 # @param    $(custom_pre)   Custom step invoked before linking.
 # @param    $(custom_post)  Custom step invoked after linking.
@@ -213 +213 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 define TOOL_MINGW32_LINK_DLL
-#$ (warning dbg: TOOL_MINGW32_LINK_DLL: target=$(target) dll=$(dll) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
-$(dll): $(deps) $(call DIRDEP,$(PATH_LIB)) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
+#$ (warning dbg: TOOL_MINGW32_LINK_DLL: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
+$(out) $(outbase).a $(outbase).exp: \
+                $(deps) $(call DIRDEP,$(PATH_LIB)) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
         $(call MSG_L1,Creating Program $$@)
 ifneq ($(custom_pre),)
@@ -220 +221 @@
 endif
         $(TOOL_MINGW32_DLLWRAP) $(flags) \
-                --dllname=$(dll) \
+                --dllname=$(out) \
                 --output-exp=$(outbase).exp \
                 --output-lib=$(outbase).a \
@@ -234 +235 @@
         $(eval $(custom_post))
 endif
-_OUT_FILES += $(outbase).map $(outbase).a $(outbase).exp
-
-endef
-
+_OUT_FILES += $(outbase).a $(outbase).exp
+
+endef
+